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: master-pre-reformat~600^2~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=59deb33cbe8ade8f8000b8d86198d8e276a2d19f;p=thirdparty%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
---

diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c
index f8c32d825e7..59696959486 100644
--- a/crypto/evp/evp_pbe.c
+++ b/crypto/evp/evp_pbe.c
@@ -259,7 +259,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)