diff options
| author | yangyangtiantianlonglong <yangtianlong1224@163.com> | 2021-12-31 11:00:57 +0800 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2022-01-09 13:16:48 +1100 |
| commit | e1c122711edc3b9d64e506a51c3c0482569b7498 (patch) | |
| tree | aac9c125d3880c5e9c87263d0b5fc868d39b3d11 /ssl | |
| parent | 21095479c016f2ceaca0f71078fd27f0e9ba9375 (diff) | |
| download | openssl-new-e1c122711edc3b9d64e506a51c3c0482569b7498.tar.gz | |
Delete unused param about get_construct_message_f
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17385)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/statem/statem.c | 4 | ||||
| -rw-r--r-- | ssl/statem/statem_clnt.c | 2 | ||||
| -rw-r--r-- | ssl/statem/statem_local.h | 4 | ||||
| -rw-r--r-- | ssl/statem/statem_srvr.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index 4c463974ea..42a6577d5e 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -768,7 +768,7 @@ static SUB_STATE_RETURN write_state_machine(SSL *s) WRITE_TRAN(*transition) (SSL *s); WORK_STATE(*pre_work) (SSL *s, WORK_STATE wst); WORK_STATE(*post_work) (SSL *s, WORK_STATE wst); - int (*get_construct_message_f) (SSL *s, WPACKET *pkt, + int (*get_construct_message_f) (SSL *s, int (**confunc) (SSL *s, WPACKET *pkt), int *mt); void (*cb) (const SSL *ssl, int type, int val) = NULL; @@ -833,7 +833,7 @@ static SUB_STATE_RETURN write_state_machine(SSL *s) case WORK_FINISHED_STOP: return SUB_STATE_END_HANDSHAKE; } - if (!get_construct_message_f(s, &pkt, &confunc, &mt)) { + if (!get_construct_message_f(s, &confunc, &mt)) { /* SSLfatal() already called */ return SUB_STATE_ERROR; } diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 05f915bd91..63008bcba0 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -879,7 +879,7 @@ WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst) * 1: Success * 0: Error */ -int ossl_statem_client_construct_message(SSL *s, WPACKET *pkt, +int ossl_statem_client_construct_message(SSL *s, confunc_f *confunc, int *mt) { OSSL_STATEM *st = &s->statem; diff --git a/ssl/statem/statem_local.h b/ssl/statem/statem_local.h index 1883b0166f..326abeba18 100644 --- a/ssl/statem/statem_local.h +++ b/ssl/statem/statem_local.h @@ -75,7 +75,7 @@ int ossl_statem_client_read_transition(SSL *s, int mt); WRITE_TRAN ossl_statem_client_write_transition(SSL *s); WORK_STATE ossl_statem_client_pre_work(SSL *s, WORK_STATE wst); WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst); -int ossl_statem_client_construct_message(SSL *s, WPACKET *pkt, +int ossl_statem_client_construct_message(SSL *s, confunc_f *confunc, int *mt); size_t ossl_statem_client_max_message_size(SSL *s); MSG_PROCESS_RETURN ossl_statem_client_process_message(SSL *s, PACKET *pkt); @@ -88,7 +88,7 @@ int ossl_statem_server_read_transition(SSL *s, int mt); WRITE_TRAN ossl_statem_server_write_transition(SSL *s); WORK_STATE ossl_statem_server_pre_work(SSL *s, WORK_STATE wst); WORK_STATE ossl_statem_server_post_work(SSL *s, WORK_STATE wst); -int ossl_statem_server_construct_message(SSL *s, WPACKET *pkt, +int ossl_statem_server_construct_message(SSL *s, confunc_f *confunc,int *mt); size_t ossl_statem_server_max_message_size(SSL *s); MSG_PROCESS_RETURN ossl_statem_server_process_message(SSL *s, PACKET *pkt); diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 045abfcbc0..cc65ee2d0e 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -1014,7 +1014,7 @@ WORK_STATE ossl_statem_server_post_work(SSL *s, WORK_STATE wst) * 1: Success * 0: Error */ -int ossl_statem_server_construct_message(SSL *s, WPACKET *pkt, +int ossl_statem_server_construct_message(SSL *s, confunc_f *confunc, int *mt) { OSSL_STATEM *st = &s->statem; |