Add an OSSL_ prefix onto STATEM
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
/* we have shut things down, 0x01 sent, 0x02 for received */
int shutdown;
/* where we are */
/* we have shut things down, 0x01 sent, 0x02 for received */
int shutdown;
/* where we are */
BUF_MEM *init_buf; /* buffer used during init */
void *init_msg; /* pointer to handshake message body, set by
BUF_MEM *init_buf; /* buffer used during init */
void *init_msg; /* pointer to handshake message body, set by
BUF_MEM *buf = NULL;
unsigned long Time = (unsigned long)time(NULL);
void (*cb) (const SSL *ssl, int type, int val) = NULL;
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;
*/
static void init_read_state_machine(SSL *s)
{
*/
static void init_read_state_machine(SSL *s)
{
- STATEM *st = &s->statem;
+ OSSL_STATEM *st = &s->statem;
st->read_state = READ_STATE_HEADER;
}
st->read_state = READ_STATE_HEADER;
}
* will resume in the same state where we left off.
*/
static enum SUB_STATE_RETURN 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);
int ret, mt;
unsigned long len;
int (*transition)(SSL *s, int mt);
*/
static int statem_do_write(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) {
if (st->hand_state == TLS_ST_CW_CHANGE
|| st->hand_state == TLS_ST_SW_CHANGE) {
*/
static void init_write_state_machine(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;
}
st->write_state = WRITE_STATE_TRANSITION;
}
*/
static enum SUB_STATE_RETURN 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);
int ret;
enum WRITE_TRAN (*transition)(SSL *s);
enum WORK_STATE (*pre_work)(SSL *s, enum WORK_STATE wst);
*/
int ossl_statem_app_data_allowed(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;
if (st->state == MSG_FLOW_UNINITED || st->state == MSG_FLOW_RENEGOTIATE)
return 0;
* *
*****************************************************************************/
* *
*****************************************************************************/
enum MSG_FLOW_STATE state;
enum WRITE_STATE write_state;
enum WORK_STATE write_state_work;
enum MSG_FLOW_STATE state;
enum WRITE_STATE write_state;
enum WORK_STATE write_state_work;
int in_sctp_read_sock;
#endif
};
int in_sctp_read_sock;
#endif
};
-typedef struct statem_st STATEM;
+typedef struct ossl_statem_st OSSL_STATEM;
/*****************************************************************************
/*****************************************************************************
*/
int client_read_transition(SSL *s, int mt)
{
*/
int client_read_transition(SSL *s, int mt)
{
- STATEM *st = &s->statem;
+ OSSL_STATEM *st = &s->statem;
int ske_expected;
switch(st->hand_state) {
int ske_expected;
switch(st->hand_state) {
*/
enum WRITE_TRAN client_write_transition(SSL *s)
{
*/
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:
switch(st->hand_state) {
case TLS_ST_OK:
*/
enum WORK_STATE client_pre_work(SSL *s, enum WORK_STATE wst)
{
*/
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:
switch(st->hand_state) {
case TLS_ST_CW_CLNT_HELLO:
*/
enum WORK_STATE client_post_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;
*/
int client_construct_message(SSL *s)
{
*/
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:
switch(st->hand_state) {
case TLS_ST_CW_CLNT_HELLO:
*/
unsigned long client_max_message_size(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:
switch(st->hand_state) {
case TLS_ST_CR_SRVR_HELLO:
*/
enum MSG_PROCESS_RETURN client_process_message(SSL *s, PACKET *pkt)
{
*/
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:
switch(st->hand_state) {
case TLS_ST_CR_SRVR_HELLO:
*/
enum WORK_STATE client_post_process_message(SSL *s, enum WORK_STATE wst)
{
*/
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
switch(st->hand_state) {
#ifndef OPENSSL_NO_SCTP
*/
int server_read_transition(SSL *s, int mt)
{
*/
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:
switch(st->hand_state) {
case TLS_ST_BEFORE:
*/
enum WRITE_TRAN server_write_transition(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:
switch(st->hand_state) {
case TLS_ST_BEFORE:
*/
enum WORK_STATE server_pre_work(SSL *s, enum WORK_STATE wst)
{
*/
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:
switch(st->hand_state) {
case TLS_ST_SW_HELLO_REQ:
*/
enum WORK_STATE server_post_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;
*/
int server_construct_message(SSL *s)
{
*/
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:
switch(st->hand_state) {
case DTLS_ST_SW_HELLO_VERIFY_REQUEST:
*/
unsigned long server_max_message_size(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:
switch(st->hand_state) {
case TLS_ST_SR_CLNT_HELLO:
*/
enum MSG_PROCESS_RETURN server_process_message(SSL *s, PACKET *pkt)
{
*/
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:
switch(st->hand_state) {
case TLS_ST_SR_CLNT_HELLO:
*/
enum WORK_STATE server_post_process_message(SSL *s, enum WORK_STATE wst)
{
*/
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:
switch(st->hand_state) {
case TLS_ST_SR_CLNT_HELLO: