commit c816807f9da22eb134b597dace5ac17ec5385e40
author Manish V Badarkhe <manish.badarkhe@arm.com> Fri Feb 25 09:11:12 2022 +0000
committer Manish V Badarkhe <Manish.Badarkhe@arm.com> Wed Oct 05 15:25:28 2022 +0100
tree a91afcb57b340bc5e4559ccb0cc207765442a80a
parent bf4db5cb6de85969d4d5c30e34d346235be2af02

feat(mbedtls): update mbedTLS driver for DRTM support

Updated mbedTLS driver to include mbedTLS functions necessary for a
DRTM supported build.

Signed-off-by: Manish V Badarkhe <manish.badarkhe@arm.com>
Change-Id: If0120374a971519cf84f93e0c59e1a320a72cd97

bl31/bl31.mk

diff --git a/bl31/bl31.mk b/bl31/bl31.mk
index 878cea5..3e665c5 100644
--- a/bl31/bl31.mk
+++ b/bl31/bl31.mk
@@ -148,7 +148,8 @@
 endif
 
 ifeq (${DRTM_SUPPORT},1)
-BL31_SOURCES		+=	services/std_svc/drtm/drtm_main.c
+BL31_SOURCES		+=	services/std_svc/drtm/drtm_main.c	\
+				${MBEDTLS_SOURCES}
 endif
 
 BL31_LINKERFILE		:=	bl31/bl31.ld.S

drivers/auth/mbedtls/mbedtls_crypto.c

diff --git a/drivers/auth/mbedtls/mbedtls_crypto.c b/drivers/auth/mbedtls/mbedtls_crypto.c
index 0901d04..e83225c 100644
--- a/drivers/auth/mbedtls/mbedtls_crypto.c
+++ b/drivers/auth/mbedtls/mbedtls_crypto.c
@@ -24,7 +24,7 @@
 
 #define LIB_NAME		"mbed TLS"
 
-#if MEASURED_BOOT
+#if MEASURED_BOOT || DRTM_SUPPORT
 /*
  * CRYPTO_MD_MAX_SIZE value is as per current stronger algorithm available
  * so make sure that mbed TLS MD maximum size must be lesser than this.
@@ -32,7 +32,7 @@
 CASSERT(CRYPTO_MD_MAX_SIZE >= MBEDTLS_MD_MAX_SIZE,
 	assert_mbedtls_md_size_overflow);
 
-#endif /* MEASURED_BOOT */
+#endif /* MEASURED_BOOT || DRTM_SUPPORT */
 
 /*
  * AlgorithmIdentifier  ::=  SEQUENCE  {
@@ -221,7 +221,7 @@
 }
 #endif /* TRUSTED_BOARD_BOOT */
 
-#if MEASURED_BOOT
+#if MEASURED_BOOT || DRTM_SUPPORT
 /*
  * Map a generic crypto message digest algorithm to the corresponding macro used
  * by Mbed TLS.
@@ -264,7 +264,7 @@
 	 */
 	return mbedtls_md(md_info, data_ptr, data_len, output);
 }
-#endif /* MEASURED_BOOT */
+#endif /* MEASURED_BOOT || DRTM_SUPPORT */
 
 #if TF_MBEDTLS_USE_AES_GCM
 /*
@@ -368,7 +368,7 @@
 /*
  * Register crypto library descriptor
  */
-#if MEASURED_BOOT && TRUSTED_BOARD_BOOT
+#if (MEASURED_BOOT || DRTM_SUPPORT) && TRUSTED_BOARD_BOOT
 #if TF_MBEDTLS_USE_AES_GCM
 REGISTER_CRYPTO_LIB(LIB_NAME, init, verify_signature, verify_hash, calc_hash,
 		    auth_decrypt);
@@ -383,6 +383,6 @@
 #else
 REGISTER_CRYPTO_LIB(LIB_NAME, init, verify_signature, verify_hash, NULL);
 #endif
-#elif MEASURED_BOOT
+#elif MEASURED_BOOT || DRTM_SUPPORT
 REGISTER_CRYPTO_LIB(LIB_NAME, init, calc_hash);
-#endif /* MEASURED_BOOT && TRUSTED_BOARD_BOOT */
+#endif /* (MEASURED_BOOT || DRTM_SUPPORT) && TRUSTED_BOARD_BOOT */