From a15c953f77b6df4044d495252c33e42bc3c960b8 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 3 Oct 2016 15:35:17 +0100 Subject: [PATCH] Add a typedef for the construction function Reviewed-by: Rich Salz --- ssl/statem/statem_clnt.c | 3 +-- ssl/statem/statem_locl.h | 8 ++++---- ssl/statem/statem_srvr.c | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index 1ea9d7512f..08b1239d57 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -512,8 +512,7 @@ WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst) * 0: Error */ int ossl_statem_client_construct_message(SSL *s, WPACKET *pkt, - int (**confunc) (SSL *s, WPACKET *pkt), - int *mt) + confunc_f *confunc, int *mt) { OSSL_STATEM *st = &s->statem; diff --git a/ssl/statem/statem_locl.h b/ssl/statem/statem_locl.h index 16c67319d0..6b57b25392 100644 --- a/ssl/statem/statem_locl.h +++ b/ssl/statem/statem_locl.h @@ -43,6 +43,8 @@ typedef enum { /* Flush the write BIO */ int statem_flush(SSL *s); +typedef int (*confunc_f) (SSL *s, WPACKET *pkt); + /* * TLS/DTLS client state machine functions */ @@ -51,8 +53,7 @@ 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 (**confunc) (SSL *s, WPACKET *pkt), - int *mt); + confunc_f *confunc, int *mt); unsigned long ossl_statem_client_max_message_size(SSL *s); MSG_PROCESS_RETURN ossl_statem_client_process_message(SSL *s, PACKET *pkt); WORK_STATE ossl_statem_client_post_process_message(SSL *s, WORK_STATE wst); @@ -65,8 +66,7 @@ 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 (**confunc) (SSL *s, WPACKET *pkt), - int *mt); + confunc_f *confunc,int *mt); unsigned long ossl_statem_server_max_message_size(SSL *s); MSG_PROCESS_RETURN ossl_statem_server_process_message(SSL *s, PACKET *pkt); WORK_STATE ossl_statem_server_post_process_message(SSL *s, WORK_STATE wst); diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 3b5d60c381..009d06c811 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -621,8 +621,7 @@ WORK_STATE ossl_statem_server_post_work(SSL *s, WORK_STATE wst) * 0: Error */ int ossl_statem_server_construct_message(SSL *s, WPACKET *pkt, - int (**confunc) (SSL *s, WPACKET *pkt), - int *mt) + confunc_f *confunc, int *mt) { OSSL_STATEM *st = &s->statem; -- 2.25.1