From 5361a5a9664046aefcd1a72858826bcb4c93ad9f Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Wed, 31 Aug 2022 16:45:55 +0100 Subject: [PATCH] Remove some miscellaneous references to SSL_CONNECTION There were a small number of references to the SSL_CONNECTION that can be removed easily and replaced with record layer equivalents. Reviewed-by: Hugo Landau Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/19198) --- ssl/record/methods/tls_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c index 85b5bcd483..809a9f8fb4 100644 --- a/ssl/record/methods/tls_common.c +++ b/ssl/record/methods/tls_common.c @@ -1710,7 +1710,7 @@ int tls_write_records(OSSL_RECORD_LAYER *rl, OSSL_RECORD_TEMPLATE *templates, * in the wb->buf */ - if (!using_ktls && !SSL_WRITE_ETM(s) && mac_size != 0) { + if (!using_ktls && !rl->use_etm && mac_size != 0) { unsigned char *mac; if (!WPACKET_allocate_bytes(thispkt, mac_size, &mac) @@ -1799,7 +1799,7 @@ int tls_write_records(OSSL_RECORD_LAYER *rl, OSSL_RECORD_TEMPLATE *templates, SSLfatal(s, SSL_AD_INTERNAL_ERROR, ERR_R_INTERNAL_ERROR); goto err; } - if (SSL_WRITE_ETM(s) && mac_size != 0) { + if (rl->use_etm && mac_size != 0) { unsigned char *mac; if (!WPACKET_allocate_bytes(thispkt, mac_size, &mac) @@ -1921,7 +1921,7 @@ int tls_retry_write_records(OSSL_RECORD_LAYER *rl) tls_release_write_buffer(rl); return 1; } else if (i <= 0) { - if (SSL_CONNECTION_IS_DTLS(s)) { + if (rl->isdtls) { /* * For DTLS, just drop it. That's kind of the whole point in * using a datagram service -- 2.34.1