diff options
| author | Matt Caswell <matt@openssl.org> | 2018-08-24 16:16:28 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-09-04 11:22:26 +0100 |
| commit | 51256b34d82d008cca7be0d1903c357bfa99f753 (patch) | |
| tree | 2a3701e876eb363d6c149e08f191b04447cae678 | |
| parent | f097e8759820f6f9b78adb99eb4bfced2945d623 (diff) | |
Send a NewSessionTicket after using an external PSK
Treat a connection using an external PSK like we would a resumption and
send a single NewSessionTicket afterwards.
Fixes #6941
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7097)
| -rw-r--r-- | ssl/statem/extensions_srvr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c index 295d3e7ee5..0f2b22392b 100644 --- a/ssl/statem/extensions_srvr.c +++ b/ssl/statem/extensions_srvr.c @@ -1160,6 +1160,7 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, ext = 1; if (id == 0) s->ext.early_data_ok = 1; + s->ext.ticket_expected = 1; } else { uint32_t ticket_age = 0, now, agesec, agems; int ret; @@ -1235,6 +1236,7 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, SSL_SESSION_free(sess); sess = NULL; s->ext.early_data_ok = 0; + s->ext.ticket_expected = 0; continue; } break; |