From: Dr. Stephen Henson <steve@openssl.org>
Date: Fri, 27 Jun 2014 21:56:37 +0000 (+0100)
Subject: Fix for EVP_PBE_alg_add().
X-Git-Tag: OpenSSL_1_0_0n~59
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=80640bf0bc6c3242d1466aaadf32c6c830228e75;p=oweals%2Fopenssl.git

Fix for EVP_PBE_alg_add().

In EVP_PBE_alg_add don't use the underlying NID for the cipher
as it may have a non-standard key size.

PR#3206
(cherry picked from commit efb7caef637a1de8468ca109efd355a9d0e73a45)
---

diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index c9d932d205..aa67ab3931 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -254,7 +254,7 @@ int EVP_PBE_alg_add(int nid, const EVP_CIPHER *cipher, const EVP_MD *md,
 	{
 	int cipher_nid, md_nid;
 	if (cipher)
-		cipher_nid = EVP_CIPHER_type(cipher);
+		cipher_nid = EVP_CIPHER_nid(cipher);
 	else
 		cipher_nid = -1;
 	if (md)