diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2012-10-13 21:25:15 +0000 |
| commit | 426a154a830ca2d9bae74612741ff86332f5c66e (patch) | |
| tree | 7937e26cb4336f7a8bfd41a8238859a89e83e4b3 /lib/libcrypto/evp/p_seal.c | |
| parent | 1ab62f029308adf86f7a805afd722d5170be8c34 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/evp/p_seal.c')
| -rw-r--r-- | lib/libcrypto/evp/p_seal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libcrypto/evp/p_seal.c b/lib/libcrypto/evp/p_seal.c index d8324526e74..e5919b0fbf9 100644 --- a/lib/libcrypto/evp/p_seal.c +++ b/lib/libcrypto/evp/p_seal.c @@ -110,6 +110,7 @@ int EVP_SealFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl) { int i; i = EVP_EncryptFinal_ex(ctx,out,outl); - EVP_EncryptInit_ex(ctx,NULL,NULL,NULL,NULL); + if (i) + i = EVP_EncryptInit_ex(ctx,NULL,NULL,NULL,NULL); return i; } |