From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 2 Mar 2014 15:00:21 +0000 (+0000)
Subject: Use nid not cipher type as some ciphers don't have OIDs.
X-Git-Tag: OpenSSL_1_0_2-beta2~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1bd4ee1da1c9fe9f8ad79e17df9ff8af7991b5c3;p=openssl

Use nid not cipher type as some ciphers don't have OIDs.
---

diff --git a/crypto/evp/evp_lib.c b/crypto/evp/evp_lib.c
index cf8a0c9a4b..ee88174603 100644
--- a/crypto/evp/evp_lib.c
+++ b/crypto/evp/evp_lib.c
@@ -316,10 +316,11 @@ const EVP_MD *evp_get_fips_md(const EVP_MD *md)
 
 const EVP_CIPHER *evp_get_fips_cipher(const EVP_CIPHER *cipher)
 	{
-	if (cipher->nid == NID_undef)
+	int nid = cipher->nid;
+	if (nid == NID_undef)
 		return FIPS_evp_enc_null();
 	else
-		return FIPS_get_cipherbynid(EVP_CIPHER_type(cipher));
+		return FIPS_get_cipherbynid(nid);
 	}
 
 #endif