From 6d62faca8efe515f20aa2b5c1d990e6289da3ad8 Mon Sep 17 00:00:00 2001 From: Tom Cosgrove Date: Wed, 10 May 2023 14:40:05 +0100 Subject: [PATCH] Only include psa_pake_setup() and friends if some PAKE algorithms are required Signed-off-by: Tom Cosgrove --- ChangeLog.d/add-psa_want_alg_some_pake.txt | 3 +++ include/mbedtls/config_psa.h | 4 ++++ library/psa_crypto.c | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 ChangeLog.d/add-psa_want_alg_some_pake.txt diff --git a/ChangeLog.d/add-psa_want_alg_some_pake.txt b/ChangeLog.d/add-psa_want_alg_some_pake.txt new file mode 100644 index 000000000000..00b3002b67cb --- /dev/null +++ b/ChangeLog.d/add-psa_want_alg_some_pake.txt @@ -0,0 +1,3 @@ +Features + * Don't include the PSA dispatch functions for PAKEs (psa_pake_setup() etc) + if no PAKE algorithms are requested diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h index d78391ea82ca..a351060764ca 100644 --- a/include/mbedtls/config_psa.h +++ b/include/mbedtls/config_psa.h @@ -908,6 +908,10 @@ extern "C" { #endif /* MBEDTLS_PSA_CRYPTO_CONFIG */ +#if defined(PSA_WANT_ALG_JPAKE) +#define PSA_WANT_ALG_SOME_PAKE 1 +#endif + /* These features are always enabled. */ #define PSA_WANT_KEY_TYPE_DERIVE 1 #define PSA_WANT_KEY_TYPE_PASSWORD 1 diff --git a/library/psa_crypto.c b/library/psa_crypto.c index 7b6f05be311d..2bd4df107bbd 100644 --- a/library/psa_crypto.c +++ b/library/psa_crypto.c @@ -7384,6 +7384,7 @@ psa_status_t psa_crypto_driver_pake_get_cipher_suite( return PSA_SUCCESS; } +#if defined(PSA_WANT_ALG_SOME_PAKE) psa_status_t psa_pake_setup( psa_pake_operation_t *operation, const psa_pake_cipher_suite_t *cipher_suite) @@ -8100,5 +8101,6 @@ psa_status_t psa_pake_abort( return status; } +#endif /* PSA_WANT_ALG_SOME_PAKE */ #endif /* MBEDTLS_PSA_CRYPTO_C */