diff options
| author | Emilia Kasper <emilia@openssl.org> | 2015-04-21 18:12:58 +0200 |
|---|---|---|
| committer | Emilia Kasper <emilia@openssl.org> | 2015-04-21 18:12:58 +0200 |
| commit | 6e3d015363ed09c4eff5c02ad41153387ffdf5af (patch) | |
| tree | 5d24c2a6db27c03d58db0201558c21f0d8580ab2 /include | |
| parent | c3b9bd11f9908c5103a3b39753bb48e78a9cf0d3 (diff) | |
| download | openssl-6e3d015363ed09c4eff5c02ad41153387ffdf5af.tar.gz | |
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>
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ssl.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h index fae706b879..a24f7421d7 100644 --- a/include/openssl/ssl.h +++ b/include/openssl/ssl.h @@ -1981,6 +1981,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 @@ -2038,7 +2039,7 @@ void ERR_load_SSL_strings(void); # define SSL_F_SSL_BAD_METHOD 160 # define SSL_F_SSL_BUILD_CERT_CHAIN 332 # define SSL_F_SSL_BYTES_TO_CIPHER_LIST 161 -# define SSL_F_SSL_CERT_ADD0_CHAIN_CERT 339 +# define SSL_F_SSL_CERT_ADD0_CHAIN_CERT 346 # define SSL_F_SSL_CERT_DUP 221 # define SSL_F_SSL_CERT_INSTANTIATE 214 # define SSL_F_SSL_CERT_NEW 162 |