mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-03-19 19:50:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

The record version for ClientHello2 should be TLS1.2

Browse Source 
According to TLSv1.3 draft-24 the record version for ClientHello2 should
be TLS1.2, and not TLS1.0 as it is now.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5377)
This commit is contained in:
Matt Caswell 2018-02-15 14:29:45 +00:00
parent b761ff4e77
commit 5f7470df83
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/record/rec_layer_s3.c
View File

@ -839,7 +839,9 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
* and record version number > TLS 1.0
*/
if (SSL_get_state(s) == TLS_ST_CW_CLNT_HELLO
&& !s->renegotiate && TLS1_get_version(s) > TLS1_VERSION)
&& !s->renegotiate
&& TLS1_get_version(s) > TLS1_VERSION
&& s->hello_retry_request == SSL_HRR_NONE)
version = TLS1_VERSION;
maxcomplen = pipelens[j];

4
test/tls13ccstest.c
View File

@ -118,7 +118,7 @@ static int watchccs_write(BIO *bio, const char *in, int inl)
return 0;
if (msgtype == SSL3_MT_CLIENT_HELLO) {
chseen++;
expectedrecvers = TLS1_VERSION;
/*
* Skip legacy_version (2 bytes) and Random (32 bytes) to read
* session_id.
@ -128,6 +128,8 @@ static int watchccs_write(BIO *bio, const char *in, int inl)
return 0;
if (chseen == 1) {
expectedrecvers = TLS1_VERSION;
/* Save the session id for later */
chsessidlen = PACKET_remaining(&sessionid);
if (!PACKET_copy_bytes(&sessionid, chsessid, chsessidlen))