diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2006-04-15 17:43:43 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2006-04-15 17:43:43 +0000 |
| commit | 9dc17a2536759997e1912cd438d20e5c5688a3e5 (patch) | |
| tree | 8783792f0467e2805525a314cd317bb9a4d9ffcd | |
| parent | 5950bf794329dd6822ee5d2ab3be6ebae733978e (diff) | |
| download | openssl-9dc17a2536759997e1912cd438d20e5c5688a3e5.tar.gz | |
Fix from 0.9.7-stable branch.
| -rw-r--r-- | crypto/evp/p5_crpt2.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/crypto/evp/p5_crpt2.c b/crypto/evp/p5_crpt2.c index f11cb701a4..c969d5a206 100644 --- a/crypto/evp/p5_crpt2.c +++ b/crypto/evp/p5_crpt2.c @@ -201,11 +201,16 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, /* Now decode key derivation function */ + if(!pbe2->keyfunc->parameter || + (pbe2->keyfunc->parameter->type != V_ASN1_SEQUENCE)) + { + EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR); + goto err; + } + pbuf = pbe2->keyfunc->parameter->value.sequence->data; plen = pbe2->keyfunc->parameter->value.sequence->length; - if(!pbe2->keyfunc->parameter || - (pbe2->keyfunc->parameter->type != V_ASN1_SEQUENCE) || - !(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) { + if(!(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) { EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR); goto err; } |