diff options
| author | Sumitra Sharma <sumitraartsy@gmail.com> | 2023-09-01 12:40:49 +0530 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2023-09-02 15:30:01 +0100 |
| commit | 5318c012885a5382eadbf95aa9c1d35664bca819 (patch) | |
| tree | 321d11eaee885ceb3a74db0a062f9bbdf282148c /ssl/record | |
| parent | 59d87f6e7eb41018a2a17fef2198d3fcf04e63f4 (diff) | |
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 <sumitraartsy@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21886)
Diffstat (limited to 'ssl/record')
| -rw-r--r-- | ssl/record/rec_layer_d1.c | 2 | ||||
| -rw-r--r-- | ssl/record/rec_layer_s3.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c index 75ed6775cb..5dc8d12e76 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 bf92a8e6ab..29c5de88d4 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) * |