Skip to content

Commit 772ce79

Browse files
committed
psa: Fix builds without MBEDTLS_PLATFORM_C
When `MBEDTLS_PLATFORM_C` is not enabled, our PSA Crypto implementation depends on the standard C library for functions like snprintf() and exit(). However, our implementation was not including the proper header files nor redefining all `mbedtls_*` symbols properly to ensure successful builds without MBEDTLS_PLATFORM_C. Add the necessary header files and macro definitions to our PSA Crypto implementation.
1 parent de0f1ae commit 772ce79

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

library/psa_crypto_storage.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#if defined(MBEDTLS_PLATFORM_C)
3939
#include "mbedtls/platform.h"
4040
#else
41+
#include <stdlib.h>
4142
#define mbedtls_calloc calloc
4243
#define mbedtls_free free
4344
#endif

library/psa_crypto_storage_file.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#if defined(MBEDTLS_PLATFORM_C)
3737
#include "mbedtls/platform.h"
3838
#else
39+
#include <stdio.h>
3940
#define mbedtls_snprintf snprintf
4041
#endif
4142

programs/psa/crypto_examples.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
#include "mbedtls/platform.h"
66
#else
77
#include <stdio.h>
8+
#include <stdlib.h>
9+
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
810
#define mbedtls_printf printf
11+
#define mbedtls_exit exit
912
#endif
1013

1114
#define ASSERT( predicate ) \

programs/psa/key_ladder_demo.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
#define mbedtls_calloc calloc
6767
#define mbedtls_free free
6868
#define mbedtls_printf printf
69+
#define mbedtls_exit exit
6970
#endif
7071
#include <stdio.h>
7172
#include <string.h>

0 commit comments

Comments
 (0)