diff options
author | Matt Caswell <matt@openssl.org> | 2022-10-21 16:44:08 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2022-10-27 10:52:52 +0100 |
commit | fba0206da7c0cc68854bb63a6ee9b96a74f4ed7a (patch) | |
tree | 06ff11bf275ea035cbf743e58fa57a858080ab66 /ssl | |
parent | 7eb39ecb299db3eade11946f9385f5dee1d458d3 (diff) |
Remove some unused OSSL_RECORD_METHOD functions
Remove two function pointers from the OSSL_RECORD_METHOD. Those functions
were no-ops and were never called.
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19472)
Diffstat (limited to 'ssl')
-rw-r--r-- | ssl/record/methods/dtls_meth.c | 2 | ||||
-rw-r--r-- | ssl/record/methods/ktls_meth.c | 2 | ||||
-rw-r--r-- | ssl/record/methods/recmethod_local.h | 2 | ||||
-rw-r--r-- | ssl/record/methods/tls_common.c | 12 | ||||
-rw-r--r-- | ssl/record/recordmethod.h | 10 |
5 files changed, 0 insertions, 28 deletions
diff --git a/ssl/record/methods/dtls_meth.c b/ssl/record/methods/dtls_meth.c index 9988e2406f..cb3e305736 100644 --- a/ssl/record/methods/dtls_meth.c +++ b/ssl/record/methods/dtls_meth.c @@ -771,8 +771,6 @@ const OSSL_RECORD_METHOD ossl_dtls_record_method = { tls_unprocessed_read_pending, tls_processed_read_pending, tls_app_data_pending, - tls_write_pending, - tls_get_max_record_len, tls_get_max_records, tls_write_records, tls_retry_write_records, diff --git a/ssl/record/methods/ktls_meth.c b/ssl/record/methods/ktls_meth.c index 63cf6b475f..2d14cfe317 100644 --- a/ssl/record/methods/ktls_meth.c +++ b/ssl/record/methods/ktls_meth.c @@ -579,8 +579,6 @@ const OSSL_RECORD_METHOD ossl_ktls_record_method = { tls_unprocessed_read_pending, tls_processed_read_pending, tls_app_data_pending, - tls_write_pending, - tls_get_max_record_len, tls_get_max_records, tls_write_records, tls_retry_write_records, diff --git a/ssl/record/methods/recmethod_local.h b/ssl/record/methods/recmethod_local.h index b02ab296bd..9b85ce9e14 100644 --- a/ssl/record/methods/recmethod_local.h +++ b/ssl/record/methods/recmethod_local.h @@ -389,8 +389,6 @@ 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); -int tls_write_pending(OSSL_RECORD_LAYER *rl); -size_t tls_get_max_record_len(OSSL_RECORD_LAYER *rl); size_t tls_get_max_records(OSSL_RECORD_LAYER *rl, int type, size_t len, size_t maxfrag, size_t *preffrag); int tls_write_records(OSSL_RECORD_LAYER *rl, OSSL_RECORD_TEMPLATE *templates, diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c index 4ef65ae152..08dfca82e1 100644 --- a/ssl/record/methods/tls_common.c +++ b/ssl/record/methods/tls_common.c @@ -1445,16 +1445,6 @@ size_t tls_app_data_pending(OSSL_RECORD_LAYER *rl) return num; } -int tls_write_pending(OSSL_RECORD_LAYER *rl) -{ - return 0; -} - -size_t tls_get_max_record_len(OSSL_RECORD_LAYER *rl) -{ - return 0; -} - size_t tls_get_max_records_default(OSSL_RECORD_LAYER *rl, int type, size_t len, size_t maxfrag, size_t *preffrag) { @@ -2098,8 +2088,6 @@ const OSSL_RECORD_METHOD ossl_tls_record_method = { tls_unprocessed_read_pending, tls_processed_read_pending, tls_app_data_pending, - tls_write_pending, - tls_get_max_record_len, tls_get_max_records, tls_write_records, tls_retry_write_records, diff --git a/ssl/record/recordmethod.h b/ssl/record/recordmethod.h index 70e6e4d26a..064f8e5feb 100644 --- a/ssl/record/recordmethod.h +++ b/ssl/record/recordmethod.h @@ -164,16 +164,6 @@ struct ossl_record_method_st { */ size_t (*app_data_pending)(OSSL_RECORD_LAYER *rl); - int (*write_pending)(OSSL_RECORD_LAYER *rl); - - /* - * Find out the maximum amount of plaintext data that the record layer is - * prepared to write in a single record. When calling write_records it is - * the caller's responsibility to ensure that no record template exceeds - * this maximum when calling write_records. - */ - size_t (*get_max_record_len)(OSSL_RECORD_LAYER *rl); - /* * Find out the maximum number of records that the record layer is prepared * to process in a single call to write_records. It is the caller's |