Commit d4e81773 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

PR: 1316
parent d366bf79

crypto/evp/p5_crpt2.c

+8 −3
Original line number Diff line number Diff line
@@ -194,11 +194,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;

	}