summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-03-02 15:00:21 +0000
committerDr. Stephen Henson <steve@openssl.org>2014-03-02 15:00:21 +0000
commit1bd4ee1da1c9fe9f8ad79e17df9ff8af7991b5c3 (patch)
treeed6fa857e2145a7b4fc5288aaf2b998926fbbafa
parent3956bfce60ed573b71c0d30a21735496a730d930 (diff)
downloadopenssl-new-1bd4ee1da1c9fe9f8ad79e17df9ff8af7991b5c3.tar.gz
Use nid not cipher type as some ciphers don't have OIDs.
-rw-r--r--crypto/evp/evp_lib.c5
1 files changed, 3 insertions, 2 deletions
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