From 898db6b8e5d24745128a4cf9bd4b63122af055c8 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Sat, 26 Nov 2022 14:15:32 +0100
Subject: [PATCH] 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 <Gilles.Peskine@arm.com>
---
 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 \