diff options
| author | Hanno Becker <hanno.becker@arm.com> | 2020-02-05 11:32:03 +0000 |
|---|---|---|
| committer | Hanno Becker <hanno.becker@arm.com> | 2020-02-05 16:10:22 +0000 |
| commit | 471c0c98f61000588a17888d5f12e5cbdb28034d (patch) | |
| tree | 0965c2e1202bd108e368af2dabb9c40d74e6a938 | |
| parent | abd9cef5201f09dcd5518692b5f6df1db9bf80cb (diff) | |
| download | mbedtls-471c0c98f61000588a17888d5f12e5cbdb28034d.zip mbedtls-471c0c98f61000588a17888d5f12e5cbdb28034d.tar.gz mbedtls-471c0c98f61000588a17888d5f12e5cbdb28034d.tar.bz2 | |
Rename temporary copy ssl_tls_old.c back to ssl_tls.c
| -rw-r--r-- | library/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | library/Makefile | 2 | ||||
| -rw-r--r-- | library/ssl_tls.c (renamed from library/ssl_tls_old.c) | 0 | ||||
| -rw-r--r-- | visualc/VS2010/mbedTLS.vcxproj | 2 |
4 files changed, 3 insertions, 3 deletions
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index ee5920f..d990d43 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -89,7 +89,7 @@ set(src_tls ssl_cookie.c ssl_srv.c ssl_ticket.c - ssl_tls_old.c + ssl_tls.c ) if(CMAKE_COMPILER_IS_GNUCC) diff --git a/library/Makefile b/library/Makefile index 072002b..6fc110c 100644 --- a/library/Makefile +++ b/library/Makefile @@ -78,7 +78,7 @@ OBJS_TLS= debug.o net_sockets.o \ ssl_cache.o ssl_ciphersuites.o \ ssl_cli.o ssl_cookie.o \ ssl_srv.o ssl_ticket.o \ - ssl_tls_old.o + ssl_tls.o INCLUDING_FROM_MBEDTLS:=1 include ../crypto/3rdparty/Makefile.inc diff --git a/library/ssl_tls_old.c b/library/ssl_tls.c index 085a0b9..085a0b9 100644 --- a/library/ssl_tls_old.c +++ b/library/ssl_tls.c diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj index 65dce70..ff42438 100644 --- a/visualc/VS2010/mbedTLS.vcxproj +++ b/visualc/VS2010/mbedTLS.vcxproj @@ -264,7 +264,7 @@ <ClCompile Include="..\..\library\ssl_msg.c" />
<ClCompile Include="..\..\library\ssl_srv.c" />
<ClCompile Include="..\..\library\ssl_ticket.c" />
- <ClCompile Include="..\..\library\ssl_tls_old.c" />
+ <ClCompile Include="..\..\library\ssl_tls.c" />
<ClCompile Include="..\..\library\x509.c" />
<ClCompile Include="..\..\library\x509_create.c" />
<ClCompile Include="..\..\library\x509_crl.c" />
|