From d6f1a6e931beccd75b4e77c8ea99ca6699d052b4 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Mon, 5 Oct 2015 10:58:52 +0100 Subject: [PATCH 1/1] Rename STATEM to OSSL_STATEM Add an OSSL_ prefix onto STATEM Reviewed-by: Tim Hudson Reviewed-by: Richard Levitte --- ssl/ssl_locl.h | 2 +- ssl/statem/statem.c | 14 +++++++------- ssl/statem/statem.h | 4 ++-- ssl/statem/statem_clnt.c | 16 ++++++++-------- ssl/statem/statem_srvr.c | 16 ++++++++-------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 24ce4f752a..8d9f51a790 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1010,7 +1010,7 @@ struct ssl_st { /* we have shut things down, 0x01 sent, 0x02 for received */ int shutdown; /* where we are */ - STATEM statem; + OSSL_STATEM statem; BUF_MEM *init_buf; /* buffer used during init */ void *init_msg; /* pointer to handshake message body, set by diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index dd7a260a26..062329fc00 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -228,7 +228,7 @@ static int state_machine(SSL *s, int server) { BUF_MEM *buf = NULL; unsigned long Time = (unsigned long)time(NULL); void (*cb) (const SSL *ssl, int type, int val) = NULL; - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; int ret = -1; int ssret; @@ -454,7 +454,7 @@ static int state_machine(SSL *s, int server) { */ static void init_read_state_machine(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; st->read_state = READ_STATE_HEADER; } @@ -486,7 +486,7 @@ static void init_read_state_machine(SSL *s) * will resume in the same state where we left off. */ static enum SUB_STATE_RETURN read_state_machine(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; int ret, mt; unsigned long len; int (*transition)(SSL *s, int mt); @@ -632,7 +632,7 @@ static enum SUB_STATE_RETURN read_state_machine(SSL *s) { */ static int statem_do_write(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; if (st->hand_state == TLS_ST_CW_CHANGE || st->hand_state == TLS_ST_SW_CHANGE) { @@ -650,7 +650,7 @@ static int statem_do_write(SSL *s) */ static void init_write_state_machine(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; st->write_state = WRITE_STATE_TRANSITION; } @@ -688,7 +688,7 @@ static void init_write_state_machine(SSL *s) */ static enum SUB_STATE_RETURN write_state_machine(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; int ret; enum WRITE_TRAN (*transition)(SSL *s); enum WORK_STATE (*pre_work)(SSL *s, enum WORK_STATE wst); @@ -811,7 +811,7 @@ int statem_flush(SSL *s) */ int ossl_statem_app_data_allowed(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; if (st->state == MSG_FLOW_UNINITED || st->state == MSG_FLOW_RENEGOTIATE) return 0; diff --git a/ssl/statem/statem.h b/ssl/statem/statem.h index f65e09f0c4..4c090dc1cb 100644 --- a/ssl/statem/statem.h +++ b/ssl/statem/statem.h @@ -126,7 +126,7 @@ enum WRITE_STATE { * * *****************************************************************************/ -struct statem_st { +struct ossl_statem_st { enum MSG_FLOW_STATE state; enum WRITE_STATE write_state; enum WORK_STATE write_state_work; @@ -144,7 +144,7 @@ struct statem_st { int in_sctp_read_sock; #endif }; -typedef struct statem_st STATEM; +typedef struct ossl_statem_st OSSL_STATEM; /***************************************************************************** diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index a2bb55813b..4fa73ba779 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -249,7 +249,7 @@ static int key_exchange_expected(SSL *s) */ int client_read_transition(SSL *s, int mt) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; int ske_expected; switch(st->hand_state) { @@ -393,7 +393,7 @@ int client_read_transition(SSL *s, int mt) */ enum WRITE_TRAN client_write_transition(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_OK: @@ -497,7 +497,7 @@ enum WRITE_TRAN client_write_transition(SSL *s) */ enum WORK_STATE client_pre_work(SSL *s, enum WORK_STATE wst) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_CW_CLNT_HELLO: @@ -544,7 +544,7 @@ enum WORK_STATE client_pre_work(SSL *s, enum WORK_STATE wst) */ enum WORK_STATE client_post_work(SSL *s, enum WORK_STATE wst) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; s->init_num = 0; @@ -643,7 +643,7 @@ enum WORK_STATE client_post_work(SSL *s, enum WORK_STATE wst) */ int client_construct_message(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_CW_CLNT_HELLO: @@ -689,7 +689,7 @@ int client_construct_message(SSL *s) */ unsigned long client_max_message_size(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_CR_SRVR_HELLO: @@ -735,7 +735,7 @@ unsigned long client_max_message_size(SSL *s) */ enum MSG_PROCESS_RETURN client_process_message(SSL *s, PACKET *pkt) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_CR_SRVR_HELLO: @@ -782,7 +782,7 @@ enum MSG_PROCESS_RETURN client_process_message(SSL *s, PACKET *pkt) */ enum WORK_STATE client_post_process_message(SSL *s, enum WORK_STATE wst) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { #ifndef OPENSSL_NO_SCTP diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c index 103f3cc3a6..571d93ed38 100644 --- a/ssl/statem/statem_srvr.c +++ b/ssl/statem/statem_srvr.c @@ -182,7 +182,7 @@ static STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s, */ int server_read_transition(SSL *s, int mt) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_BEFORE: @@ -404,7 +404,7 @@ static inline int send_certificate_request(SSL *s) */ enum WRITE_TRAN server_write_transition(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_BEFORE: @@ -522,7 +522,7 @@ enum WRITE_TRAN server_write_transition(SSL *s) */ enum WORK_STATE server_pre_work(SSL *s, enum WORK_STATE wst) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_SW_HELLO_REQ: @@ -601,7 +601,7 @@ enum WORK_STATE server_pre_work(SSL *s, enum WORK_STATE wst) */ enum WORK_STATE server_post_work(SSL *s, enum WORK_STATE wst) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; s->init_num = 0; @@ -709,7 +709,7 @@ enum WORK_STATE server_post_work(SSL *s, enum WORK_STATE wst) */ int server_construct_message(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case DTLS_ST_SW_HELLO_VERIFY_REQUEST: @@ -769,7 +769,7 @@ int server_construct_message(SSL *s) */ unsigned long server_max_message_size(SSL *s) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_SR_CLNT_HELLO: @@ -808,7 +808,7 @@ unsigned long server_max_message_size(SSL *s) */ enum MSG_PROCESS_RETURN server_process_message(SSL *s, PACKET *pkt) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_SR_CLNT_HELLO: @@ -848,7 +848,7 @@ enum MSG_PROCESS_RETURN server_process_message(SSL *s, PACKET *pkt) */ enum WORK_STATE server_post_process_message(SSL *s, enum WORK_STATE wst) { - STATEM *st = &s->statem; + OSSL_STATEM *st = &s->statem; switch(st->hand_state) { case TLS_ST_SR_CLNT_HELLO: -- 2.34.1