diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 22:56:37 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-06-27 23:19:37 +0100 |
| commit | d0ba994483a1e8c57fac5f6149004d58628ca44e (patch) | |
| tree | 7446b9ff455b8fdaea21f6c12ac17d4c557d938a /crypto/evp/evp_pbe.c | |
| parent | 52f856526c46ee80ef4c8c37844f084423a3eff7 (diff) | |
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)
Diffstat (limited to 'crypto/evp/evp_pbe.c')
| -rw-r--r-- | crypto/evp/evp_pbe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index f8c32d825e..5969695948 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) |