Improve the TLS intolerant server testing support added in r134129

net/test/base_test_server.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef NET_TEST_BASE_TEST_SERVER_H_
 #define NET_TEST_BASE_TEST_SERVER_H_
 #pragma once
 
 #include <string>
 #include <utility>
@@ skipping 67 matching lines @@
       BULK_CIPHER_RC4    = (1 << 0),
       BULK_CIPHER_AES128 = (1 << 1),
       BULK_CIPHER_AES256 = (1 << 2),
 
       // NOTE: 3DES support in the Python test server has external
       // dependencies and not be available on all machines. Clients may not
       // be able to connect if only 3DES is specified.
       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();
 
     // Initialize a new HTTPSOptions that will use the specified certificate.
     explicit HTTPSOptions(ServerCertificate cert);
     ~HTTPSOptions();
 
     // Returns the relative filename of the file that contains the
     // |server_certificate|.
     FilePath GetCertificateFile() const;
@@ skipping 22 matching lines @@
     // 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.
     int bulk_ciphers;
 
     // If true, pass the --https-record-resume argument to testserver.py which
     // causes it to log session cache actions and echo the log on
     // /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
   static const char kLocalhost[];
 
   // The auth token to be used for TYPE_GDATA server.
   static const char kGDataAuthToken[];
 
   // Initialize a TestServer listening on a specific host (IP or hostname).
   BaseTestServer(Type type,  const std::string& host);
@@ skipping 85 matching lines @@
 
   scoped_ptr<ScopedPortException> allowed_port_;
 
   DISALLOW_COPY_AND_ASSIGN(BaseTestServer);
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_BASE_TEST_SERVER_H_