commit ecaba1c9b24cbab31f98bc8fecef30c88b1398dc
author Neil Armstrong <narmstrong@baylibre.com> Thu Aug 11 10:47:08 2022 +0200
committer Neil Armstrong <narmstrong@baylibre.com> Fri Aug 19 11:49:22 2022 +0200
tree add7a3a3f007aa2beccf0b9474b1d59f6337bc7c
parent 0d76341eace52010cbf1d8f6e2b5054455614eb9

Make use of PSA crypto hash if MBEDTLS_MD_C isn't defined

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

include/mbedtls/check_config.h

diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 719ffb7..b83fce5 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -108,7 +108,8 @@
 #endif
 
 #if defined(MBEDTLS_ECJPAKE_C) &&           \
-    ( !defined(MBEDTLS_ECP_C) || !defined(MBEDTLS_MD_C) )
+    ( !defined(MBEDTLS_ECP_C) ||            \
+      !( defined(MBEDTLS_MD_C) || defined(MBEDTLS_PSA_CRYPTO_C) ) )
 #error "MBEDTLS_ECJPAKE_C defined, but not all prerequisites"
 #endif
 

include/mbedtls/mbedtls_config.h

diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h
index d7662ef..044403f 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -2330,6 +2330,9 @@
  *      ECJPAKE
  *
  * Requires: MBEDTLS_ECP_C, MBEDTLS_MD_C
+ *
+ * \warning If building without MBEDTLS_MD_C, you must call psa_crypto_init()
+ * before doing any EC J-PAKE operations.
  */
 #define MBEDTLS_ECJPAKE_C