diff options
| author | haavardm@opera.com <haavardm@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 16:30:33 +0000 |
|---|---|---|
| committer | haavardm@opera.com <haavardm@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-15 16:30:33 +0000 |
| commit | df3db7a2076b32f64fe1e1e757c7005ced9a15b7 (patch) | |
| tree | c7073da48314124331fee7060a2f5ce06894f9b7 /third_party/tlslite | |
| parent | 84b24c832afdad47399b29a2b8e3ad4ca61dc1ea (diff) | |
| download | chromium_src-df3db7a2076b32f64fe1e1e757c7005ced9a15b7.zip chromium_src-df3db7a2076b32f64fe1e1e757c7005ced9a15b7.tar.gz chromium_src-df3db7a2076b32f64fe1e1e757c7005ced9a15b7.tar.bz2 | |
Move channel id tests up from OpenSSL and update channelid version.
NSS (and soon OpenSSL) runs the new ChannelID version 30032. This patch
moves the simple ChannelID tests from OpenSSL unittests to the general
ssl_client_socket_unittest.cc and updates the channelid version in
TLS Lite.
TLS Lite is not updated with ChannelId resumption support since
ChannelID signature checking is not yet implemented in TLS Lite.
ChannelID Signature checks, along with ChannelId resumption support
and ChannelID resumption tests should be implemented in further work.
This CL will also roll third_party/openssl:
OpenSSL: rolls DEPS 267648->269063
Takes in following change:
r269063 | haavardm@opera.com | 2014-05-08 17:48:32 +0200 (to., 08 mai 2014) | 8 lines
New tls channel id version for OpenSSL
New tls channel id version extracted from patch 0015-channelid.patch attached to http://crbug.com/366961.
BUG=366961
Review URL: https://codereview.chromium.org/263213005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270683 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/tlslite')
| -rw-r--r-- | third_party/tlslite/patches/channel_id.patch | 2 | ||||
| -rw-r--r-- | third_party/tlslite/tlslite/constants.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/tlslite/patches/channel_id.patch b/third_party/tlslite/patches/channel_id.patch index 34d4e9d..0fe1692 100644 --- a/third_party/tlslite/patches/channel_id.patch +++ b/third_party/tlslite/patches/channel_id.patch @@ -14,7 +14,7 @@ index d52e596..79ad145 100755 cert_type = 9 # RFC 6091 tack = 0xF300 supports_npn = 13172 -+ channel_id = 30031 ++ channel_id = 30032 class NameType: host_name = 0 diff --git a/third_party/tlslite/tlslite/constants.py b/third_party/tlslite/tlslite/constants.py index feca423..30d1f9f 100644 --- a/third_party/tlslite/tlslite/constants.py +++ b/third_party/tlslite/tlslite/constants.py @@ -52,7 +52,7 @@ class ExtensionType: # RFC 6066 / 4366 signed_cert_timestamps = 18 # RFC 6962 tack = 0xF300 supports_npn = 13172 - channel_id = 30031 + channel_id = 30032 class NameType: host_name = 0 |