commit 7bd12c5d5e3d207c916e041a5335e5a3a4c040bf
author Andrzej Kurek <andrzej.kurek@arm.com> Wed Aug 24 10:47:10 2022 -0400
committer Andrzej Kurek <Andrzej.Kurek@arm.com> Thu Sep 01 08:57:41 2022 -0400
tree 1f693660e3c58d0d1e3bc52b0a42dcd18e3fafe2
parent 645ff5b8ffef2c8022a27a8f45475cc4aae906d0

Remove MD dependency from pkcs12 module

Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>

include/mbedtls/check_config.h

diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 165bb09..ae5090b 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -159,7 +159,8 @@
 #error "MBEDTLS_PKCS5_C defined, but not all prerequisites"
 #endif
 
-#if defined(MBEDTLS_PKCS12_C) && !defined(MBEDTLS_MD_C)
+#if defined(MBEDTLS_PKCS12_C) && \
+    !( defined(MBEDTLS_MD_C) || defined(MBEDTLS_PSA_CRYPTO_C) )
 #error "MBEDTLS_PKCS12_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 ad0e599..42c4741 100644
--- a/include/mbedtls/mbedtls_config.h
+++ b/include/mbedtls/mbedtls_config.h
@@ -2664,7 +2664,11 @@
  * Module:  library/pkcs12.c
  * Caller:  library/pkparse.c
  *
- * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_CIPHER_C, MBEDTLS_MD_C
+ * Requires: MBEDTLS_ASN1_PARSE_C, MBEDTLS_CIPHER_C and either
+ * MBEDTLS_MD_C or MBEDTLS_PSA_CRYPTO_C.
+ *
+ * \warning If building without MBEDTLS_MD_C, you must call psa_crypto_init()
+ * before doing any PKCS12 operation.
  *
  * This module enables PKCS#12 functions.
  */