summaryrefslogtreecommitdiffstats
path: root/ssl/ssl.h
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2015-04-21 18:12:58 +0200
committerEmilia Kasper <emilia@openssl.org>2015-04-21 19:37:17 +0200
commitd695a0225456f790d1fb93e19784f0c5b8397220 (patch)
tree793166b92c47e7c437a89f4e2f3767f7f64e2ec9 /ssl/ssl.h
parenta209623fbb5b5cdaaf3a825442cb1ed86a985df6 (diff)
Repair EAP-FAST session resumption
EAP-FAST session resumption relies on handshake message lookahead to determine server intentions. Commits 980bc1ec6114f5511b20c2e6ca741e61a39b99d6 and 7b3ba508af5c86afe43e28174aa3c53a0a24f4d9 removed the lookahead so broke session resumption. This change partially reverts the commits and brings the lookahead back in reduced capacity for TLS + EAP-FAST only. Since EAP-FAST does not support regular session tickets, the lookahead now only checks for a Finished message. Regular handshakes are unaffected by this change. Reviewed-by: David Benjamin <davidben@chromium.org> Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 6e3d015363ed09c4eff5c02ad41153387ffdf5af)
Diffstat (limited to 'ssl/ssl.h')
-rw-r--r--ssl/ssl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index b93b67b14b..790589d541 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -2303,6 +2303,7 @@ void ERR_load_SSL_strings(void);
# define SSL_F_SSL3_CHANGE_CIPHER_STATE 129
# define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130
# define SSL_F_SSL3_CHECK_CLIENT_HELLO 304
+# define SSL_F_SSL3_CHECK_FINISHED 339
# define SSL_F_SSL3_CLIENT_HELLO 131
# define SSL_F_SSL3_CONNECT 132
# define SSL_F_SSL3_CTRL 213