From: Matt Caswell <matt@openssl.org>
Date: Wed, 6 Jun 2018 10:54:32 +0000 (+0100)
Subject: Fix EAP-FAST
X-Git-Tag: OpenSSL_1_1_1-pre8~66
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=309371d6266877a8f04d0aa7b0f6add6d269d962;hp=ac52f42aca9fe0933f7564581268ac50c826bd39

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)
---

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;