Rename hs->state to hs->tls13_state.
This is to free up the hs->state name for the upper-level handshake
state.
Change-Id: I1183a329f698c56911f3879a91809edad5b5e94e
Reviewed-on: https://boringssl-review.googlesource.com/12695
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/ssl/tls13_server.c b/ssl/tls13_server.c
index 626d2ee..3ab9c86 100644
--- a/ssl/tls13_server.c
+++ b/ssl/tls13_server.c
@@ -125,7 +125,7 @@
return ssl_hs_error;
}
- hs->state = state_select_parameters;
+ hs->tls13_state = state_select_parameters;
return ssl_hs_ok;
}
@@ -186,7 +186,7 @@
return ssl_hs_error;
}
if (rv < 0) {
- hs->state = state_select_parameters;
+ hs->tls13_state = state_select_parameters;
return ssl_hs_x509_lookup;
}
}
@@ -310,13 +310,13 @@
int need_retry;
if (!resolve_ecdhe_secret(hs, &need_retry, &client_hello)) {
if (need_retry) {
- hs->state = state_send_hello_retry_request;
+ hs->tls13_state = state_send_hello_retry_request;
return ssl_hs_ok;
}
return ssl_hs_error;
}
- hs->state = state_send_server_hello;
+ hs->tls13_state = state_send_server_hello;
return ssl_hs_ok;
}
@@ -337,12 +337,12 @@
return ssl_hs_error;
}
- hs->state = state_flush_hello_retry_request;
+ hs->tls13_state = state_flush_hello_retry_request;
return ssl_hs_write_message;
}
static enum ssl_hs_wait_t do_flush_hello_retry_request(SSL_HANDSHAKE *hs) {
- hs->state = state_process_second_client_hello;
+ hs->tls13_state = state_process_second_client_hello;
return ssl_hs_flush_and_read_message;
}
@@ -375,7 +375,7 @@
}
ssl->method->received_flight(ssl);
- hs->state = state_send_server_hello;
+ hs->tls13_state = state_send_server_hello;
return ssl_hs_ok;
}
@@ -394,7 +394,7 @@
goto err;
}
- hs->state = state_send_encrypted_extensions;
+ hs->tls13_state = state_send_encrypted_extensions;
return ssl_hs_write_message;
err:
@@ -417,7 +417,7 @@
return ssl_hs_error;
}
- hs->state = state_send_certificate_request;
+ hs->tls13_state = state_send_certificate_request;
return ssl_hs_write_message;
}
@@ -432,7 +432,7 @@
if (!hs->cert_request) {
/* Skip this state. */
- hs->state = state_send_server_certificate;
+ hs->tls13_state = state_send_server_certificate;
return ssl_hs_ok;
}
@@ -461,7 +461,7 @@
goto err;
}
- hs->state = state_send_server_certificate;
+ hs->tls13_state = state_send_server_certificate;
return ssl_hs_write_message;
err:
@@ -472,7 +472,7 @@
static enum ssl_hs_wait_t do_send_server_certificate(SSL_HANDSHAKE *hs) {
SSL *const ssl = hs->ssl;
if (ssl->s3->session_reused) {
- hs->state = state_send_server_finished;
+ hs->tls13_state = state_send_server_finished;
return ssl_hs_ok;
}
@@ -485,7 +485,7 @@
return ssl_hs_error;
}
- hs->state = state_send_server_certificate_verify;
+ hs->tls13_state = state_send_server_certificate_verify;
return ssl_hs_write_message;
}
@@ -493,11 +493,11 @@
int is_first_run) {
switch (tls13_prepare_certificate_verify(hs, is_first_run)) {
case ssl_private_key_success:
- hs->state = state_send_server_finished;
+ hs->tls13_state = state_send_server_finished;
return ssl_hs_write_message;
case ssl_private_key_retry:
- hs->state = state_complete_server_certificate_verify;
+ hs->tls13_state = state_complete_server_certificate_verify;
return ssl_hs_private_key_operation;
case ssl_private_key_failure:
@@ -513,7 +513,7 @@
return ssl_hs_error;
}
- hs->state = state_flush;
+ hs->tls13_state = state_flush;
return ssl_hs_write_message;
}
@@ -527,7 +527,7 @@
return ssl_hs_error;
}
- hs->state = state_process_client_certificate;
+ hs->tls13_state = state_process_client_certificate;
return ssl_hs_flush_and_read_message;
}
@@ -539,7 +539,7 @@
ssl->s3->new_session->verify_result = X509_V_OK;
/* Skip this state. */
- hs->state = state_process_channel_id;
+ hs->tls13_state = state_process_channel_id;
return ssl_hs_ok;
}
@@ -558,7 +558,7 @@
X509_free(sk_X509_shift(ssl->s3->new_session->x509_chain));
}
- hs->state = state_process_client_certificate_verify;
+ hs->tls13_state = state_process_client_certificate_verify;
return ssl_hs_read_message;
}
@@ -567,7 +567,7 @@
SSL *const ssl = hs->ssl;
if (ssl->s3->new_session->x509_peer == NULL) {
/* Skip this state. */
- hs->state = state_process_channel_id;
+ hs->tls13_state = state_process_channel_id;
return ssl_hs_ok;
}
@@ -577,14 +577,14 @@
return ssl_hs_error;
}
- hs->state = state_process_channel_id;
+ hs->tls13_state = state_process_channel_id;
return ssl_hs_read_message;
}
static enum ssl_hs_wait_t do_process_channel_id(SSL_HANDSHAKE *hs) {
SSL *const ssl = hs->ssl;
if (!ssl->s3->tlsext_channel_id_valid) {
- hs->state = state_process_client_finished;
+ hs->tls13_state = state_process_client_finished;
return ssl_hs_ok;
}
@@ -594,7 +594,7 @@
return ssl_hs_error;
}
- hs->state = state_process_client_finished;
+ hs->tls13_state = state_process_client_finished;
return ssl_hs_read_message;
}
@@ -615,7 +615,7 @@
/* Refresh the session timestamp so that it is measured from ticket
* issuance. */
ssl_session_refresh_time(ssl, ssl->s3->new_session);
- hs->state = state_send_new_session_ticket;
+ hs->tls13_state = state_send_new_session_ticket;
return ssl_hs_ok;
}
@@ -628,7 +628,7 @@
/* If the client doesn't accept resumption with PSK_DHE_KE, don't send a
* session ticket. */
if (!hs->accept_psk_mode) {
- hs->state = state_done;
+ hs->tls13_state = state_done;
return ssl_hs_ok;
}
@@ -664,9 +664,9 @@
hs->session_tickets_sent++;
if (hs->session_tickets_sent >= kNumTickets) {
- hs->state = state_flush_new_session_tickets;
+ hs->tls13_state = state_flush_new_session_tickets;
} else {
- hs->state = state_send_new_session_ticket;
+ hs->tls13_state = state_send_new_session_ticket;
}
return ssl_hs_write_message;
@@ -677,14 +677,14 @@
}
static enum ssl_hs_wait_t do_flush_new_session_tickets(SSL_HANDSHAKE *hs) {
- hs->state = state_done;
+ hs->tls13_state = state_done;
return ssl_hs_flush;
}
enum ssl_hs_wait_t tls13_server_handshake(SSL_HANDSHAKE *hs) {
- while (hs->state != state_done) {
+ while (hs->tls13_state != state_done) {
enum ssl_hs_wait_t ret = ssl_hs_error;
- enum server_hs_state_t state = hs->state;
+ enum server_hs_state_t state = hs->tls13_state;
switch (state) {
case state_process_client_hello:
ret = do_process_client_hello(hs);