diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-07-19 15:52:26 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-08-03 09:18:17 +0200 |
| commit | d47111032f5b20eed70093d988741da5d0e69952 (patch) | |
| tree | db725ee0bf90d5d500a45c681bb07445574a8b86 /lib/handshake.c | |
| parent | 5b9c6c93c680fdfa63b2854741d446ff50002510 (diff) | |
| download | gnutls-d47111032f5b20eed70093d988741da5d0e69952.tar.gz | |
tls1.3: server returns early on handshake when no cert is provided by client
Under TLS1.3 the server knows the negotiated keys early, if no client
certificate is sent. In that case, the server is not only able to
transmit the session ticket immediately after its finished message,
but is also able to transmit data, similarly to false start.
Resolves #481
Resolves #457
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
Diffstat (limited to 'lib/handshake.c')
| -rw-r--r-- | lib/handshake.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/handshake.c b/lib/handshake.c index d0c0f9dc97..ba3911d160 100644 --- a/lib/handshake.c +++ b/lib/handshake.c @@ -2462,8 +2462,9 @@ int gnutls_rehandshake(gnutls_session_t session) if (session->security_parameters.entity == GNUTLS_CLIENT) return GNUTLS_E_INVALID_REQUEST; - if (vers->tls13_sem) + if (vers->tls13_sem) { return gnutls_session_key_update(session, GNUTLS_KU_PEER); + } _dtls_async_timer_delete(session); @@ -2652,9 +2653,8 @@ int gnutls_handshake(gnutls_session_t session) } /* clear handshake buffer */ - if (session->security_parameters.entity != GNUTLS_CLIENT || - !(session->internals.flags & GNUTLS_ENABLE_FALSE_START) || - session->internals.recv_state != RECV_STATE_FALSE_START) { + if (session->internals.recv_state != RECV_STATE_FALSE_START && + session->internals.recv_state != RECV_STATE_EARLY_START) { _gnutls_handshake_hash_buffers_clear(session); @@ -2839,7 +2839,7 @@ static int handshake_client(gnutls_session_t session) ret = _gnutls_ext_sr_verify(session); STATE = STATE4; - IMED_RET("recv hello", ret, 0); + IMED_RET_FATAL("recv hello", ret, 0); /* fall through */ case STATE5: if (session->security_parameters.do_recv_supplemental) { @@ -3257,7 +3257,7 @@ static int handshake_server(gnutls_session_t session) ret = _gnutls_ext_sr_verify(session); STATE = STATE2; - IMED_RET("recv hello", ret, 0); + IMED_RET_FATAL("recv hello", ret, 0); /* fall through */ case STATE3: ret = _gnutls_send_server_hello(session, AGAIN(STATE3)); |