Fix missing compilation guard around psa_crypto_driver_wrappers.c

Fix Mbed-TLS#4411. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
gilles-peskine-arm · Apr 24, 2021 · fe19d00 · fe19d00
1 parent 1c4e784
commit fe19d00
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ChangeLog.d/undefined_reference_without_psa.txt 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
@@ -23,6 +23,8 @@
 #include "psa_crypto_driver_wrappers.h"
 #include "mbedtls/platform.h"
 
+#if defined(MBEDTLS_PSA_CRYPTO_C)
+
 #if defined(MBEDTLS_PSA_CRYPTO_DRIVERS)
 
 /* Include test driver definition when running tests */
@@ -1082,4 +1084,4 @@ psa_status_t psa_driver_wrapper_cipher_abort(
 #endif /* PSA_CRYPTO_DRIVER_PRESENT */
 }
 
-/* End of automatically generated file. */
+#endif /* MBEDTLS_PSA_CRYPTO_C */