diff options
| author | Daiki Ueno <ueno@gnu.org> | 2018-08-08 11:58:14 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2018-08-08 11:58:14 +0000 |
| commit | fa122d8149f1058e135bdcb31a7306a70093352d (patch) | |
| tree | e258327b47a6d32f9d815059d1c53c8221d258d8 /lib/ext/pre_shared_key.c | |
| parent | b1e9703c5bfd12ed60664176de594a6cc453ea99 (diff) | |
| parent | 3f56889505bb30cc65768b9e270954423a4fb5f4 (diff) | |
| download | gnutls-fa122d8149f1058e135bdcb31a7306a70093352d.tar.gz | |
Merge branch 'tmp-tlsfuzzer-update-tls13' into 'master'
tlsfuzzer: update to the latest version to enable more TLS 1.3 tests
Closes #537
See merge request gnutls/gnutls!727
Diffstat (limited to 'lib/ext/pre_shared_key.c')
| -rw-r--r-- | lib/ext/pre_shared_key.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/ext/pre_shared_key.c b/lib/ext/pre_shared_key.c index dc56d1dc49..b2f24bc3ba 100644 --- a/lib/ext/pre_shared_key.c +++ b/lib/ext/pre_shared_key.c @@ -515,7 +515,8 @@ static int server_recv_params(gnutls_session_t session, resuming = 1; break; - } else if (psk.ob_ticket_age == 0 && + } else if (pskcred && + psk.ob_ticket_age == 0 && psk.identity.size > 0 && psk.identity.size <= MAX_USERNAME_SIZE) { /* _gnutls_psk_pwd_find_entry() expects 0-terminated identities */ char identity_str[psk.identity.size + 1]; |