commit 69034388e90262d9c5ae935a3a04df7c46bea9d3
author Paul Elliott <paul.elliott@arm.com> Mon Mar 27 21:24:45 2023 +0100
committer Paul Elliott <paul.elliott@arm.com> Mon Mar 27 21:24:45 2023 +0100
tree 82780a29b2400a747fc89b6deffc9a89ff7f6dac
parent f04848cc3b3d2b5a17876227329072b719f74fb0

Fix conflict between restricted and development

MBEDTLS_HAS_ALG_SHA_384_VIA_MD_OR_PSA_BASED_ON_USE_PSA was removed in
development and replaced with MBEDTLS_MD_CAN_SHA384.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

include/mbedtls/ssl.h

diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h
index 432f538..e011b1a 100644
--- a/include/mbedtls/ssl.h
+++ b/include/mbedtls/ssl.h
@@ -611,7 +611,7 @@
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3) && \
     defined(MBEDTLS_SSL_SESSION_TICKETS) && \
     defined(MBEDTLS_AES_C) && defined(MBEDTLS_GCM_C) && \
-    defined(MBEDTLS_HAS_ALG_SHA_384_VIA_MD_OR_PSA_BASED_ON_USE_PSA)
+    defined(MBEDTLS_MD_CAN_SHA384)
 #define MBEDTLS_PSK_MAX_LEN 48 /* 384 bits */
 #else
 #define MBEDTLS_PSK_MAX_LEN 32 /* 256 bits */