diff options
| author |   djm <djm@openbsd.org> | 2012-10-13 21:25:05 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2012-10-13 21:25:05 +0000 |
| commit | 5cdd308e23c573f20580c33373ebbd6aaf46ca93 (patch) | |
| tree | 8c9c6577606b3e2a4f852b80db635caddf559533 /lib/libcrypto/evp/p_open.c | |
| parent | import OpenSSL-1.0.1c (diff) | |
| download | wireguard-openbsd-5cdd308e23c573f20580c33373ebbd6aaf46ca93.tar.xz wireguard-openbsd-5cdd308e23c573f20580c33373ebbd6aaf46ca93.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/evp/p_open.c')
| -rw-r--r-- | lib/libcrypto/evp/p_open.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libcrypto/evp/p_open.c b/lib/libcrypto/evp/p_open.c index 53a59a295c2..c748fbea877 100644 --- a/lib/libcrypto/evp/p_open.c +++ b/lib/libcrypto/evp/p_open.c @@ -115,7 +115,8 @@ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) int i; i=EVP_DecryptFinal_ex(ctx,out,outl); - EVP_DecryptInit_ex(ctx,NULL,NULL,NULL,NULL); + if (i) + i = EVP_DecryptInit_ex(ctx,NULL,NULL,NULL,NULL); return(i); } #else /* !OPENSSL_NO_RSA */ |