From 1905a244886c00f2fea12b8589a934e759d617af Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Sat, 24 Apr 2021 13:19:45 +0200 Subject: [PATCH] Fix missing compilation guard around psa_crypto_driver_wrappers.c Fix #4411. Signed-off-by: Gilles Peskine --- ChangeLog.d/undefined_reference_without_psa.txt | 4 ++++ library/psa_crypto_driver_wrappers.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ChangeLog.d/undefined_reference_without_psa.txt diff --git a/ChangeLog.d/undefined_reference_without_psa.txt b/ChangeLog.d/undefined_reference_without_psa.txt new file mode 100644 index 0000000000..4dae53419f --- /dev/null +++ b/ChangeLog.d/undefined_reference_without_psa.txt @@ -0,0 +1,4 @@ +Bugfix + * With MBEDTLS_PSA_CRYPTO_C disabled, some functions were getting built + nonetheless, resulting in undefined reference errors when building a + shared library. Reported by Guillermo Garcia M. in #4411. diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c index aab66ab20f..f61e5ebbe6 100644 --- a/library/psa_crypto_driver_wrappers.c +++ b/library/psa_crypto_driver_wrappers.c @@ -28,6 +28,8 @@ #include "mbedtls/platform.h" +#if defined(MBEDTLS_PSA_CRYPTO_C) + #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS) /* Include test driver definition when running tests */ @@ -1777,4 +1779,5 @@ psa_status_t psa_driver_wrapper_mac_abort( return( PSA_ERROR_INVALID_ARGUMENT ); } } -/* End of automatically generated file. */ + +#endif /* MBEDTLS_PSA_CRYPTO_C */