diff options
| author | Matt Caswell <matt@openssl.org> | 2018-07-18 18:05:49 +0300 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-08-15 14:33:30 +0300 |
| commit | 35e742ecac9239539db016e1282b4cbdf501509c (patch) | |
| tree | 69505449d87cb5902f7db623738266782bb98ac2 /util | |
| parent | 58094ab60ff51918a248dc6bd977d48f981fe2c1 (diff) | |
Update code for the final RFC version of TLSv1.3 (RFC8446)
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6741)
Diffstat (limited to 'util')
| -rw-r--r-- | util/perl/TLSProxy/Message.pm | 5 | ||||
| -rw-r--r-- | util/perl/TLSProxy/Record.pm | 1 | ||||
| -rw-r--r-- | util/perl/TLSProxy/ServerHello.pm | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/util/perl/TLSProxy/Message.pm b/util/perl/TLSProxy/Message.pm index dae6daa696..16ed012066 100644 --- a/util/perl/TLSProxy/Message.pm +++ b/util/perl/TLSProxy/Message.pm @@ -95,9 +95,8 @@ use constant { EXT_FORCE_LAST => 0xffff }; -# SignatureScheme of TLS 1.3, from -# https://tools.ietf.org/html/draft-ietf-tls-tls13-20#appendix-B.3.1.3 -# TODO(TLS1.3) update link to IANA registry after publication +# SignatureScheme of TLS 1.3 from: +# https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml#tls-signaturescheme # We have to manually grab the SHA224 equivalents from the old registry use constant { SIG_ALG_RSA_PKCS1_SHA256 => 0x0401, diff --git a/util/perl/TLSProxy/Record.pm b/util/perl/TLSProxy/Record.pm index 8db50d0bff..0a280cb269 100644 --- a/util/perl/TLSProxy/Record.pm +++ b/util/perl/TLSProxy/Record.pm @@ -36,7 +36,6 @@ my %record_type = ( use constant { VERS_TLS_1_4 => 0x0305, - VERS_TLS_1_3_DRAFT => 0x7f1c, VERS_TLS_1_3 => 0x0304, VERS_TLS_1_2 => 0x0303, VERS_TLS_1_1 => 0x0302, diff --git a/util/perl/TLSProxy/ServerHello.pm b/util/perl/TLSProxy/ServerHello.pm index 934eaf4dea..232c778b34 100644 --- a/util/perl/TLSProxy/ServerHello.pm +++ b/util/perl/TLSProxy/ServerHello.pm @@ -101,9 +101,7 @@ sub parse if ($random eq $hrrrandom) { TLSProxy::Proxy->is_tls13(1); - # TODO(TLS1.3): Replace this reference to draft version before release - } elsif ($neg_version == TLSProxy::Record::VERS_TLS_1_3_DRAFT) { - $neg_version = TLSProxy::Record::VERS_TLS_1_3; + } elsif ($neg_version == TLSProxy::Record::VERS_TLS_1_3) { TLSProxy::Proxy->is_tls13(1); TLSProxy::Record->server_encrypting(1); |