From: Matt Caswell <matt@openssl.org>
Date: Thu, 10 Nov 2022 15:45:46 +0000 (+0000)
Subject: Remove an unneeded OSSL_RECORD_METHOD function
X-Git-Tag: openssl-3.2.0-alpha1~1395
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5103dfc1200c2f4a450f8b4ff234ad84342d4b6;p=thirdparty%2Fopenssl.git

Remove an unneeded OSSL_RECORD_METHOD function

The reset() function was never called so it can be removed.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19748)
---

diff --git a/include/internal/recordmethod.h b/include/internal/recordmethod.h
index 2d232357d4b..aef2f191922 100644
--- a/include/internal/recordmethod.h
+++ b/include/internal/recordmethod.h
@@ -147,8 +147,6 @@ struct ossl_record_method_st {
                             OSSL_RECORD_LAYER **ret);
     int (*free)(OSSL_RECORD_LAYER *rl);
 
-    int (*reset)(OSSL_RECORD_LAYER *rl); /* Is this needed? */
-
     /* Returns 1 if we have unprocessed data buffered or 0 otherwise */
     int (*unprocessed_read_pending)(OSSL_RECORD_LAYER *rl);
 
diff --git a/ssl/record/methods/dtls_meth.c b/ssl/record/methods/dtls_meth.c
index 858417d965f..10a898abb46 100644
--- a/ssl/record/methods/dtls_meth.c
+++ b/ssl/record/methods/dtls_meth.c
@@ -772,7 +772,6 @@ static size_t dtls_get_max_record_overhead(OSSL_RECORD_LAYER *rl)
 const OSSL_RECORD_METHOD ossl_dtls_record_method = {
     dtls_new_record_layer,
     dtls_free,
-    tls_reset,
     tls_unprocessed_read_pending,
     tls_processed_read_pending,
     tls_app_data_pending,
diff --git a/ssl/record/methods/ktls_meth.c b/ssl/record/methods/ktls_meth.c
index 2f9b11a512a..acd94e180ab 100644
--- a/ssl/record/methods/ktls_meth.c
+++ b/ssl/record/methods/ktls_meth.c
@@ -583,7 +583,6 @@ static struct record_functions_st ossl_ktls_funcs = {
 const OSSL_RECORD_METHOD ossl_ktls_record_method = {
     ktls_new_record_layer,
     tls_free,
-    tls_reset,
     tls_unprocessed_read_pending,
     tls_processed_read_pending,
     tls_app_data_pending,
diff --git a/ssl/record/methods/recmethod_local.h b/ssl/record/methods/recmethod_local.h
index c2efaa9063c..e07193531a2 100644
--- a/ssl/record/methods/recmethod_local.h
+++ b/ssl/record/methods/recmethod_local.h
@@ -478,7 +478,6 @@ tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers,
                          const OSSL_DISPATCH *fns, void *cbarg,
                          OSSL_RECORD_LAYER **retrl);
 int tls_free(OSSL_RECORD_LAYER *rl);
-int tls_reset(OSSL_RECORD_LAYER *rl);
 int tls_unprocessed_read_pending(OSSL_RECORD_LAYER *rl);
 int tls_processed_read_pending(OSSL_RECORD_LAYER *rl);
 size_t tls_app_data_pending(OSSL_RECORD_LAYER *rl);
diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c
index e34a2792d31..0eddfa7c2f9 100644
--- a/ssl/record/methods/tls_common.c
+++ b/ssl/record/methods/tls_common.c
@@ -1426,12 +1426,6 @@ int tls_free(OSSL_RECORD_LAYER *rl)
     return ret;
 }
 
-int tls_reset(OSSL_RECORD_LAYER *rl)
-{
-    memset(rl, 0, sizeof(*rl));
-    return 1;
-}
-
 int tls_unprocessed_read_pending(OSSL_RECORD_LAYER *rl)
 {
     return TLS_BUFFER_get_left(&rl->rbuf) != 0;
@@ -2093,7 +2087,6 @@ int tls_free_buffers(OSSL_RECORD_LAYER *rl)
 const OSSL_RECORD_METHOD ossl_tls_record_method = {
     tls_new_record_layer,
     tls_free,
-    tls_reset,
     tls_unprocessed_read_pending,
     tls_processed_read_pending,
     tls_app_data_pending,