mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-01 04:20:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Introduce compute_hash() function

Browse Source 
This allows callers not to worry with md_info and makes it easier to
provide a PSA version for when MD_C is not available.

Signed-off-by: Manuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>
This commit is contained in:
Manuel Pégourié-Gonnard 2022-07-15 13:10:54 +02:00 committed by Przemek Stekiel
parent f701acc088
commit 35c09e4824
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
library/rsa.c
View File

@ -1163,7 +1163,7 @@ exit:
* \param hlen length of the input hash * \param hlen length of the input hash
* \param salt the input salt * \param salt the input salt
* \param slen length of the input salt * \param slen length of the input salt
* \param out the output buffer - must be large enough for \c md_alg * \param out the output buffer - must be large enough for \p md_alg
* \param md_alg message digest to use * \param md_alg message digest to use
*/ */
static int hash_mprime( const unsigned char *hash, size_t hlen, static int hash_mprime( const unsigned char *hash, size_t hlen,
@ -1197,6 +1197,27 @@ exit:
return( ret ); return( ret );
} }
/**
* Compute a hash.
*
* \param md_alg algorithm to use
* \param input input message to hash
* \param ilen input length
* \param output the output buffer - must be large enough for \p md_alg
*/
static int compute_hash( mbedtls_md_type_t md_alg,
const unsigned char *input, size_t ilen,
unsigned char *output )
{
const mbedtls_md_info_t *md_info;
md_info = mbedtls_md_info_from_type( md_alg );
if( md_info == NULL )
return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
return( mbedtls_md( md_info, input, ilen, output ) );
}
#endif /* MBEDTLS_PKCS1_V21 */ #endif /* MBEDTLS_PKCS1_V21 */
#if defined(MBEDTLS_PKCS1_V21) #if defined(MBEDTLS_PKCS1_V21)
@ -1247,7 +1268,8 @@ int mbedtls_rsa_rsaes_oaep_encrypt( mbedtls_rsa_context *ctx,
p += hlen; p += hlen;
/* Construct DB */ /* Construct DB */
if( ( ret = mbedtls_md( md_info, label, label_len, p ) ) != 0 ) ret = compute_hash( (mbedtls_md_type_t) ctx->hash_id, label, label_len, p );
if( ret != 0 )
return( ret ); return( ret );
p += hlen; p += hlen;
p += olen - 2 * hlen - 2 - ilen; p += olen - 2 * hlen - 2 - ilen;
@ -1428,7 +1450,9 @@ int mbedtls_rsa_rsaes_oaep_decrypt( mbedtls_rsa_context *ctx,
} }
/* Generate lHash */ /* Generate lHash */
if( ( ret = mbedtls_md( md_info, label, label_len, lhash ) ) != 0 ) ret = compute_hash( (mbedtls_md_type_t) ctx->hash_id,
label, label_len, lhash );
if( ret != 0 )
goto cleanup; goto cleanup;
/* /*