From 282f50c32f1cbabc77296f995bf1a6408dca06df Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 28 Jan 2021 17:00:39 +0000
Subject: Move AEAD handling into the new TLSv1.2 record layer.

ok tb@
---
 src/lib/libssl/ssl_lib.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/lib/libssl/ssl_lib.c')

diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 5cf4be74aa..b67f8569cc 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.243 2021/01/26 18:45:32 tb Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.244 2021/01/28 17:00:38 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2618,12 +2618,6 @@ ssl_clear_cipher_read_state(SSL *s)
 	s->read_hash = NULL;
 
 	tls12_record_layer_clear_read_state(s->internal->rl);
-
-	if (s->internal->aead_read_ctx != NULL) {
-		EVP_AEAD_CTX_cleanup(&s->internal->aead_read_ctx->ctx);
-		free(s->internal->aead_read_ctx);
-		s->internal->aead_read_ctx = NULL;
-	}
 }
 
 void
@@ -2635,12 +2629,6 @@ ssl_clear_cipher_write_state(SSL *s)
 	s->internal->write_hash = NULL;
 
 	tls12_record_layer_clear_write_state(s->internal->rl);
-
-	if (s->internal->aead_write_ctx != NULL) {
-		EVP_AEAD_CTX_cleanup(&s->internal->aead_write_ctx->ctx);
-		free(s->internal->aead_write_ctx);
-		s->internal->aead_write_ctx = NULL;
-	}
 }
 
 /* Fix this function so that it takes an optional type parameter */
-- 
cgit v1.2.3-55-g6feb