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

Unified Diff: net/test/spawned_test_server/base_test_server.h

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/test/spawned_test_server/base_test_server.h
diff --git a/net/test/spawned_test_server/base_test_server.h b/net/test/spawned_test_server/base_test_server.h
index 163808c17b3693f812c8a303e7eb7ee53f8f8cee..a35b9509180543584d4322ad789fe72dd0a8a321 100644
--- a/net/test/spawned_test_server/base_test_server.h
+++ b/net/test/spawned_test_server/base_test_server.h
@@ -72,6 +72,17 @@ class BaseTestServer {
OCSP_UNKNOWN,
};
+ // Bitmask of key exchange algorithms that the test server supports and that
+ // can be selectively enabled or disabled.
+ enum KeyExchange {
+ // Special value used to indicate that any algorithm the server supports
+ // is acceptable. Preferred over explicitly OR-ing all ciphers.
wtc 2014/04/02 19:26:55 Typo: ciphers => key exchange algorithms
davidben 2014/04/03 19:38:36 Done.
+ KEY_EXCHANGE_ANY = 0,
+
+ KEY_EXCHANGE_RSA = (1 << 0),
+ KEY_EXCHANGE_DHE_RSA = (1 << 1),
wtc 2014/04/02 19:26:55 The test server actually supports more key exchang
Ryan Sleevi 2014/04/02 22:09:13 Not until we need em :)
davidben 2014/04/03 19:38:36 tlslite does, but the test server will need to pas
+ };
+
// Bitmask of bulk encryption algorithms that the test server supports
// and that can be selectively enabled or disabled.
enum BulkCipher {
@@ -134,6 +145,11 @@ class BaseTestServer {
// field of the CertificateRequest.
std::vector<base::FilePath> client_authorities;
+ // A bitwise-OR of KeyExchnage that should be used by the
+ // HTTPS server, or KEY_EXCHANGE_ANY to indicate that all implemented
+ // key exchange algorithms are acceptable.
+ int key_exchanges;
+
// A bitwise-OR of BulkCipher that should be used by the
// HTTPS server, or BULK_CIPHER_ANY to indicate that all implemented
// ciphers are acceptable.
@@ -165,6 +181,9 @@ class BaseTestServer {
// Whether to staple the OCSP response.
bool staple_ocsp_response;
+
+ // Whether to enable NPN support.
+ bool support_npn;
wtc 2014/04/02 19:26:55 Nit: support_npn => enable_npn?
Ryan Sleevi 2014/04/02 22:09:13 +1
davidben 2014/04/03 19:38:36 Done.
};
// Pass as the 'host' parameter during construction to server on 127.0.0.1

Powered by Google App Engine
This is Rietveld 408576698