lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Make hmac_ctx optional

Browse Source 
Note from future self: actually md_init_ctx will be re-introduced with the
same signature later, and a new function with the additional argument will be
added.
This commit is contained in:
Manuel Pégourié-Gonnard
2015-03-25 16:08:53 +01:00
parent dfb3dc8b53
commit 4063ceb281
16 changed files with 37 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
library/md.c
View File

@ -199,7 +199,7 @@ void md_free( md_context_t *ctx )
polarssl_zeroize( ctx, sizeof( md_context_t ) );
}
int md_init_ctx( md_context_t *ctx, const md_info_t *md_info )
int md_init_ctx( md_context_t *ctx, const md_info_t *md_info, int hmac )
{
if( md_info == NULL || ctx == NULL )
return( POLARSSL_ERR_MD_BAD_INPUT_DATA );
@ -209,11 +209,14 @@ int md_init_ctx( md_context_t *ctx, const md_info_t *md_info )
if( ( ctx->md_ctx = md_info->ctx_alloc_func() ) == NULL )
return( POLARSSL_ERR_MD_ALLOC_FAILED );
ctx->hmac_ctx = polarssl_malloc( 2 * md_info->block_size );
if( ctx->hmac_ctx == NULL )
if( hmac != 0 )
{
md_info->ctx_free_func( ctx->md_ctx );
return( POLARSSL_ERR_MD_ALLOC_FAILED );
ctx->hmac_ctx = polarssl_malloc( 2 * md_info->block_size );
if( ctx->hmac_ctx == NULL )
{
md_info->ctx_free_func( ctx->md_ctx );
return( POLARSSL_ERR_MD_ALLOC_FAILED );
}
}
ctx->md_info = md_info;
@ -382,7 +385,7 @@ int md_hmac( const md_info_t *md_info, const unsigned char *key, size_t keylen,
md_init( &ctx );
if( ( ret = md_init_ctx( &ctx, md_info ) ) != 0 )
if( ( ret = md_init_ctx( &ctx, md_info, 1 ) ) != 0 )
return( ret );
md_hmac_starts( &ctx, key, keylen );