Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(260)

Side by Side Diff: net/tools/testserver/testserver.py

Issue 858373002: Update third_party/tlslite to 0.4.8. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Finish fixing client auth Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | third_party/tlslite/LICENSE » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright 2013 The Chromium Authors. All rights reserved. 2 # Copyright 2013 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 """This is a simple HTTP/FTP/TCP/UDP/BASIC_AUTH_PROXY/WEBSOCKET server used for 6 """This is a simple HTTP/FTP/TCP/UDP/BASIC_AUTH_PROXY/WEBSOCKET server used for
7 testing Chrome. 7 testing Chrome.
8 8
9 It supports several test URLs, as specified by the handlers in TestPageHandler. 9 It supports several test URLs, as specified by the handlers in TestPageHandler.
10 By default, it listens on an ephemeral port and sends the port number back to 10 By default, it listens on an ephemeral port and sends the port number back to
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 self.ssl_client_cas.append(x509.subject) 186 self.ssl_client_cas.append(x509.subject)
187 187
188 for cert_type in ssl_client_cert_types: 188 for cert_type in ssl_client_cert_types:
189 self.ssl_client_cert_types.append({ 189 self.ssl_client_cert_types.append({
190 "rsa_sign": tlslite.api.ClientCertificateType.rsa_sign, 190 "rsa_sign": tlslite.api.ClientCertificateType.rsa_sign,
191 "dss_sign": tlslite.api.ClientCertificateType.dss_sign, 191 "dss_sign": tlslite.api.ClientCertificateType.dss_sign,
192 "ecdsa_sign": tlslite.api.ClientCertificateType.ecdsa_sign, 192 "ecdsa_sign": tlslite.api.ClientCertificateType.ecdsa_sign,
193 }[cert_type]) 193 }[cert_type])
194 194
195 self.ssl_handshake_settings = tlslite.api.HandshakeSettings() 195 self.ssl_handshake_settings = tlslite.api.HandshakeSettings()
196 # Enable SSLv3 for testing purposes.
197 self.ssl_handshake_settings.minVersion = (3, 0)
196 if ssl_bulk_ciphers is not None: 198 if ssl_bulk_ciphers is not None:
197 self.ssl_handshake_settings.cipherNames = ssl_bulk_ciphers 199 self.ssl_handshake_settings.cipherNames = ssl_bulk_ciphers
198 if ssl_key_exchanges is not None: 200 if ssl_key_exchanges is not None:
199 self.ssl_handshake_settings.keyExchangeNames = ssl_key_exchanges 201 self.ssl_handshake_settings.keyExchangeNames = ssl_key_exchanges
200 if tls_intolerant != 0: 202 if tls_intolerant != 0:
201 self.ssl_handshake_settings.tlsIntolerant = (3, tls_intolerant) 203 self.ssl_handshake_settings.tlsIntolerant = (3, tls_intolerant)
202 self.ssl_handshake_settings.tlsIntoleranceType = tls_intolerance_type 204 self.ssl_handshake_settings.tlsIntoleranceType = tls_intolerance_type
203 205
204 206
205 if disable_session_cache: 207 if disable_session_cache:
(...skipping 2070 matching lines...) Expand 10 before | Expand all | Expand 10 after
2276 self.option_parser.add_option('--ocsp-server-unavailable', 2278 self.option_parser.add_option('--ocsp-server-unavailable',
2277 dest='ocsp_server_unavailable', 2279 dest='ocsp_server_unavailable',
2278 default=False, action='store_true', 2280 default=False, action='store_true',
2279 help='If set, the OCSP server will return ' 2281 help='If set, the OCSP server will return '
2280 'a tryLater status rather than the actual ' 2282 'a tryLater status rather than the actual '
2281 'OCSP response.') 2283 'OCSP response.')
2282 2284
2283 2285
2284 if __name__ == '__main__': 2286 if __name__ == '__main__':
2285 sys.exit(ServerRunner().main()) 2287 sys.exit(ServerRunner().main())
OLDNEW
« no previous file with comments | « no previous file | third_party/tlslite/LICENSE » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698