lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Add tests for pkcs5_pbes2

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard
2014-06-12 13:14:55 +02:00
parent 2a8afa98e2
commit 66aca931bc
3 changed files with 142 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/pkcs5.c
View File

@ -175,6 +175,10 @@ int pkcs5_pbes2( asn1_buf *pbe_params, int mode,
if( cipher_info == NULL )
return( POLARSSL_ERR_PKCS5_FEATURE_UNAVAILABLE );
/*
* The value of keylen from pkcs5_parse_pbkdf2_params() is ignored
* since it is optional and we don't know if it was set or not
*/
keylen = cipher_info->key_length / 8;
if( enc_scheme_params.tag != ASN1_OCTET_STRING ||