back out calls to EVP_CIPHER_CTX_cleanup() in EVP_Encrypt/DecryptFinal

Software that refers to ctx after calling Final breaks with these changes.
revert parts of 1.31. ok jsing@

1 files changed, 1 insertions, 3 deletions

diff --git a/src/lib/libssl/src/crypto/evp/evp_enc.c b/src/lib/libssl/src/crypto/evp/evp_enc.c
index f8d2cb78d4..c1c851a81a 100644
--- a/src/lib/libssl/src/crypto/evp/evp_enc.c
+++ b/src/lib/libssl/src/crypto/evp/evp_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_enc.c,v 1.31 2016/05/30 13:42:54 beck Exp $ */
+/* $OpenBSD: evp_enc.c,v 1.31.2.1 2016/09/22 04:50:19 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -371,7 +371,6 @@ EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
         int ret;
 
         ret = EVP_EncryptFinal_ex(ctx, out, outl);
-        (void) EVP_CIPHER_CTX_cleanup(ctx);
         return ret;
 }
 
@@ -485,7 +484,6 @@ EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
         int ret;
 
         ret = EVP_DecryptFinal_ex(ctx, out, outl);
-        (void) EVP_CIPHER_CTX_cleanup(ctx);
         return ret;
 }