From 898db6b8e5d24745128a4cf9bd4b63122af055c8 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Sat, 26 Nov 2022 14:15:32 +0100 Subject: [PATCH 1/2] Move ssl_debug_helpers_generated to the correct library This is a private interface only, so it's an ABI change but not an API change. Signed-off-by: Gilles Peskine --- ChangeLog.d/move-ssl-modules.txt | 3 +++ library/CMakeLists.txt | 2 +- library/Makefile | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 ChangeLog.d/move-ssl-modules.txt diff --git a/ChangeLog.d/move-ssl-modules.txt b/ChangeLog.d/move-ssl-modules.txt new file mode 100644 index 000000000..f00e5ad83 --- /dev/null +++ b/ChangeLog.d/move-ssl-modules.txt @@ -0,0 +1,3 @@ +Bugfix + * Move some SSL-specific code out of libmbedcrypto where it had been placed + accidentally. diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 60b1cf4dd..bd832cbb3 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -84,7 +84,6 @@ set(src_crypto sha1.c sha256.c sha512.c - ssl_debug_helpers_generated.c threading.c timing.c version.c @@ -109,6 +108,7 @@ set(src_tls ssl_ciphersuites.c ssl_client.c ssl_cookie.c + ssl_debug_helpers_generated.c ssl_msg.c ssl_ticket.c ssl_tls.c diff --git a/library/Makefile b/library/Makefile index 6c3b75820..03474d275 100644 --- a/library/Makefile +++ b/library/Makefile @@ -149,7 +149,6 @@ OBJS_CRYPTO= \ sha1.o \ sha256.o \ sha512.o \ - ssl_debug_helpers_generated.o \ threading.o \ timing.o \ version.o \ @@ -178,6 +177,7 @@ OBJS_TLS= \ ssl_ciphersuites.o \ ssl_client.o \ ssl_cookie.o \ + ssl_debug_helpers_generated.o \ ssl_msg.o \ ssl_ticket.o \ ssl_tls.o \ From 89e31adbee9f837812fcfdd2490180a2039df20c Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Sat, 26 Nov 2022 14:18:45 +0100 Subject: [PATCH 2/2] Move mps modules to the correct library This is a private interface only, so it's an ABI change but not an API change. Signed-off-by: Gilles Peskine --- library/CMakeLists.txt | 4 ++-- library/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index bd832cbb3..8106dab59 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -49,8 +49,6 @@ set(src_crypto md.c md5.c memory_buffer_alloc.c - mps_reader.c - mps_trace.c nist_kw.c oid.c padlock.c @@ -103,6 +101,8 @@ set(src_x509 set(src_tls debug.c + mps_reader.c + mps_trace.c net_sockets.c ssl_cache.c ssl_ciphersuites.c diff --git a/library/Makefile b/library/Makefile index 03474d275..5073517ce 100644 --- a/library/Makefile +++ b/library/Makefile @@ -114,8 +114,6 @@ OBJS_CRYPTO= \ md.o \ md5.o \ memory_buffer_alloc.o \ - mps_reader.o \ - mps_trace.o \ nist_kw.o \ oid.o \ padlock.o \ @@ -172,6 +170,8 @@ OBJS_X509= \ OBJS_TLS= \ debug.o \ + mps_reader.o \ + mps_trace.o \ net_sockets.o \ ssl_cache.o \ ssl_ciphersuites.o \