commit f493f2ad1da6f0ae07f37e10e954cc9312911ad3
author Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 05 17:41:05 2022 +0200
committer Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com> Tue Jul 12 11:11:18 2022 +0200
tree 496a57133973587d3e9020f4b25db6061521108a
parent 3356b89b64837f4b0e9462e715218d5a3308eac0

Use md_internal_get_size() in rsa.c

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

library/rsa.c

diff --git a/library/rsa.c b/library/rsa.c
index 20983c8..462cff6 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -46,6 +46,7 @@
 #include "mbedtls/error.h"
 #include "constant_time_internal.h"
 #include "mbedtls/constant_time.h"
+#include "md_internal.h"
 
 #include <string.h>
 
@@ -1735,14 +1736,14 @@
     /* Are we signing hashed or raw data? */
     if( md_alg != MBEDTLS_MD_NONE )
     {
-        const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type( md_alg );
-        if( md_info == NULL )
+        unsigned char md_size = mbedtls_md_internal_get_size( md_alg );
+        if( md_size == 0 )
             return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
         if( mbedtls_oid_get_oid_by_md( md_alg, &oid, &oid_size ) != 0 )
             return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
-        if( hashlen != mbedtls_md_get_size( md_info ) )
+        if( hashlen != md_size )
             return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
         /* Double-check that 8 + hashlen + oid_size can be used as a