yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-26 12:05:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed memory leaks in PKCS#5 functions

Browse Source
This commit is contained in:
Paul Bakker 2013-07-03 14:01:52 +02:00
parent e07c431eb3
commit 4632083c78
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
library/pkcs5.c
View File

@ -120,6 +120,9 @@ int pkcs5_pbes2( asn1_buf *pbe_params, int mode,
p = pbe_params->p; p = pbe_params->p;
end = p + pbe_params->len; end = p + pbe_params->len;
memset( &md_ctx, 0, sizeof(md_context_t) );
memset( &cipher_ctx, 0, sizeof(cipher_context_t) );
/* /*
* PBES2-params ::= SEQUENCE { * PBES2-params ::= SEQUENCE {
* keyDerivationFunc AlgorithmIdentifier {{PBES2-KDFs}}, * keyDerivationFunc AlgorithmIdentifier {{PBES2-KDFs}},
@ -170,33 +173,37 @@ int pkcs5_pbes2( asn1_buf *pbe_params, int mode,
memcpy( iv, enc_scheme_params.p, enc_scheme_params.len ); memcpy( iv, enc_scheme_params.p, enc_scheme_params.len );
if( ( ret = md_init_ctx( &md_ctx, md_info ) ) != 0 ) if( ( ret = md_init_ctx( &md_ctx, md_info ) ) != 0 )
return( ret ); goto exit;
if( ( ret = cipher_init_ctx( &cipher_ctx, cipher_info ) ) != 0 )
return( ret );
if ( ( ret = pkcs5_pbkdf2_hmac( &md_ctx, pwd, pwdlen, salt.p, salt.len, if ( ( ret = pkcs5_pbkdf2_hmac( &md_ctx, pwd, pwdlen, salt.p, salt.len,
iterations, keylen, key ) ) != 0 ) iterations, keylen, key ) ) != 0 )
{ {
return( ret ); goto exit;
} }
if( ( ret = cipher_init_ctx( &cipher_ctx, cipher_info ) ) != 0 )
goto exit;
if( ( ret = cipher_setkey( &cipher_ctx, key, keylen, mode ) ) != 0 ) if( ( ret = cipher_setkey( &cipher_ctx, key, keylen, mode ) ) != 0 )
return( ret ); goto exit;
if( ( ret = cipher_reset( &cipher_ctx, iv ) ) != 0 ) if( ( ret = cipher_reset( &cipher_ctx, iv ) ) != 0 )
return( ret ); goto exit;
if( ( ret = cipher_update( &cipher_ctx, data, datalen, if( ( ret = cipher_update( &cipher_ctx, data, datalen,
output, &olen ) ) != 0 ) output, &olen ) ) != 0 )
{ {
return( ret ); goto exit;
} }
if( ( ret = cipher_finish( &cipher_ctx, output + olen, &olen ) ) != 0 ) if( ( ret = cipher_finish( &cipher_ctx, output + olen, &olen ) ) != 0 )
return( POLARSSL_ERR_PKCS5_PASSWORD_MISMATCH ); ret = POLARSSL_ERR_PKCS5_PASSWORD_MISMATCH;
return( 0 ); exit:
md_free_ctx( &md_ctx );
cipher_free_ctx( &cipher_ctx );
return( ret );
} }
int pkcs5_pbkdf2_hmac( md_context_t *ctx, const unsigned char *password, int pkcs5_pbkdf2_hmac( md_context_t *ctx, const unsigned char *password,
@ -366,7 +373,8 @@ int pkcs5_self_test( int verbose )
printf( "\n" ); printf( "\n" );
md_free_ctx( &sha1_ctx ); if( ( ret = md_free_ctx( &sha1_ctx ) ) != 0 )
return( 1 );
return( 0 ); return( 0 );
} }