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

Check return code of EVP_CipherInit() in PKCS#12 code.

parent 3fee2551

crypto/pkcs12/p12_crpt.c

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 
		ASN1_TYPE *param, const EVP_CIPHER *cipher, const EVP_MD *md, int en_de)

{

	PBEPARAM *pbe;

	int saltlen, iter;

	int saltlen, iter, ret;

	unsigned char *salt;

	const unsigned char *pbuf;

	unsigned char key[EVP_MAX_KEY_LENGTH], iv[EVP_MAX_IV_LENGTH];
@@ -118,8 +118,8 @@ int PKCS12_PBE_keyivgen (EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 
		return 0;

	}

	PBEPARAM_free(pbe);

	EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, en_de);

	ret = EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, en_de);

	OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);

	OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);

	return 1;

	return ret;

}