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

Small cleanup: less side-effects

Browse Source 
pkcs5_parse_pbkdf2_params() used to modify params.p, which does not look
clean, even if the function is static and params.p isn't use afterwards.
This commit is contained in:
Manuel Pégourié-Gonnard 2014-06-12 17:08:27 +02:00
parent 90dac90f53
commit edc3ab20e2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
library/pkcs5.c
View File

@ -52,13 +52,13 @@
#define polarssl_printf printf #define polarssl_printf printf
#endif #endif
static int pkcs5_parse_pbkdf2_params( asn1_buf *params, static int pkcs5_parse_pbkdf2_params( const asn1_buf *params,
asn1_buf *salt, int *iterations, asn1_buf *salt, int *iterations,
int *keylen, md_type_t *md_type ) int *keylen, md_type_t *md_type )
{ {
int ret; int ret;
asn1_buf prf_alg_oid; asn1_buf prf_alg_oid;
unsigned char **p = &params->p; unsigned char *p = params->p;
const unsigned char *end = params->p + params->len; const unsigned char *end = params->p + params->len;
if( params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) ) if( params->tag != ( ASN1_CONSTRUCTED | ASN1_SEQUENCE ) )
@ -73,28 +73,28 @@ static int pkcs5_parse_pbkdf2_params( asn1_buf *params,
* } * }
* *
*/ */
if( ( ret = asn1_get_tag( p, end, &salt->len, ASN1_OCTET_STRING ) ) != 0 ) if( ( ret = asn1_get_tag( &p, end, &salt->len, ASN1_OCTET_STRING ) ) != 0 )
return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret ); return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
salt->p = *p; salt->p = p;
*p += salt->len; p += salt->len;
if( ( ret = asn1_get_int( p, end, iterations ) ) != 0 ) if( ( ret = asn1_get_int( &p, end, iterations ) ) != 0 )
return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret ); return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
if( *p == end ) if( p == end )
return( 0 ); return( 0 );
if( ( ret = asn1_get_int( p, end, keylen ) ) != 0 ) if( ( ret = asn1_get_int( &p, end, keylen ) ) != 0 )
{ {
if( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG ) if( ret != POLARSSL_ERR_ASN1_UNEXPECTED_TAG )
return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret ); return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
} }
if( *p == end ) if( p == end )
return( 0 ); return( 0 );
if( ( ret = asn1_get_alg_null( p, end, &prf_alg_oid ) ) != 0 ) if( ( ret = asn1_get_alg_null( &p, end, &prf_alg_oid ) ) != 0 )
return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret ); return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + ret );
if( !OID_CMP( OID_HMAC_SHA1, &prf_alg_oid ) ) if( !OID_CMP( OID_HMAC_SHA1, &prf_alg_oid ) )
@ -102,7 +102,7 @@ static int pkcs5_parse_pbkdf2_params( asn1_buf *params,
*md_type = POLARSSL_MD_SHA1; *md_type = POLARSSL_MD_SHA1;
if( *p != end ) if( p != end )
return( POLARSSL_ERR_PKCS5_INVALID_FORMAT + return( POLARSSL_ERR_PKCS5_INVALID_FORMAT +
POLARSSL_ERR_ASN1_LENGTH_MISMATCH ); POLARSSL_ERR_ASN1_LENGTH_MISMATCH );