diff options
Diffstat (limited to 'lib/handshake.c')
| -rw-r--r-- | lib/handshake.c | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/lib/handshake.c b/lib/handshake.c index 2c7524016e..99967a2ffd 100644 --- a/lib/handshake.c +++ b/lib/handshake.c @@ -2806,7 +2806,7 @@ static int handshake_client(gnutls_session_t session) ret = send_client_hello(session, AGAIN(STATE1)); STATE = STATE1; IMED_RET("send hello", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE2: if (IS_DTLS(session)) { ret = @@ -2833,7 +2833,7 @@ static int handshake_client(gnutls_session_t session) return 1; } } - /* fall through */ + FALLTHROUGH; case STATE3: /* receive the server hello */ ret = @@ -2842,7 +2842,7 @@ static int handshake_client(gnutls_session_t session) 0, NULL); STATE = STATE3; IMED_RET("recv hello", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE4: ver = get_version(session); if (ver->tls13_sem) { /* TLS 1.3 state machine */ @@ -2853,21 +2853,21 @@ static int handshake_client(gnutls_session_t session) ret = _gnutls_ext_sr_verify(session); STATE = STATE4; IMED_RET_FATAL("recv hello", ret, 0); - /* fall through */ + FALLTHROUGH; case STATE5: if (session->security_parameters.do_recv_supplemental) { ret = _gnutls_recv_supplemental(session); STATE = STATE5; IMED_RET("recv supplemental", ret, 1); } - /* fall through */ + FALLTHROUGH; case STATE6: /* RECV CERTIFICATE */ if (session->internals.resumed == RESUME_FALSE) /* if we are not resuming */ ret = _gnutls_recv_server_certificate(session); STATE = STATE6; IMED_RET("recv server certificate", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE7: #ifdef ENABLE_OCSP /* RECV CERTIFICATE STATUS */ @@ -2878,7 +2878,7 @@ static int handshake_client(gnutls_session_t session) STATE = STATE7; IMED_RET("recv server certificate", ret, 1); #endif - /* fall through */ + FALLTHROUGH; case STATE8: ret = _gnutls_run_verify_callback(session, GNUTLS_CLIENT); STATE = STATE8; @@ -2892,7 +2892,7 @@ static int handshake_client(gnutls_session_t session) ret = _gnutls_recv_server_kx_message(session); STATE = STATE9; IMED_RET("recv server kx message", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE10: /* receive the server certificate request - if any */ @@ -2902,7 +2902,7 @@ static int handshake_client(gnutls_session_t session) STATE = STATE10; IMED_RET("recv server certificate request message", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE11: /* receive the server hello done */ if (session->internals.resumed == RESUME_FALSE) /* if we are not resuming */ @@ -2912,7 +2912,7 @@ static int handshake_client(gnutls_session_t session) 0, NULL); STATE = STATE11; IMED_RET("recv server hello done", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE12: if (session->security_parameters.do_send_supplemental) { ret = @@ -2921,7 +2921,7 @@ static int handshake_client(gnutls_session_t session) STATE = STATE12; IMED_RET("send supplemental", ret, 0); } - /* fall through */ + FALLTHROUGH; case STATE13: /* send our certificate - if any and if requested */ @@ -2932,7 +2932,7 @@ static int handshake_client(gnutls_session_t session) (STATE13)); STATE = STATE13; IMED_RET("send client certificate", ret, 0); - /* fall through */ + FALLTHROUGH; case STATE14: if (session->internals.resumed == RESUME_FALSE) /* if we are not resuming */ ret = @@ -2940,7 +2940,7 @@ static int handshake_client(gnutls_session_t session) AGAIN(STATE14)); STATE = STATE14; IMED_RET("send client kx", ret, 0); - /* fall through */ + FALLTHROUGH; case STATE15: /* send client certificate verify */ if (session->internals.resumed == RESUME_FALSE) /* if we are not resuming */ @@ -2950,7 +2950,7 @@ static int handshake_client(gnutls_session_t session) (STATE15)); STATE = STATE15; IMED_RET("send client certificate verify", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE16: STATE = STATE16; if (session->internals.resumed == RESUME_FALSE) { @@ -2961,7 +2961,7 @@ static int handshake_client(gnutls_session_t session) IMED_RET("recv handshake new session ticket", ret, 1); } - /* fall through */ + FALLTHROUGH; case STATE17: STATE = STATE17; if (session->internals.resumed == RESUME_FALSE && (session->internals.flags & GNUTLS_ENABLE_FALSE_START) && can_send_false_start(session)) { @@ -2975,7 +2975,7 @@ static int handshake_client(gnutls_session_t session) return 0; } - /* fall through */ + FALLTHROUGH; case STATE18: STATE = STATE18; @@ -2987,7 +2987,7 @@ static int handshake_client(gnutls_session_t session) ret = recv_handshake_final(session, TRUE); IMED_RET("recv handshake final", ret, 1); } - /* fall through */ + FALLTHROUGH; case STATE19: STATE = STATE19; if (session->internals.resumed == RESUME_FALSE) { @@ -2999,7 +2999,7 @@ static int handshake_client(gnutls_session_t session) } STATE = STATE0; - /* fall through */ + FALLTHROUGH; default: break; } @@ -3117,7 +3117,7 @@ static int send_handshake_final(gnutls_session_t session, int init) return ret; } - /* fall through */ + FALLTHROUGH; case STATE2: /* send the finished message */ ret = _gnutls_send_finished(session, FAGAIN(STATE2)); @@ -3128,7 +3128,7 @@ static int send_handshake_final(gnutls_session_t session, int init) } FINAL_STATE = STATE0; - /* fall through */ + FALLTHROUGH; default: break; } @@ -3201,7 +3201,7 @@ static int recv_handshake_final(gnutls_session_t session, int init) gnutls_assert(); return ret; } - /* fall through */ + FALLTHROUGH; case STATE31: FINAL_STATE = STATE31; @@ -3219,7 +3219,7 @@ static int recv_handshake_final(gnutls_session_t session, int init) return ret; } FINAL_STATE = STATE0; - /* fall through */ + FALLTHROUGH; default: break; } @@ -3265,13 +3265,13 @@ static int handshake_server(gnutls_session_t session) } IMED_RET("recv hello", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE2: ret = _gnutls_ext_sr_verify(session); STATE = STATE2; IMED_RET_FATAL("recv hello", ret, 0); - /* fall through */ + FALLTHROUGH; case STATE3: ret = _gnutls_send_server_hello(session, AGAIN(STATE3)); STATE = STATE3; @@ -3283,7 +3283,7 @@ static int handshake_server(gnutls_session_t session) goto reset; } - /* fall through */ + FALLTHROUGH; case STATE4: if (session->security_parameters.do_send_supplemental) { ret = @@ -3293,7 +3293,7 @@ static int handshake_server(gnutls_session_t session) IMED_RET("send supplemental data", ret, 0); } /* SEND CERTIFICATE + KEYEXCHANGE + CERTIFICATE_REQUEST */ - /* fall through */ + FALLTHROUGH; case STATE5: /* NOTE: these should not be send if we are resuming */ @@ -3303,7 +3303,7 @@ static int handshake_server(gnutls_session_t session) AGAIN(STATE5)); STATE = STATE5; IMED_RET("send server certificate", ret, 0); - /* fall through */ + FALLTHROUGH; case STATE6: #ifdef ENABLE_OCSP if (session->internals.resumed == RESUME_FALSE) @@ -3314,7 +3314,7 @@ static int handshake_server(gnutls_session_t session) STATE = STATE6; IMED_RET("send server certificate status", ret, 0); #endif - /* fall through */ + FALLTHROUGH; case STATE7: /* send server key exchange (A) */ if (session->internals.resumed == RESUME_FALSE) @@ -3323,7 +3323,7 @@ static int handshake_server(gnutls_session_t session) AGAIN(STATE7)); STATE = STATE7; IMED_RET("send server kx", ret, 0); - /* fall through */ + FALLTHROUGH; case STATE8: /* Send certificate request - if requested to */ if (session->internals.resumed == RESUME_FALSE) @@ -3332,7 +3332,7 @@ static int handshake_server(gnutls_session_t session) AGAIN(STATE8)); STATE = STATE8; IMED_RET("send server cert request", ret, 0); - /* fall through */ + FALLTHROUGH; case STATE9: /* send the server hello done */ if (session->internals.resumed == RESUME_FALSE) /* if we are not resuming */ @@ -3342,7 +3342,7 @@ static int handshake_server(gnutls_session_t session) AGAIN(STATE9)); STATE = STATE9; IMED_RET("send server hello done", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE10: if (session->security_parameters.do_recv_supplemental) { ret = _gnutls_recv_supplemental(session); @@ -3350,27 +3350,27 @@ static int handshake_server(gnutls_session_t session) IMED_RET("recv client supplemental", ret, 1); } /* RECV CERTIFICATE + KEYEXCHANGE + CERTIFICATE_VERIFY */ - /* fall through */ + FALLTHROUGH; case STATE11: /* receive the client certificate message */ if (session->internals.resumed == RESUME_FALSE) /* if we are not resuming */ ret = _gnutls_recv_client_certificate(session); STATE = STATE11; IMED_RET("recv client certificate", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE12: ret = _gnutls_run_verify_callback(session, GNUTLS_SERVER); STATE = STATE12; if (ret < 0) return gnutls_assert_val(ret); - /* fall through */ + FALLTHROUGH; case STATE13: /* receive the client key exchange message */ if (session->internals.resumed == RESUME_FALSE) /* if we are not resuming */ ret = _gnutls_recv_client_kx_message(session); STATE = STATE13; IMED_RET("recv client kx", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE14: /* receive the client certificate verify message */ if (session->internals.resumed == RESUME_FALSE) /* if we are not resuming */ @@ -3379,7 +3379,7 @@ static int handshake_server(gnutls_session_t session) (session); STATE = STATE14; IMED_RET("recv client certificate verify", ret, 1); - /* fall through */ + FALLTHROUGH; case STATE15: STATE = STATE15; if (session->internals.resumed == RESUME_FALSE) { /* if we are not resuming */ @@ -3389,14 +3389,14 @@ static int handshake_server(gnutls_session_t session) ret = send_handshake_final(session, TRUE); IMED_RET("send handshake final 2", ret, 1); } - /* fall through */ + FALLTHROUGH; case STATE16: ret = _gnutls_send_new_session_ticket(session, AGAIN(STATE16)); STATE = STATE16; IMED_RET("send handshake new session ticket", ret, 0); - /* fall through */ + FALLTHROUGH; case STATE17: STATE = STATE17; if (session->internals.resumed == RESUME_FALSE) { /* if we are not resuming */ @@ -3416,7 +3416,7 @@ static int handshake_server(gnutls_session_t session) } STATE = STATE0; - /* fall through */ + FALLTHROUGH; default: break; } |