only cleanup ctx if we need to, save ctx flags when we do

diff --git a/crypto/evp/evp_enc.c b/crypto/evp/evp_enc.c
index 8d57d204d60e7c6969b07d3dc61f47fa214f7f21..5b3bf3bb2c209571ddc9519ea1c076c3ab766328 100644 (file)
--- a/crypto/evp/evp_enc.c
+++ b/crypto/evp/evp_enc.c
@@ -115,10 +115,14 @@ int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *imp
                /* Ensure a context left lying around from last time is cleared
                 * (the previous check attempted to avoid this if the same
                 * ENGINE and EVP_CIPHER could be used). */
                /* Ensure a context left lying around from last time is cleared
                 * (the previous check attempted to avoid this if the same
                 * ENGINE and EVP_CIPHER could be used). */

-               EVP_CIPHER_CTX_cleanup(ctx);
-
-               /* Restore encrypt field: it is zeroed by cleanup */
-               ctx->encrypt = enc;
+               if (ctx->cipher)
+                       {
+                       unsigned long flags = ctx->flags;
+                       EVP_CIPHER_CTX_cleanup(ctx);
+                       /* Restore encrypt and flags */
+                       ctx->encrypt = enc;
+                       ctx->flags = flags;
+                       }

 #ifndef OPENSSL_NO_ENGINE
                if(impl)
                        {
 #ifndef OPENSSL_NO_ENGINE
                if(impl)
                        {