diff options
| author |   miod <miod@openbsd.org> | 2014-07-11 14:16:10 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-07-11 14:16:10 +0000 |
| commit | d0c0c2fb7744b8a4cceb16e9a0a3c384edc4278a (patch) | |
| tree | 5d477f771274f90e854f43521474592ce1d0ead2 /lib/libssl/src | |
| parent | make the __cxa_call_terminate() proto match the definition (diff) | |
| download | wireguard-openbsd-d0c0c2fb7744b8a4cceb16e9a0a3c384edc4278a.tar.xz wireguard-openbsd-d0c0c2fb7744b8a4cceb16e9a0a3c384edc4278a.zip | |
In EVP_PBE_alg_add don't use the underlying NID for the cipher
as it may have a non-standard key size; OpenSSL PR #3206 via OpenSSL trunk.
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/evp/evp_pbe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/src/crypto/evp/evp_pbe.c b/lib/libssl/src/crypto/evp/evp_pbe.c index 42ec6e0dda8..fcfc43d5783 100644 --- a/lib/libssl/src/crypto/evp/evp_pbe.c +++ b/lib/libssl/src/crypto/evp/evp_pbe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: evp_pbe.c,v 1.20 2014/07/11 08:44:48 jsing Exp $ */ +/* $OpenBSD: evp_pbe.c,v 1.21 2014/07/11 14:16:10 miod Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 1999. */ @@ -226,7 +226,7 @@ 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) |