diff options
| author | Matt Caswell <matt@openssl.org> | 2017-11-13 16:12:35 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-12-14 15:06:37 +0000 |
| commit | 7b0a3ce0f9f54cf7b527fe57d98748a7aaa571bd (patch) | |
| tree | 055ed4e8ba286698240de06395abaa672ac449ac /ssl | |
| parent | 426dfc9ff7c1afaf1ed5981a9c7846e310c7ae3e (diff) | |
Ensure CCS sent before early_data has the correct record version
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4701)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_locl.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 6b899691f9..0e45b92fb0 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -323,7 +323,9 @@ && (s)->method->version != TLS_ANY_VERSION) # define SSL_TREAT_AS_TLS13(s) \ - (SSL_IS_TLS13(s) || (s)->early_data_state == SSL_EARLY_DATA_WRITING \ + (SSL_IS_TLS13(s) || (s)->early_data_state == SSL_EARLY_DATA_CONNECTING \ + || (s)->early_data_state == SSL_EARLY_DATA_CONNECT_RETRY \ + || (s)->early_data_state == SSL_EARLY_DATA_WRITING \ || (s)->early_data_state == SSL_EARLY_DATA_WRITE_RETRY) # define SSL_IS_FIRST_HANDSHAKE(S) ((s)->s3->tmp.finish_md_len == 0 \ |