| commit | 66aca931bc2e2e7b6e5edc0e725cf0fed11f2be3 | [log] [tgz] |
|---|---|---|
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Thu Jun 12 13:14:55 2014 +0200 |
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | Mon Jun 23 11:52:59 2014 +0200 |
| tree | a676fbab282c00ba67292ff6d125534d4852a9d9 | |
| parent | 2a8afa98e250b913b47b7b9157137c1954be4ca2 [diff] [blame] |
Add tests for pkcs5_pbes2
diff --git a/library/pkcs5.c b/library/pkcs5.c index 424952a..061f473 100644 --- a/library/pkcs5.c +++ b/library/pkcs5.c
@@ -175,6 +175,10 @@ 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 ||