diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 11:57:36 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-28 11:57:36 +0000 |
| commit | 34759995af4ca6b8c750b14dc63f9a007acba1db (patch) | |
| tree | c1fcaabf2872446e503ebb17503c02b501fba4de /chrome/browser/ssl | |
| parent | 3655a6dec098ca14d8d5ccf001a8d801b005e0a5 (diff) | |
| download | chromium_src-34759995af4ca6b8c750b14dc63f9a007acba1db.zip chromium_src-34759995af4ca6b8c750b14dc63f9a007acba1db.tar.gz chromium_src-34759995af4ca6b8c750b14dc63f9a007acba1db.tar.bz2 | |
Add support to test_server.py to restrict the SSL/TLS bulk encryption algorithms via the command-line argument --ssl-alg.
BUG=58831
TEST=Run test_server.py as an HTTPS server with --ssl-alg=rc4. Connect via openssl s_client -connect 127.0.0.1:1337 -cipher DEFAULT:\!RC4. Observe a connection failure. Connect with openssl s_client -connect 127.0.0.1:1337, observe that a ciphersuite that uses RC4 is negotiated.
Review URL: http://codereview.chromium.org/3812007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 735941f..247ae91 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -20,13 +20,16 @@ const FilePath::CharType kDocRoot[] = FILE_PATH_LITERAL("chrome/test/data"); class SSLUITest : public InProcessBrowserTest { + typedef net::TestServer::HTTPSOptions HTTPSOptions; + public: SSLUITest() - : https_server_(net::TestServer::TYPE_HTTPS, FilePath(kDocRoot)), - https_server_expired_(net::TestServer::TYPE_HTTPS_EXPIRED_CERTIFICATE, - FilePath(kDocRoot)), + : https_server_( + HTTPSOptions(HTTPSOptions::CERT_OK), FilePath(kDocRoot)), + https_server_expired_( + HTTPSOptions(HTTPSOptions::CERT_EXPIRED), FilePath(kDocRoot)), https_server_mismatched_( - net::TestServer::TYPE_HTTPS_MISMATCHED_HOSTNAME, + HTTPSOptions(HTTPSOptions::CERT_MISMATCHED_NAME), FilePath(kDocRoot)) { EnableDOMAutomation(); } |