From 6e7051af133e44dffdedd44545ccbe275430fef7 Mon Sep 17 00:00:00 2001 From: Hanno Becker Date: Wed, 5 Feb 2020 11:33:54 +0000 Subject: [PATCH] Add guarded ssl_msg.c to Makefiles This commit adds the newly created copy ssl_msg.c of ssl_tls.c to the build system but guards its content by an `#if 0 ... #endif` preprocessor guard in order to avoid compilation failures resulting from code duplication. This guard will be removed once the contents of ssl_tls.c and ssl_msg.c have been made disjoint. --- library/CMakeLists.txt | 1 + library/Makefile | 1 + library/ssl_msg.c | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index d990d4320..15443259b 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -87,6 +87,7 @@ set(src_tls ssl_ciphersuites.c ssl_cli.c ssl_cookie.c + ssl_msg.c ssl_srv.c ssl_ticket.c ssl_tls.c diff --git a/library/Makefile b/library/Makefile index 6fc110cee..6debdfd93 100644 --- a/library/Makefile +++ b/library/Makefile @@ -77,6 +77,7 @@ OBJS_X509= certs.o pkcs11.o x509.o \ OBJS_TLS= debug.o net_sockets.o \ ssl_cache.o ssl_ciphersuites.o \ ssl_cli.o ssl_cookie.o \ + ssl_msg.o \ ssl_srv.o ssl_ticket.o \ ssl_tls.o diff --git a/library/ssl_msg.c b/library/ssl_msg.c index 085a0b94a..8274240d2 100644 --- a/library/ssl_msg.c +++ b/library/ssl_msg.c @@ -1,3 +1,5 @@ +#if 0 + /* * SSLv3/TLSv1 shared functions * @@ -12949,3 +12951,5 @@ exit: MBEDTLS_SSL_PROTO_TLS1_2 */ #endif /* MBEDTLS_SSL_TLS_C */ + +#endif /* 0 */