Commit a15c953f authored by Matt Caswell's avatar Matt Caswell
Browse files

Add a typedef for the construction function 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 6392fb8e

ssl/statem/statem_clnt.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

ssl/statem/statem_locl.h

+4 −4
Original line number Diff line number Diff line
@@ -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);

ssl/statem/statem_srvr.c

+1 −2
Original line number Diff line number Diff line
@@ -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;