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

Unified Diff: net/tools/testserver/testserver.py

Issue 208293002: Add False Start tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add negative tests Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: net/tools/testserver/testserver.py
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 1f82ecb91b3a795eb6230ef2c1a11f621ed8ec70..8f0fd825d7976cadafe113734f1542bb3778b9d5 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -150,7 +150,7 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
def __init__(self, server_address, request_hander_class, pem_cert_and_key,
ssl_client_auth, ssl_client_cas,
- ssl_bulk_ciphers, ssl_key_exchanges,
+ ssl_bulk_ciphers, ssl_key_exchanges, next_protos,
record_resume_info, tls_intolerant, signed_cert_timestamps,
fallback_scsv_enabled, ocsp_response):
self.cert_chain = tlslite.api.X509CertChain()
@@ -171,6 +171,7 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
self.signed_cert_timestamps = signed_cert_timestamps
self.fallback_scsv_enabled = fallback_scsv_enabled
self.ocsp_response = ocsp_response
+ self.next_protos = next_protos
for ca_file in ssl_client_cas:
s = open(ca_file).read()
@@ -204,6 +205,7 @@ class HTTPSServer(tlslite.api.TLSSocketServerMixIn,
reqCert=self.ssl_client_auth,
settings=self.ssl_handshake_settings,
reqCAs=self.ssl_client_cas,
+ nextProtos=self.next_protos,
tlsIntolerant=self.tls_intolerant,
signedCertTimestamps=
self.signed_cert_timestamps,
@@ -1983,6 +1985,7 @@ class ServerRunner(testserver_base.TestServerRunner):
self.options.ssl_client_ca,
self.options.ssl_bulk_cipher,
self.options.ssl_key_exchange,
+ self.options.next_proto,
self.options.record_resume,
self.options.tls_intolerant,
self.options.signed_cert_timestamps_tls_ext.decode(
@@ -2179,6 +2182,13 @@ class ServerRunner(testserver_base.TestServerRunner):
'option may appear multiple times, '
'indicating multiple algorithms should be '
'enabled.');
+ # TODO(davidben): Add ALPN support to tlslite.
+ self.option_parser.add_option('--next-proto', action='append',
+ help='Specify the next proto value(s) to '
wtc 2014/04/02 19:26:55 Question: how are multiple values separated. By sp
davidben 2014/04/03 19:38:36 It should be the same as --ssl-bulk-cipher and fri
+ 'used with the NPN extension. If omitted, '
+ 'NPN will not be used used. This option '
wtc 2014/04/02 19:26:55 Nit: used used => used
+ 'may appear multiple times, indicating '
+ 'the list of preferred protos.')
wtc 2014/04/02 19:26:55 Nit: I don't understand why you said "preferred".
davidben 2014/04/03 19:38:36 Hrm. I think that's what I meant? That's a somewha
self.option_parser.add_option('--file-root-url', default='/files/',
help='Specify a root URL for files served.')

Powered by Google App Engine
This is Rietveld 408576698