From 5318c012885a5382eadbf95aa9c1d35664bca819 Mon Sep 17 00:00:00 2001 From: Sumitra Sharma Date: Fri, 1 Sep 2023 12:40:49 +0530 Subject: [PATCH] Replace ssl3_get_message() with tls_get_message_header() and/or tls_get_message_body() Update commit messages that previously used ssl3_get_message() to now use tls_get_message_header() and tls_get_message_body() due to the split in OpenSSL 1.1.0. CLA: trivial Fixes #21582 Signed-off-by: Sumitra Sharma Reviewed-by: Matt Caswell Reviewed-by: Tom Cosgrove Reviewed-by: Hugo Landau (Merged from https://github.com/openssl/openssl/pull/21886) --- ssl/record/rec_layer_d1.c | 2 +- ssl/record/rec_layer_s3.c | 3 ++- ssl/ssl_local.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c index 75ed6775cbc..5dc8d12e76a 100644 --- a/ssl/record/rec_layer_d1.c +++ b/ssl/record/rec_layer_d1.c @@ -170,7 +170,7 @@ static void dtls_unbuffer_record(SSL_CONNECTION *s) * Return up to 'len' payload bytes received in 'type' records. * 'type' is one of the following: * - * - SSL3_RT_HANDSHAKE (when ssl3_get_message calls us) + * - SSL3_RT_HANDSHAKE * - SSL3_RT_APPLICATION_DATA (when ssl3_read calls us) * - 0 (during a shutdown, no data has to be returned) * diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index bf92a8e6ab6..29c5de88d41 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -533,7 +533,8 @@ int ssl_release_record(SSL_CONNECTION *s, TLS_RECORD *rr, size_t length) * Return up to 'len' payload bytes received in 'type' records. * 'type' is one of the following: * - * - SSL3_RT_HANDSHAKE (when ssl3_get_message calls us) + * - SSL3_RT_HANDSHAKE (when tls_get_message_header and tls_get_message_body + * call us) * - SSL3_RT_APPLICATION_DATA (when ssl3_read calls us) * - 0 (during a shutdown, no data has to be returned) * diff --git a/ssl/ssl_local.h b/ssl/ssl_local.h index e2157ab6876..29715781ee9 100644 --- a/ssl/ssl_local.h +++ b/ssl/ssl_local.h @@ -1258,7 +1258,7 @@ struct ssl_connection_st { SSL_EARLY_DATA_STATE early_data_state; BUF_MEM *init_buf; /* buffer used during init */ void *init_msg; /* pointer to handshake message body, set by - * ssl3_get_message() */ + * tls_get_message_header() */ size_t init_num; /* amount read/written */ size_t init_off; /* amount read/written */ -- 2.47.2