From 1d0d43cd46f4518663943be133a473e094bcacb3 Mon Sep 17 00:00:00 2001
From: Tamas Ban <tamas.ban@arm.com>
Date: Tue, 27 Oct 2020 08:55:37 +0000
Subject: [PATCH 2/7] Enable crypto code sharing between independent binaries

Signed-off-by: Tamas Ban <tamas.ban@arm.com>
---
 code_share.c            | 3 +++
 library/platform.c      | 4 ++--
 library/platform_util.c | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 code_share.c

diff --git a/code_share.c b/code_share.c
new file mode 100644
index 000000000..2bf67fb42
--- /dev/null
+++ b/code_share.c
@@ -0,0 +1,3 @@
+/* This is a deliberately empty file just to check whether the patch for enabling
+ * extensive crypto code sharing was already applied on the mbedtls library.
+ */
diff --git a/library/platform.c b/library/platform.c
index 890c4cbab..f8109c73f 100644
--- a/library/platform.c
+++ b/library/platform.c
@@ -41,8 +41,8 @@ static void platform_free_uninit(void *ptr)
 #define MBEDTLS_PLATFORM_STD_FREE     platform_free_uninit
 #endif /* !MBEDTLS_PLATFORM_STD_FREE */
 
-static void * (*mbedtls_calloc_func)(size_t, size_t) = MBEDTLS_PLATFORM_STD_CALLOC;
-static void (*mbedtls_free_func)(void *) = MBEDTLS_PLATFORM_STD_FREE;
+void * (*mbedtls_calloc_func)(size_t, size_t) = MBEDTLS_PLATFORM_STD_CALLOC;
+void (*mbedtls_free_func)(void *) = MBEDTLS_PLATFORM_STD_FREE;
 
 void *mbedtls_calloc(size_t nmemb, size_t size)
 {
diff --git a/library/platform_util.c b/library/platform_util.c
index 19ef07aea..2d9c731d9 100644
--- a/library/platform_util.c
+++ b/library/platform_util.c
@@ -88,7 +88,7 @@
 #if !defined(MBEDTLS_PLATFORM_HAS_EXPLICIT_BZERO) && !(defined(__STDC_LIB_EXT1__) && \
     !defined(__IAR_SYSTEMS_ICC__)) \
     && !defined(_WIN32)
-static void *(*const volatile memset_func)(void *, int, size_t) = memset;
+void *(*const volatile memset_func)(void *, int, size_t) = memset;
 #endif
 
 void mbedtls_platform_zeroize(void *buf, size_t len)
-- 
2.34.1