diff options
| author | Matt Caswell <matt@openssl.org> | 2018-06-06 11:54:32 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-06-07 09:48:49 +0100 |
| commit | 309371d6266877a8f04d0aa7b0f6add6d269d962 (patch) | |
| tree | d48b859dcc4c3c6096c2c5d1856efee1872bca18 /ssl/t1_lib.c | |
| parent | ac52f42aca9fe0933f7564581268ac50c826bd39 (diff) | |
Fix EAP-FAST
Commit 61fb59238d broke EAP-FAST support. This fixes it.
Fixes #6395
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6428)
Diffstat (limited to 'ssl/t1_lib.c')
| -rw-r--r-- | ssl/t1_lib.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index aab50e129e..1826dd2bb3 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1487,11 +1487,13 @@ SSL_TICKET_STATUS tls_decrypt_ticket(SSL *s, const unsigned char *etick, } } - switch (ret) { - case SSL_TICKET_NO_DECRYPT: - case SSL_TICKET_SUCCESS_RENEW: - case SSL_TICKET_EMPTY: - s->ext.ticket_expected = 1; + if (s->ext.session_secret_cb == NULL || SSL_IS_TLS13(s)) { + switch (ret) { + case SSL_TICKET_NO_DECRYPT: + case SSL_TICKET_SUCCESS_RENEW: + case SSL_TICKET_EMPTY: + s->ext.ticket_expected = 1; + } } *psess = sess; |