diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 93723b50b639d8dc717bc1bf463fd46e1b321239 (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/evp/p_open.c | |
| parent | 65e72ac55a6405783db7a12d7e35a7561d46005b (diff) | |
| download | openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.gz openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.tar.bz2 openbsd-93723b50b639d8dc717bc1bf463fd46e1b321239.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/evp/p_open.c')
| -rw-r--r-- | src/lib/libcrypto/evp/p_open.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c index 53a59a295c..c748fbea87 100644 --- a/src/lib/libcrypto/evp/p_open.c +++ b/src/lib/libcrypto/evp/p_open.c | |||
| @@ -115,7 +115,8 @@ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) | |||
| 115 | int i; | 115 | int i; |
| 116 | 116 | ||
| 117 | i=EVP_DecryptFinal_ex(ctx,out,outl); | 117 | i=EVP_DecryptFinal_ex(ctx,out,outl); |
| 118 | EVP_DecryptInit_ex(ctx,NULL,NULL,NULL,NULL); | 118 | if (i) |
| 119 | i = EVP_DecryptInit_ex(ctx,NULL,NULL,NULL,NULL); | ||
| 119 | return(i); | 120 | return(i); |
| 120 | } | 121 | } |
| 121 | #else /* !OPENSSL_NO_RSA */ | 122 | #else /* !OPENSSL_NO_RSA */ |