diff options
| author | davidben <davidben@chromium.org> | 2014-09-03 16:19:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-03 23:23:16 +0000 |
| commit | 8ecc3071e84838f8a20a76a7caf9ae51380896ad (patch) | |
| tree | d22fe14ed79d0a57dbe41522d7b3bf55501f3968 /third_party/tlslite | |
| parent | d734d197bb5462a65c37b17594a8c8d07dd79bc1 (diff) | |
| download | chromium_src-8ecc3071e84838f8a20a76a7caf9ae51380896ad.zip chromium_src-8ecc3071e84838f8a20a76a7caf9ae51380896ad.tar.gz chromium_src-8ecc3071e84838f8a20a76a7caf9ae51380896ad.tar.bz2 | |
OpenSSL: Disable ECDSA cipher suites on Windows XP.
This matches the logic in nss_ssl_util.cc.
Note: this CL has a test which only affects Windows XP. We
have no try coverage on XP, so if the XP bots break, please
revert.
BUG=405630
Review URL: https://codereview.chromium.org/495663002
Cr-Commit-Position: refs/heads/master@{#293214}
Diffstat (limited to 'third_party/tlslite')
| -rw-r--r-- | third_party/tlslite/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/tlslite/patches/save_client_hello.patch | 14 | ||||
| -rw-r--r-- | third_party/tlslite/tlslite/tlsconnection.py | 3 |
3 files changed, 19 insertions, 0 deletions
diff --git a/third_party/tlslite/README.chromium b/third_party/tlslite/README.chromium index ab0b941..2d5723c 100644 --- a/third_party/tlslite/README.chromium +++ b/third_party/tlslite/README.chromium @@ -37,3 +37,5 @@ Local Modifications: failures. - patches/intolerance_options.patch: Add an option to further control simulated TLS version intolerance. +- patches/save_client_hello.patch: Save the parsed ClientHello on TLSConnection + so tests can query it. diff --git a/third_party/tlslite/patches/save_client_hello.patch b/third_party/tlslite/patches/save_client_hello.patch new file mode 100644 index 0000000..aaa5d24 --- /dev/null +++ b/third_party/tlslite/patches/save_client_hello.patch @@ -0,0 +1,14 @@ +diff --git a/third_party/tlslite/tlslite/tlsconnection.py b/third_party/tlslite/tlslite/tlsconnection.py +index 996b7e9..06aa0c9 100644 +--- a/third_party/tlslite/tlslite/tlsconnection.py ++++ b/third_party/tlslite/tlslite/tlsconnection.py +@@ -1261,6 +1261,9 @@ class TLSConnection(TLSRecordLayer): + return # Handshake was resumed, we're done + else: break + (clientHello, cipherSuite) = result ++ ++ # Save the ClientHello for external code to query. ++ self.clientHello = clientHello + + #If not a resumption... + diff --git a/third_party/tlslite/tlslite/tlsconnection.py b/third_party/tlslite/tlslite/tlsconnection.py index 996b7e9..06aa0c9 100644 --- a/third_party/tlslite/tlslite/tlsconnection.py +++ b/third_party/tlslite/tlslite/tlsconnection.py @@ -1261,6 +1261,9 @@ class TLSConnection(TLSRecordLayer): return # Handshake was resumed, we're done else: break (clientHello, cipherSuite) = result + + # Save the ClientHello for external code to query. + self.clientHello = clientHello #If not a resumption... |