1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00

Merge CCM cipher mode and ciphersuites

Conflicts:
	library/ssl_tls.c
This commit is contained in:
Paul Bakker
2014-05-22 15:30:31 +02:00
27 changed files with 3533 additions and 246 deletions

View File

@ -152,6 +152,7 @@
<ClInclude Include="..\..\include\polarssl\blowfish.h" />
<ClInclude Include="..\..\include\polarssl\bn_mul.h" />
<ClInclude Include="..\..\include\polarssl\camellia.h" />
<ClInclude Include="..\..\include\polarssl\ccm.h" />
<ClInclude Include="..\..\include\polarssl\certs.h" />
<ClInclude Include="..\..\include\polarssl\check_config.h" />
<ClInclude Include="..\..\include\polarssl\cipher.h" />
@ -217,6 +218,7 @@
<ClCompile Include="..\..\library\bignum.c" />
<ClCompile Include="..\..\library\blowfish.c" />
<ClCompile Include="..\..\library\camellia.c" />
<ClCompile Include="..\..\library\ccm.c" />
<ClCompile Include="..\..\library\certs.c" />
<ClCompile Include="..\..\library\cipher.c" />
<ClCompile Include="..\..\library\cipher_wrap.c" />

View File

@ -121,6 +121,10 @@ SOURCE=..\..\library\camellia.c
# End Source File
# Begin Source File
SOURCE=..\..\library\ccm.c
# End Source File
# Begin Source File
SOURCE=..\..\library\certs.c
# End Source File
# Begin Source File
@ -397,6 +401,10 @@ SOURCE=..\..\include\polarssl\camellia.h
# End Source File
# Begin Source File
SOURCE=..\..\include\polarssl\ccm.h
# End Source File
# Begin Source File
SOURCE=..\..\include\polarssl\certs.h
# End Source File
# Begin Source File