commit a370e06e307f867c7e4b0e122ab44bebd528ea3d
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 05 11:55:20 2022 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 12 11:11:18 2022 +0200
tree 939b79c998cba35eb9537c50b35b18684f170211
parent d8a298e1fcb31c55bd99230835ab7305cf7c5e03

Avoid dependency of PK on MD

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index 1eab65a..462807c 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -24,6 +24,8 @@
 #include "pk_wrap.h"
 #include "pkwrite.h"
 
+#include "md_internal.h"
+
 #include "mbedtls/platform_util.h"
 #include "mbedtls/error.h"
 
@@ -358,15 +360,14 @@
  */
 static inline int pk_hashlen_helper( mbedtls_md_type_t md_alg, size_t *hash_len )
 {
-    const mbedtls_md_info_t *md_info;
-
     if( *hash_len != 0 )
         return( 0 );
 
-    if( ( md_info = mbedtls_md_info_from_type( md_alg ) ) == NULL )
+    *hash_len = mbedtls_md_internal_get_size( md_alg );
+
+    if( *hash_len == 0 )
         return( -1 );
 
-    *hash_len = mbedtls_md_get_size( md_info );
     return( 0 );
 }