summaryrefslogtreecommitdiffstats
path: root/lib/libssl/ssl_lib.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2021-01-28 17:00:38 +0000
committerjsing <jsing@openbsd.org>2021-01-28 17:00:38 +0000
commitc37fa200cd9a859380920c1556f51d3cb2793a30 (patch)
tree78d4cc5f31a6fe2643aa130edc28911f9e0dcefb /lib/libssl/ssl_lib.c
parentShow when witness(4) has run out of lock order data entries. (diff)
downloadwireguard-openbsd-c37fa200cd9a859380920c1556f51d3cb2793a30.tar.xz
wireguard-openbsd-c37fa200cd9a859380920c1556f51d3cb2793a30.zip
Move AEAD handling into the new TLSv1.2 record layer.
ok tb@
Diffstat (limited to 'lib/libssl/ssl_lib.c')
-rw-r--r--lib/libssl/ssl_lib.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c
index 5cf4be74aa4..b67f8569cc2 100644
--- a/lib/libssl/ssl_lib.c
+++ b/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 */