From d4585ff3c56ef2df2a6158e4f6a9bb19b2b2b158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bence=20Sz=C3=A9pk=C3=BAti?= Date: Fri, 27 Nov 2020 17:00:42 +0100 Subject: [PATCH] Fix removal of deprecated PSA constants MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to a misplaced #endif, the (non-functional) macro definitions were not properly removed from crypto_compat.h if MBEDTLS_DEPRECATED_REMOVED was declared. Signed-off-by: Bence Szépkúti --- include/psa/crypto_compat.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/psa/crypto_compat.h b/include/psa/crypto_compat.h index 339ef270e1..86aa271584 100644 --- a/include/psa/crypto_compat.h +++ b/include/psa/crypto_compat.h @@ -134,10 +134,6 @@ MBEDTLS_PSA_DEPRECATED static inline psa_status_t psa_asymmetric_verify( psa_key return psa_verify_hash( key, alg, hash, hash_length, signature, signature_length ); } - - -#endif /* MBEDTLS_DEPRECATED_REMOVED */ - /* * Size-specific elliptic curve families. */ @@ -244,6 +240,8 @@ MBEDTLS_PSA_DEPRECATED static inline psa_status_t psa_asymmetric_verify( psa_key #define PSA_DH_GROUP_CUSTOM \ MBEDTLS_DEPRECATED_CONSTANT( psa_dh_family_t, PSA_DH_FAMILY_CUSTOM ) +#endif /* MBEDTLS_DEPRECATED_REMOVED */ + /** Open a handle to an existing persistent key. * * Open a handle to a persistent key. A key is persistent if it was created