summaryrefslogtreecommitdiff
path: root/ics-openvpn-stripped/main/openssl/crypto/evp/evp_pbe.c
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-12-12 11:49:24 +0100
committerParménides GV <parmegv@sdf.org>2014-12-12 11:49:24 +0100
commit0e7e4005460964cf8dac080e3d99e1df2a1bdc4d (patch)
tree63fdba4f03bf47b0faa62b9d24cdff9a5a79a8b7 /ics-openvpn-stripped/main/openssl/crypto/evp/evp_pbe.c
parent61dc26ab57ad4e2dba341998cabec3f411865e46 (diff)
Updated ics-openvpn to rev924.
Diffstat (limited to 'ics-openvpn-stripped/main/openssl/crypto/evp/evp_pbe.c')
-rw-r--r--ics-openvpn-stripped/main/openssl/crypto/evp/evp_pbe.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ics-openvpn-stripped/main/openssl/crypto/evp/evp_pbe.c b/ics-openvpn-stripped/main/openssl/crypto/evp/evp_pbe.c
index f8c32d82..59696959 100644
--- a/ics-openvpn-stripped/main/openssl/crypto/evp/evp_pbe.c
+++ b/ics-openvpn-stripped/main/openssl/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)