diff options
Diffstat (limited to 'lib/handshake-tls13.c')
-rw-r--r-- | lib/handshake-tls13.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/lib/handshake-tls13.c b/lib/handshake-tls13.c index de14cf106e..7b186e451b 100644 --- a/lib/handshake-tls13.c +++ b/lib/handshake-tls13.c @@ -126,25 +126,25 @@ int _gnutls13_handshake_client(gnutls_session_t session) IMED_RET("recv finished", ret, 0); /* fall through */ case STATE108: - ret = _gnutls13_send_certificate(session, AGAIN(STATE108)); + ret = + generate_ap_traffic_keys(session); STATE = STATE108; - IMED_RET("send certificate", ret, 0); + IMED_RET("generate app keys", ret, 0); /* fall through */ case STATE109: - ret = _gnutls13_send_certificate_verify(session, AGAIN(STATE109)); + ret = _gnutls13_send_certificate(session, AGAIN(STATE109)); STATE = STATE109; - IMED_RET("send certificate verify", ret, 0); + IMED_RET("send certificate", ret, 0); /* fall through */ case STATE110: - ret = _gnutls13_send_finished(session, AGAIN(STATE110)); + ret = _gnutls13_send_certificate_verify(session, AGAIN(STATE110)); STATE = STATE110; - IMED_RET("send finished", ret, 0); + IMED_RET("send certificate verify", ret, 0); /* fall through */ case STATE111: - ret = - generate_ap_traffic_keys(session); + ret = _gnutls13_send_finished(session, AGAIN(STATE111)); STATE = STATE111; - IMED_RET("generate app keys", ret, 0); + IMED_RET("send finished", ret, 0); STATE = STATE0; break; @@ -337,31 +337,31 @@ int _gnutls13_handshake_server(gnutls_session_t session) IMED_RET("send finished", ret, 0); /* fall through */ case STATE107: - ret = _gnutls13_recv_certificate(session); + ret = + generate_ap_traffic_keys(session); STATE = STATE107; - IMED_RET("recv certificate", ret, 0); + IMED_RET("generate app keys", ret, 0); /* fall through */ case STATE108: - ret = _gnutls13_recv_certificate_verify(session); + ret = _gnutls13_recv_certificate(session); STATE = STATE108; - IMED_RET("recv certificate verify", ret, 0); + IMED_RET("recv certificate", ret, 0); /* fall through */ case STATE109: - ret = _gnutls_run_verify_callback(session, GNUTLS_CLIENT); + ret = _gnutls13_recv_certificate_verify(session); STATE = STATE109; - if (ret < 0) - return gnutls_assert_val(ret); + IMED_RET("recv certificate verify", ret, 0); /* fall through */ case STATE110: - ret = _gnutls13_recv_finished(session); + ret = _gnutls_run_verify_callback(session, GNUTLS_CLIENT); STATE = STATE110; - IMED_RET("recv finished", ret, 0); + if (ret < 0) + return gnutls_assert_val(ret); /* fall through */ case STATE111: - ret = - generate_ap_traffic_keys(session); + ret = _gnutls13_recv_finished(session); STATE = STATE111; - IMED_RET("generate app keys", ret, 0); + IMED_RET("recv finished", ret, 0); STATE = STATE0; break; |