generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check pbe2->keyfunc->parameter is not NULL before dereferencing.

Browse Source 
PR: 1316
This commit is contained in:
Dr. Stephen Henson
2006-04-15 17:42:46 +00:00
parent d366bf7948
commit d4e81773cc
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/evp/p5_crpt2.c
View File

@@ -194,11 +194,16 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
/* Now decode key derivation function */ /* 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; pbuf = pbe2->keyfunc->parameter->value.sequence->data;
plen = pbe2->keyfunc->parameter->value.sequence->length; plen = pbe2->keyfunc->parameter->value.sequence->length;
if(!pbe2->keyfunc->parameter || if(!(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) {
(pbe2->keyfunc->parameter->type != V_ASN1_SEQUENCE) ||
!(kdf = d2i_PBKDF2PARAM(NULL, &pbuf, plen)) ) {
EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR); EVPerr(EVP_F_PKCS5_V2_PBE_KEYIVGEN,EVP_R_DECODE_ERROR);
goto err; goto err;
} }