From ee7fadb5bf3c6358023d31338abd6537dd7492c6 Mon Sep 17 00:00:00 2001
From: bcook <>
Date: Fri, 9 Sep 2016 00:03:22 +0000
Subject: back out calls to EVP_CIPHER_CTX_cleanup() in
 EVP_Cipher/Encrypt/DecryptFinal

Software that refers to ctx after calling Final breaks with these changes.
 revert parts of 1.31 and 1.32
---
 src/lib/libcrypto/evp/evp_enc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c
index f0b2639f60..0dfb7a5dc3 100644
--- a/src/lib/libcrypto/evp/evp_enc.c
+++ b/src/lib/libcrypto/evp/evp_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_enc.c,v 1.34 2016/09/04 12:35:23 bcook Exp $ */
+/* $OpenBSD: evp_enc.c,v 1.35 2016/09/09 00:03:22 bcook Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -273,7 +273,6 @@ EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
 		ret = EVP_EncryptFinal_ex(ctx, out, outl);
 	else
 		ret = EVP_DecryptFinal_ex(ctx, out, outl);
-	(void) EVP_CIPHER_CTX_cleanup(ctx);
 	return ret;
 }
 
@@ -382,7 +381,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;
 }
 
@@ -499,7 +497,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;
 }
 
-- 
cgit v1.2.3-55-g6feb