projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3956bfc
)
Use nid not cipher type as some ciphers don't have OIDs.
author
Dr. Stephen Henson
<steve@openssl.org>
Sun, 2 Mar 2014 15:00:21 +0000
(15:00 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Sun, 2 Mar 2014 15:00:21 +0000
(15:00 +0000)
crypto/evp/evp_lib.c
patch
|
blob
|
history
diff --git
a/crypto/evp/evp_lib.c
b/crypto/evp/evp_lib.c
index cf8a0c9a4b473e3547192d6ed27073cf9184ad1b..ee88174603c4127fce0c1711b8c59cfafc1cefa0 100644
(file)
--- 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