diff options
| author | Daiki Ueno <ueno@gnu.org> | 2021-02-10 19:17:03 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2021-02-10 19:17:03 +0000 |
| commit | 6a1028ca5c0dd106e34155d7e195f8895cff0a5a (patch) | |
| tree | b20b452511338d6f4a7b46cd8a76ce495ac4b61e /lib/handshake-tls13.c | |
| parent | d8cb3f2e88b45edf0ba5b9e2a17d3cd7a31ff723 (diff) | |
| parent | 37e54a05221e076ba905d2d53fc7d885dc9e9ebc (diff) | |
| download | gnutls-6a1028ca5c0dd106e34155d7e195f8895cff0a5a.tar.gz | |
Merge branch 'wip/dueno/hrr-resumption' into 'master'
handshake: TLS 1.3: don't generate session ID in resumption mode
See merge request gnutls/gnutls!1381
Diffstat (limited to 'lib/handshake-tls13.c')
| -rw-r--r-- | lib/handshake-tls13.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/handshake-tls13.c b/lib/handshake-tls13.c index ea236c803c..7dd42becf1 100644 --- a/lib/handshake-tls13.c +++ b/lib/handshake-tls13.c @@ -210,7 +210,7 @@ int _gnutls13_handshake_client(gnutls_session_t session) SAVE_TRANSCRIPT; - if (session->internals.resumed != RESUME_FALSE) + if (session->internals.resumed) _gnutls_set_resumed_parameters(session); return 0; @@ -325,7 +325,7 @@ static int generate_hs_traffic_keys(gnutls_session_t session) if ((session->security_parameters.entity == GNUTLS_CLIENT && (!(session->internals.hsk_flags & HSK_KEY_SHARE_RECEIVED) || (!(session->internals.hsk_flags & HSK_PSK_KE_MODE_DHE_PSK) && - session->internals.resumed != RESUME_FALSE))) || + session->internals.resumed))) || (session->security_parameters.entity == GNUTLS_SERVER && !(session->internals.hsk_flags & HSK_KEY_SHARE_SENT))) { @@ -506,7 +506,7 @@ int _gnutls13_handshake_server(gnutls_session_t session) FALLTHROUGH; case STATE109: - if (session->internals.resumed != RESUME_FALSE) + if (session->internals.resumed) _gnutls_set_resumed_parameters(session); if (session->internals.hsk_flags & HSK_EARLY_START_USED) { |