Update Makefile, CMake, and VisualC project file
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index d990d43..6b19890 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -83,6 +83,9 @@
set(src_tls
debug.c
net_sockets.c
+ ssl_12_cli.c
+ ssl_12_gen.c
+ ssl_12_srv.c
ssl_cache.c
ssl_ciphersuites.c
ssl_cli.c
@@ -90,6 +93,7 @@
ssl_srv.c
ssl_ticket.c
ssl_tls.c
+ ssl_msg.c
)
if(CMAKE_COMPILER_IS_GNUCC)
@@ -174,14 +178,14 @@
if(USE_SHARED_MBEDTLS_LIBRARY)
add_library(mbedx509 SHARED ${src_x509})
- set_target_properties(mbedx509 PROPERTIES VERSION 2.20.0 SOVERSION 1)
+ set_target_properties(mbedx509 PROPERTIES VERSION 2.19.1 SOVERSION 1)
target_link_libraries(mbedx509 ${libs} mbedcrypto)
target_include_directories(mbedx509
PUBLIC ${MBEDTLS_DIR}/include/
PUBLIC ${MBEDTLS_DIR}/crypto/include/)
add_library(mbedtls SHARED ${src_tls})
- set_target_properties(mbedtls PROPERTIES VERSION 2.20.0 SOVERSION 13)
+ set_target_properties(mbedtls PROPERTIES VERSION 2.19.1 SOVERSION 13)
target_link_libraries(mbedtls ${libs} mbedx509)
target_include_directories(mbedtls
PUBLIC ${MBEDTLS_DIR}/include/
diff --git a/library/Makefile b/library/Makefile
index 6fc110c..aa5c134 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -37,7 +37,7 @@
SOEXT_TLS=so.13
SOEXT_X509=so.1
-SOEXT_CRYPTO=so.4
+SOEXT_CRYPTO=so.3
# Set AR_DASH= (empty string) to use an ar implementation that does not accept
# the - prefix for command line options (e.g. llvm-ar)
@@ -75,10 +75,12 @@
x509_csr.o x509write_crt.o x509write_csr.o
OBJS_TLS= debug.o net_sockets.o \
+ ssl_12_cli.o ssl_12_gen.o \
+ ssl_12_srv.o \
ssl_cache.o ssl_ciphersuites.o \
ssl_cli.o ssl_cookie.o \
ssl_srv.o ssl_ticket.o \
- ssl_tls.o
+ ssl_tls.o ssl_msg.o
INCLUDING_FROM_MBEDTLS:=1
include ../crypto/3rdparty/Makefile.inc
diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj
index 2903363..a26a2b0 100644
--- a/visualc/VS2010/mbedTLS.vcxproj
+++ b/visualc/VS2010/mbedTLS.vcxproj
@@ -257,10 +257,14 @@
<ClCompile Include="..\..\library\debug.c" />
<ClCompile Include="..\..\library\net_sockets.c" />
<ClCompile Include="..\..\library\pkcs11.c" />
+ <ClCompile Include="..\..\library\ssl_12_cli.c" />
+ <ClCompile Include="..\..\library\ssl_12_gen.c" />
+ <ClCompile Include="..\..\library\ssl_12_srv.c" />
<ClCompile Include="..\..\library\ssl_cache.c" />
<ClCompile Include="..\..\library\ssl_ciphersuites.c" />
<ClCompile Include="..\..\library\ssl_cli.c" />
<ClCompile Include="..\..\library\ssl_cookie.c" />
+ <ClCompile Include="..\..\library\ssl_msg.c" />
<ClCompile Include="..\..\library\ssl_srv.c" />
<ClCompile Include="..\..\library\ssl_ticket.c" />
<ClCompile Include="..\..\library\ssl_tls.c" />