summaryrefslogtreecommitdiffstats
path: root/lib/libcrypto/evp/p_open.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2010-10-01 22:58:41 +0000
committerdjm <djm@openbsd.org>2010-10-01 22:58:41 +0000
commit0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe (patch)
tree9173c770f38c55515569708729da7e02172d3f3d /lib/libcrypto/evp/p_open.c
parentimport OpenSSL-1.0.0a (diff)
downloadwireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.tar.xz
wireguard-openbsd-0a5d6eded2bd6dd9bf9d298f0d7139301afe8abe.zip
resolve conflicts, fix local changes
Diffstat (limited to 'lib/libcrypto/evp/p_open.c')
-rw-r--r--lib/libcrypto/evp/p_open.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/evp/p_open.c b/lib/libcrypto/evp/p_open.c
index 9935206d0f3..53a59a295c2 100644
--- a/lib/libcrypto/evp/p_open.c
+++ b/lib/libcrypto/evp/p_open.c
@@ -95,7 +95,7 @@ int EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
goto err;
}
- i=EVP_PKEY_decrypt(key,ek,ekl,priv);
+ i=EVP_PKEY_decrypt_old(key,ek,ekl,priv);
if ((i <= 0) || !EVP_CIPHER_CTX_set_key_length(ctx, i))
{
/* ERROR */