diff options
| author | Matt Caswell <matt@openssl.org> | 2018-05-14 18:35:30 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-05-15 10:02:59 +0100 |
| commit | 73cc84a132a08a02253ae168600fc4d16cd400d8 (patch) | |
| tree | 79fd5e2f7a8c691f1dae14ad9110f5fd98c3f06f /ssl/t1_trce.c | |
| parent | ba8b48e98dd86851ca20733f819da5b76859e64a (diff) | |
| download | openssl-73cc84a132a08a02253ae168600fc4d16cd400d8.zip openssl-73cc84a132a08a02253ae168600fc4d16cd400d8.tar.gz openssl-73cc84a132a08a02253ae168600fc4d16cd400d8.tar.bz2 | |
Suport TLSv1.3 draft 28
Also retains support for drafts 27 and 26
Fixes #6257
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6258)
Diffstat (limited to 'ssl/t1_trce.c')
| -rw-r--r-- | ssl/t1_trce.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/ssl/t1_trce.c b/ssl/t1_trce.c index 5287326..4d052d0 100644 --- a/ssl/t1_trce.c +++ b/ssl/t1_trce.c @@ -65,7 +65,9 @@ static const ssl_trace_tbl ssl_version_tbl[] = { {TLS1_1_VERSION, "TLS 1.1"}, {TLS1_2_VERSION, "TLS 1.2"}, {TLS1_3_VERSION, "TLS 1.3"}, - /* TODO(TLS1.3): Remove this line before release */ + /* TODO(TLS1.3): Remove these lines before release */ + {TLS1_3_VERSION_DRAFT_26, TLS1_3_VERSION_DRAFT_TXT_26}, + {TLS1_3_VERSION_DRAFT_27, TLS1_3_VERSION_DRAFT_TXT_27}, {TLS1_3_VERSION_DRAFT, TLS1_3_VERSION_DRAFT_TXT}, {DTLS1_VERSION, "DTLS 1.0"}, {DTLS1_2_VERSION, "DTLS 1.2"}, @@ -642,7 +644,15 @@ static int ssl_print_version(BIO *bio, int indent, const char *name, vers = ((*pmsg)[0] << 8) | (*pmsg)[1]; if (version != NULL) { /* TODO(TLS1.3): Remove the draft conditional here before release */ - *version = (vers == TLS1_3_VERSION_DRAFT) ? TLS1_3_VERSION : vers; + switch(vers) { + case TLS1_3_VERSION_DRAFT_26: + case TLS1_3_VERSION_DRAFT_27: + case TLS1_3_VERSION_DRAFT: + *version = TLS1_3_VERSION; + break; + default: + *version = vers; + } } BIO_indent(bio, indent, 80); BIO_printf(bio, "%s=0x%x (%s)\n", |