Commit 758e05c5 authored by Matt Caswell's avatar Matt Caswell
Browse files

Make sure we treat records written after HRR as TLSv1.3 



This fixes a bug where some CCS records were written with the wrong TLS
record version.

Reviewed-by: default avatarBen Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4701)
parent 318d3c0e

ssl/ssl_locl.h

+2 −1
Original line number Diff line number Diff line
@@ -326,7 +326,8 @@ 
    (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)

     || (s)->early_data_state == SSL_EARLY_DATA_WRITE_RETRY \

     || (s)->hello_retry_request == SSL_HRR_PENDING)



# define SSL_IS_FIRST_HANDSHAKE(S) ((s)->s3->tmp.finish_md_len == 0 \

                                    || (s)->s3->tmp.peer_finish_md_len == 0)