| Index: net/test/base_test_server.h
|
| ===================================================================
|
| --- net/test/base_test_server.h (revision 138367)
|
| +++ net/test/base_test_server.h (working copy)
|
| @@ -85,6 +85,15 @@
|
| BULK_CIPHER_3DES = (1 << 3),
|
| };
|
|
|
| + // NOTE: the values of these enumerators are passed to the the Python test
|
| + // server. Do not change them.
|
| + enum TLSIntolerantLevel {
|
| + TLS_INTOLERANT_NONE = 0,
|
| + TLS_INTOLERANT_ALL = 1, // Intolerant of all TLS versions.
|
| + TLS_INTOLERANT_TLS1_1 = 2, // Intolerant of TLS 1.1 or higher.
|
| + TLS_INTOLERANT_TLS1_2 = 3, // Intolerant of TLS 1.2 or higher.
|
| + };
|
| +
|
| // Initialize a new HTTPSOptions using CERT_OK as the certificate.
|
| HTTPSOptions();
|
|
|
| @@ -127,9 +136,9 @@
|
| // /ssl-session-cache.
|
| bool record_resume;
|
|
|
| - // If true, the server will abort any TLS handshake in order to test
|
| - // SSLv3 fallback.
|
| - bool tls_intolerant;
|
| + // If not TLS_INTOLERANT_NONE, the server will abort any handshake that
|
| + // negotiates an intolerant TLS version in order to test version fallback.
|
| + TLSIntolerantLevel tls_intolerant;
|
| };
|
|
|
| // Pass as the 'host' parameter during construction to server on 127.0.0.1
|
|
|