Use the record layer msg_callback not the SSL object msg_callback

[openssl.git] / ssl / record / methods / tls_common.c

diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c
index e679d9fe6b929f0aa1c04977cf8b8093b7c27f85..0b63f046a0cc1ab50460211bc184a7d1bed86760 100644 (file)
--- 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);
             }
         }