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:39 +0100 |
| commit | 59deb33cbe8ade8f8000b8d86198d8e276a2d19f (patch) | |
| tree | 6d59aa1c230bc054695db9ffc09fb742ef1e9f0e /crypto/evp/evp_pbe.c | |
| parent | 406d4af050cff0f52c5435504186eaf03ca69698 (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
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) |