diff options
| author | Frederik Wedel-Heinen <frederik.wedel-heinen@dencrypt.dk> | 2024-02-07 19:41:40 +0100 |
|---|---|---|
| committer | Hugo Landau <hlandau@openssl.org> | 2024-02-09 14:27:00 +0000 |
| commit | cfabddfb9f6f54b3f3b8e90ccb918967390a7fb2 (patch) | |
| tree | 019476ed13e949a2d03568e55c95d7d6dcedb570 /ssl | |
| parent | 62cb7c810e882895a71ba2cc479f482df0aa8e32 (diff) | |
Remove unused function arguments from tls_int_new_record_layer
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23514)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/record/methods/dtls_meth.c | 5 | ||||
| -rw-r--r-- | ssl/record/methods/ktls_meth.c | 5 | ||||
| -rw-r--r-- | ssl/record/methods/recmethod_local.h | 6 | ||||
| -rw-r--r-- | ssl/record/methods/tls_common.c | 13 |
4 files changed, 9 insertions, 20 deletions
diff --git a/ssl/record/methods/dtls_meth.c b/ssl/record/methods/dtls_meth.c index 258dbd3b14..ddaf2481f8 100644 --- a/ssl/record/methods/dtls_meth.c +++ b/ssl/record/methods/dtls_meth.c @@ -641,9 +641,8 @@ dtls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers, int ret; ret = tls_int_new_record_layer(libctx, propq, vers, role, direction, level, - key, keylen, iv, ivlen, mackey, mackeylen, - ciph, taglen, mactype, md, comp, prev, - transport, next, local, peer, settings, + ciph, taglen, md, comp, prev, + transport, next, settings, options, fns, cbarg, retrl); if (ret != OSSL_RECORD_RETURN_SUCCESS) diff --git a/ssl/record/methods/ktls_meth.c b/ssl/record/methods/ktls_meth.c index af91455c29..6972a2fc88 100644 --- a/ssl/record/methods/ktls_meth.c +++ b/ssl/record/methods/ktls_meth.c @@ -417,9 +417,8 @@ ktls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers, int ret; ret = tls_int_new_record_layer(libctx, propq, vers, role, direction, level, - key, keylen, iv, ivlen, mackey, mackeylen, - ciph, taglen, mactype, md, comp, prev, - transport, next, local, peer, settings, + ciph, taglen, md, comp, prev, + transport, next, settings, options, fns, cbarg, retrl); if (ret != OSSL_RECORD_RETURN_SUCCESS) diff --git a/ssl/record/methods/recmethod_local.h b/ssl/record/methods/recmethod_local.h index 37bde3fe16..8cc19999a0 100644 --- a/ssl/record/methods/recmethod_local.h +++ b/ssl/record/methods/recmethod_local.h @@ -434,14 +434,10 @@ int tls13_common_post_process_record(OSSL_RECORD_LAYER *rl, TLS_RL_RECORD *rec); int tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers, - int role, int direction, int level, unsigned char *key, - size_t keylen, unsigned char *iv, size_t ivlen, - unsigned char *mackey, size_t mackeylen, + int role, int direction, int level, const EVP_CIPHER *ciph, size_t taglen, - int mactype, const EVP_MD *md, COMP_METHOD *comp, BIO *prev, BIO *transport, BIO *next, - BIO_ADDR *local, BIO_ADDR *peer, const OSSL_PARAM *settings, const OSSL_PARAM *options, const OSSL_DISPATCH *fns, void *cbarg, OSSL_RECORD_LAYER **retrl); diff --git a/ssl/record/methods/tls_common.c b/ssl/record/methods/tls_common.c index be7f347538..c2e21e6d54 100644 --- a/ssl/record/methods/tls_common.c +++ b/ssl/record/methods/tls_common.c @@ -1232,14 +1232,10 @@ int tls_set_options(OSSL_RECORD_LAYER *rl, const OSSL_PARAM *options) int tls_int_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers, - int role, int direction, int level, unsigned char *key, - size_t keylen, unsigned char *iv, size_t ivlen, - unsigned char *mackey, size_t mackeylen, + int role, int direction, int level, const EVP_CIPHER *ciph, size_t taglen, - int mactype, const EVP_MD *md, COMP_METHOD *comp, BIO *prev, - BIO *transport, BIO *next, BIO_ADDR *local, - BIO_ADDR *peer, const OSSL_PARAM *settings, + BIO *transport, BIO *next, const OSSL_PARAM *settings, const OSSL_PARAM *options, const OSSL_DISPATCH *fns, void *cbarg, OSSL_RECORD_LAYER **retrl) @@ -1387,9 +1383,8 @@ tls_new_record_layer(OSSL_LIB_CTX *libctx, const char *propq, int vers, int ret; ret = tls_int_new_record_layer(libctx, propq, vers, role, direction, level, - key, keylen, iv, ivlen, mackey, mackeylen, - ciph, taglen, mactype, md, comp, prev, - transport, next, local, peer, settings, + ciph, taglen, md, comp, prev, + transport, next, settings, options, fns, cbarg, retrl); if (ret != OSSL_RECORD_RETURN_SUCCESS) |