Skip to content

Commit f651c28

Browse files
tamasbantomi-font
authored andcommittedApr 22, 2024
Enable crypto code sharing between independent binaries
Signed-off-by: Tamas Ban <tamas.ban@arm.com> applied using: git am modules/tee/tf-m/trusted-firmware-m/lib/ext/mbedcrypto/\ 0002-Enable-crypto-code-sharing-between-independent-binar.patch Signed-off-by: Tomi Fontanilles <tomi.fontanilles@nordicsemi.no>
1 parent 47b6730 commit f651c28

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed
 

‎code_share.c

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* This is a deliberately empty file just to check whether the patch for enabling
2+
* extensive crypto code sharing was already applied on the mbedtls library.
3+
*/

‎library/platform.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ static void platform_free_uninit(void *ptr)
4141
#define MBEDTLS_PLATFORM_STD_FREE platform_free_uninit
4242
#endif /* !MBEDTLS_PLATFORM_STD_FREE */
4343

44-
static void * (*mbedtls_calloc_func)(size_t, size_t) = MBEDTLS_PLATFORM_STD_CALLOC;
45-
static void (*mbedtls_free_func)(void *) = MBEDTLS_PLATFORM_STD_FREE;
44+
void * (*mbedtls_calloc_func)(size_t, size_t) = MBEDTLS_PLATFORM_STD_CALLOC;
45+
void (*mbedtls_free_func)(void *) = MBEDTLS_PLATFORM_STD_FREE;
4646

4747
void *mbedtls_calloc(size_t nmemb, size_t size)
4848
{

‎library/platform_util.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
#if !defined(MBEDTLS_PLATFORM_HAS_EXPLICIT_BZERO) && !(defined(__STDC_LIB_EXT1__) && \
8989
!defined(__IAR_SYSTEMS_ICC__)) \
9090
&& !defined(_WIN32)
91-
static void *(*const volatile memset_func)(void *, int, size_t) = memset;
91+
void *(*const volatile memset_func)(void *, int, size_t) = memset;
9292
#endif
9393

9494
void mbedtls_platform_zeroize(void *buf, size_t len)

0 commit comments

Comments
 (0)