diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2018-08-17 14:43:30 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-08-19 06:35:44 +0200 |
| commit | 3e534934926c33ef13dbe6cebfccebf78f95b2da (patch) | |
| tree | 8913f5988e189e847775a0e6d5de5c5121cf5f03 | |
| parent | 54bcb34c112fb7fd279be3f9ffd9b5e19c4b67a0 (diff) | |
| download | gnutls-tmp-fix-resumption-requested.tar.gz | |
gnutls_session_resumption_requested: fixed behavior under TLS1.3tmp-fix-resumption-requested
This makes gnutls_session_resumption_requested() functional under
TLS1.3 and introduces a unit test of the function.
Resolves #546
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | lib/ext/pre_shared_key.c | 2 | ||||
| -rw-r--r-- | tests/resume.c | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/lib/ext/pre_shared_key.c b/lib/ext/pre_shared_key.c index b2f24bc3ba..f3bd9c5973 100644 --- a/lib/ext/pre_shared_key.c +++ b/lib/ext/pre_shared_key.c @@ -493,6 +493,8 @@ static int server_recv_params(gnutls_session_t session, (ret = _gnutls13_unpack_session_ticket(session, &psk.identity, &ticket_data)) == 0) { prf = ticket_data.prf; + session->internals.resumption_requested = 1; + /* Check whether ticket is stale or not */ ticket_age = psk.ob_ticket_age - ticket_data.age_add; if (ticket_age < 0) { diff --git a/tests/resume.c b/tests/resume.c index c0217b5dc0..953c017388 100644 --- a/tests/resume.c +++ b/tests/resume.c @@ -355,6 +355,12 @@ static void verify_server_params(gnutls_session_t session, unsigned counter, str } } + if (counter > 0) { + if (gnutls_session_resumption_requested(session) == 0) { + fail("client did not request resumption!\n"); + } + } + if (params->no_early_start) { if (gnutls_session_get_flags(session) & GNUTLS_SFLAGS_EARLY_START) { fail("early start did happen on %d but was not expected!\n", counter); |