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

Fix from 0.9.7-stable branch.

parent 5950bf79

crypto/evp/p5_crpt2.c

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

	}

	}