The branch master has been updated
via 309371d6266877a8f04d0aa7b0f6add6d269d962 (commit)
from ac52f42aca9fe0933f7564581268ac50c826bd39 (commit)
- Log -----------------------------------------------------------------
commit 309371d6266877a8f04d0aa7b0f6add6d269d962
Author: Matt Caswell <[email protected]>
Date: Wed Jun 6 11:54:32 2018 +0100
Fix EAP-FAST
Commit 61fb59238d broke EAP-FAST support. This fixes it.
Fixes #6395
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/6428)
-----------------------------------------------------------------------
Summary of changes:
ssl/t1_lib.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index aab50e1..1826dd2 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;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
