From 310590139e45116d86627dcc85e83f2e3fcbb6b4 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 22 Aug 2022 16:03:41 +0100 Subject: [PATCH] Use the record layer msg_callback not the SSL object msg_callback This removes unnecessary usage of the SSL object from the record layer. Reviewed-by: Hugo Landau Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/19198) --- ssl/record/methods/tls_common.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c index e679d9fe6b..0b63f046a0 100644 --- a/ssl/record/methods/tls_common.c +++ b/ssl/record/methods/tls_common.c @@ -1718,18 +1718,17 @@ int tls_write_records(OSSL_RECORD_LAYER *rl, OSSL_RECORD_TEMPLATE *templates, goto err; } - if (s->msg_callback) { + if (rl->msg_callback) { recordstart = WPACKET_get_curr(thispkt) - len - SSL3_RT_HEADER_LENGTH; - s->msg_callback(1, thiswr->rec_version, SSL3_RT_HEADER, recordstart, - SSL3_RT_HEADER_LENGTH, ssl, - s->msg_callback_arg); + rl->msg_callback(1, thiswr->rec_version, SSL3_RT_HEADER, recordstart, + SSL3_RT_HEADER_LENGTH, rl->cbarg); if (SSL_CONNECTION_TREAT_AS_TLS13(s) && s->enc_write_ctx != NULL) { unsigned char ctype = thistempl->type; - s->msg_callback(1, thiswr->rec_version, SSL3_RT_INNER_CONTENT_TYPE, - &ctype, 1, ssl, s->msg_callback_arg); + rl->msg_callback(1, thiswr->rec_version, SSL3_RT_INNER_CONTENT_TYPE, + &ctype, 1, rl->cbarg); } } -- 2.34.1