X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fstatem%2Fstatem.c;h=a1da2a4418d112eac0f88beb28b6428065bbc0f6;hb=5abeaf3596210d8cc0be1edf7a0a772b7e2c7e6f;hp=20353c305bcdfeb66fd99992c5141b2b3840ca7d;hpb=464175692f1f00a9e5a87f040d0c59184d63b53b;p=oweals%2Fopenssl.git diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c index 20353c305b..a1da2a4418 100644 --- a/ssl/statem/statem.c +++ b/ssl/statem/statem.c @@ -46,7 +46,7 @@ */ /* Sub state machine return values */ -typedef enum { +typedef enum { /* Something bad happened or NBIO */ SUB_STATE_ERROR, /* Sub state finished go to the next sub state */ @@ -165,7 +165,8 @@ void ossl_statem_set_hello_verify_done(SSL *s) s->statem.hand_state = TLS_ST_SR_CLNT_HELLO; } -int ossl_statem_connect(SSL *s) { +int ossl_statem_connect(SSL *s) +{ return state_machine(s, 0); } @@ -174,7 +175,9 @@ int ossl_statem_accept(SSL *s) return state_machine(s, 1); } -static void (*get_callback(SSL *s))(const SSL *, int, int) +typedef void (*info_cb) (const SSL *, int, int); + +static info_cb get_callback(SSL *s) { if (s->info_callback != NULL) return s->info_callback; @@ -237,7 +240,6 @@ static int state_machine(SSL *s, int server) if (!SSL_clear(s)) return -1; } - #ifndef OPENSSL_NO_SCTP if (SSL_IS_DTLS(s)) { /* @@ -249,20 +251,6 @@ static int state_machine(SSL *s, int server) } #endif -#ifndef OPENSSL_NO_HEARTBEATS - /* - * If we're awaiting a HeartbeatResponse, pretend we already got and - * don't await it anymore, because Heartbeats don't make sense during - * handshakes anyway. - */ - if (s->tlsext_hb_pending) { - if (SSL_IS_DTLS(s)) - dtls1_stop_timer(s); - s->tlsext_hb_pending = 0; - s->tlsext_hb_seq++; - } -#endif - /* Initialise state machine */ if (st->state == MSG_FLOW_RENEGOTIATE) { @@ -282,8 +270,7 @@ static int state_machine(SSL *s, int server) if (SSL_IS_DTLS(s)) { if ((s->version & 0xff00) != (DTLS1_VERSION & 0xff00) && - (server - || (s->version & 0xff00) != (DTLS1_BAD_VER & 0xff00))) { + (server || (s->version & 0xff00) != (DTLS1_BAD_VER & 0xff00))) { SSLerr(SSL_F_STATE_MACHINE, ERR_R_INTERNAL_ERROR); goto end; } @@ -320,7 +307,6 @@ static int state_machine(SSL *s, int server) */ s->s3->change_cipher_spec = 0; - /* * Ok, we now need to push on a buffering BIO ...but not with * SCTP @@ -332,8 +318,12 @@ static int state_machine(SSL *s, int server) goto end; } - if (!server || st->state != MSG_FLOW_RENEGOTIATE) - ssl3_init_finished_mac(s); + if (!server || st->state != MSG_FLOW_RENEGOTIATE) { + if (!ssl3_init_finished_mac(s)) { + ossl_statem_set_error(s); + goto end; + } + } if (server) { if (st->state != MSG_FLOW_RENEGOTIATE) { @@ -376,8 +366,8 @@ static int state_machine(SSL *s, int server) st->read_state_first_init = 1; } - while(st->state != MSG_FLOW_FINISHED) { - if(st->state == MSG_FLOW_READING) { + while (st->state != MSG_FLOW_FINISHED) { + if (st->state == MSG_FLOW_READING) { ssret = read_state_machine(s); if (ssret == SUB_STATE_FINISHED) { st->state = MSG_FLOW_WRITING; @@ -441,6 +431,21 @@ static void init_read_state_machine(SSL *s) st->read_state = READ_STATE_HEADER; } +static int grow_init_buf(SSL *s, size_t size) { + + size_t msg_offset = (char *)s->init_msg - s->init_buf->data; + + if (!BUF_MEM_grow_clean(s->init_buf, (int)size)) + return 0; + + if (size < msg_offset) + return 0; + + s->init_msg = s->init_buf->data + msg_offset; + + return 1; +} + /* * This function implements the sub-state machine when the message flow is in * MSG_FLOW_READING. The valid sub-states and transitions are: @@ -467,20 +472,21 @@ static void init_read_state_machine(SSL *s) * control returns to the calling application. When this function is recalled we * will resume in the same state where we left off. */ -static SUB_STATE_RETURN read_state_machine(SSL *s) { +static SUB_STATE_RETURN read_state_machine(SSL *s) +{ OSSL_STATEM *st = &s->statem; int ret, mt; - unsigned long len = 0; - int (*transition)(SSL *s, int mt); + size_t len = 0; + int (*transition) (SSL *s, int mt); PACKET pkt; - MSG_PROCESS_RETURN (*process_message)(SSL *s, PACKET *pkt); - WORK_STATE (*post_process_message)(SSL *s, WORK_STATE wst); - unsigned long (*max_message_size)(SSL *s); + MSG_PROCESS_RETURN(*process_message) (SSL *s, PACKET *pkt); + WORK_STATE(*post_process_message) (SSL *s, WORK_STATE wst); + size_t (*max_message_size) (SSL *s); void (*cb) (const SSL *ssl, int type, int val) = NULL; cb = get_callback(s); - if(s->server) { + if (s->server) { transition = ossl_statem_server_read_transition; process_message = ossl_statem_server_process_message; max_message_size = ossl_statem_server_max_message_size; @@ -497,10 +503,9 @@ static SUB_STATE_RETURN read_state_machine(SSL *s) { st->read_state_first_init = 0; } - while(1) { - switch(st->read_state) { + while (1) { + switch (st->read_state) { case READ_STATE_HEADER: - s->init_num = 0; /* Get the state the peer wants to move to */ if (SSL_IS_DTLS(s)) { /* @@ -527,9 +532,8 @@ static SUB_STATE_RETURN read_state_machine(SSL *s) { * Validate that we are allowed to move to the new state and move * to that state if so */ - if(!transition(s, mt)) { - ssl3_send_alert(s, SSL3_AL_FATAL, SSL3_AD_UNEXPECTED_MESSAGE); - SSLerr(SSL_F_READ_STATE_MACHINE, SSL_R_UNEXPECTED_MESSAGE); + if (!transition(s, mt)) { + ossl_statem_set_error(s); return SUB_STATE_ERROR; } @@ -539,6 +543,16 @@ static SUB_STATE_RETURN read_state_machine(SSL *s) { return SUB_STATE_ERROR; } + /* dtls_get_message already did this */ + if (!SSL_IS_DTLS(s) + && s->s3->tmp.message_size > 0 + && !grow_init_buf(s, s->s3->tmp.message_size + + SSL3_HM_HEADER_LENGTH)) { + ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_INTERNAL_ERROR); + SSLerr(SSL_F_READ_STATE_MACHINE, ERR_R_BUF_LIB); + return SUB_STATE_ERROR; + } + st->read_state = READ_STATE_BODY; /* Fall through */ @@ -559,29 +573,37 @@ static SUB_STATE_RETURN read_state_machine(SSL *s) { return SUB_STATE_ERROR; } ret = process_message(s, &pkt); - if (ret == MSG_PROCESS_ERROR) { + + /* Discard the packet data */ + s->init_num = 0; + + switch (ret) { + case MSG_PROCESS_ERROR: return SUB_STATE_ERROR; - } - if (ret == MSG_PROCESS_FINISHED_READING) { + case MSG_PROCESS_FINISHED_READING: if (SSL_IS_DTLS(s)) { dtls1_stop_timer(s); } return SUB_STATE_FINISHED; - } - if (ret == MSG_PROCESS_CONTINUE_PROCESSING) { + case MSG_PROCESS_CONTINUE_PROCESSING: st->read_state = READ_STATE_POST_PROCESS; st->read_state_work = WORK_MORE_A; - } else { + break; + + default: st->read_state = READ_STATE_HEADER; + break; } break; case READ_STATE_POST_PROCESS: st->read_state_work = post_process_message(s, st->read_state_work); - switch(st->read_state_work) { - default: + switch (st->read_state_work) { + case WORK_ERROR: + case WORK_MORE_A: + case WORK_MORE_B: return SUB_STATE_ERROR; case WORK_FINISHED_CONTINUE: @@ -614,7 +636,7 @@ static int statem_do_write(SSL *s) OSSL_STATEM *st = &s->statem; if (st->hand_state == TLS_ST_CW_CHANGE - || st->hand_state == TLS_ST_SW_CHANGE) { + || st->hand_state == TLS_ST_SW_CHANGE) { if (SSL_IS_DTLS(s)) return dtls1_do_write(s, SSL3_RT_CHANGE_CIPHER_SPEC); else @@ -669,28 +691,33 @@ static SUB_STATE_RETURN write_state_machine(SSL *s) { OSSL_STATEM *st = &s->statem; int ret; - WRITE_TRAN (*transition)(SSL *s); - WORK_STATE (*pre_work)(SSL *s, WORK_STATE wst); - WORK_STATE (*post_work)(SSL *s, WORK_STATE wst); - int (*construct_message)(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 (**confunc) (SSL *s, WPACKET *pkt), + int *mt); void (*cb) (const SSL *ssl, int type, int val) = NULL; + int (*confunc) (SSL *s, WPACKET *pkt); + int mt; + WPACKET pkt; cb = get_callback(s); - if(s->server) { + if (s->server) { transition = ossl_statem_server_write_transition; pre_work = ossl_statem_server_pre_work; post_work = ossl_statem_server_post_work; - construct_message = ossl_statem_server_construct_message; + get_construct_message_f = ossl_statem_server_construct_message; } else { transition = ossl_statem_client_write_transition; pre_work = ossl_statem_client_pre_work; post_work = ossl_statem_client_post_work; - construct_message = ossl_statem_client_construct_message; + get_construct_message_f = ossl_statem_client_construct_message; } - while(1) { - switch(st->write_state) { + while (1) { + switch (st->write_state) { case WRITE_STATE_TRANSITION: if (cb != NULL) { /* Notify callback of an impending state change */ @@ -699,7 +726,7 @@ static SUB_STATE_RETURN write_state_machine(SSL *s) else cb(s, SSL_CB_CONNECT_LOOP, 1); } - switch(transition(s)) { + switch (transition(s)) { case WRITE_TRAN_CONTINUE: st->write_state = WRITE_STATE_PRE_WORK; st->write_state_work = WORK_MORE_A; @@ -709,14 +736,16 @@ static SUB_STATE_RETURN write_state_machine(SSL *s) return SUB_STATE_FINISHED; break; - default: + case WRITE_TRAN_ERROR: return SUB_STATE_ERROR; } break; case WRITE_STATE_PRE_WORK: - switch(st->write_state_work = pre_work(s, st->write_state_work)) { - default: + switch (st->write_state_work = pre_work(s, st->write_state_work)) { + case WORK_ERROR: + case WORK_MORE_A: + case WORK_MORE_B: return SUB_STATE_ERROR; case WORK_FINISHED_CONTINUE: @@ -726,8 +755,16 @@ static SUB_STATE_RETURN write_state_machine(SSL *s) case WORK_FINISHED_STOP: return SUB_STATE_END_HANDSHAKE; } - if(construct_message(s) == 0) + if (!WPACKET_init(&pkt, s->init_buf) + || !get_construct_message_f(s, &pkt, &confunc, &mt) + || !ssl_set_handshake_header(s, &pkt, mt) + || (confunc != NULL && !confunc(s, &pkt)) + || !ssl_close_construct_packet(s, &pkt, mt) + || !WPACKET_finish(&pkt)) { + WPACKET_cleanup(&pkt); + ossl_statem_set_error(s); return SUB_STATE_ERROR; + } /* Fall through */ @@ -744,8 +781,10 @@ static SUB_STATE_RETURN write_state_machine(SSL *s) /* Fall through */ case WRITE_STATE_POST_WORK: - switch(st->write_state_work = post_work(s, st->write_state_work)) { - default: + switch (st->write_state_work = post_work(s, st->write_state_work)) { + case WORK_ERROR: + case WORK_MORE_A: + case WORK_MORE_B: return SUB_STATE_ERROR; case WORK_FINISHED_CONTINUE: @@ -801,7 +840,7 @@ int ossl_statem_app_data_allowed(SSL *s) * ServerHello yet then we allow app data */ if (st->hand_state == TLS_ST_BEFORE - || st->hand_state == TLS_ST_SR_CLNT_HELLO) + || st->hand_state == TLS_ST_SR_CLNT_HELLO) return 1; } else { /*