diff options
| author | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 10:04:10 +0000 |
|---|---|---|
| committer | joth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 10:04:10 +0000 |
| commit | 718c967f73fbdc4193e11930e5fe3bb5ff6ab6a5 (patch) | |
| tree | a96e859ea1efeec2bc25ae76bdbf317e631c0d1c /net/test | |
| parent | 9c635f24128b5638dac833499fb1fd5ee2be6375 (diff) | |
| download | chromium_src-718c967f73fbdc4193e11930e5fe3bb5ff6ab6a5.zip chromium_src-718c967f73fbdc4193e11930e5fe3bb5ff6ab6a5.tar.gz chromium_src-718c967f73fbdc4193e11930e5fe3bb5ff6ab6a5.tar.bz2 | |
Fixes the remaining unit tests failures for OpenSSL:
- implements basic client certificate support in ssl socket
- adds special-case IP address support to allow SSL connections to the test server (iff there is a trusted certificate in the store with 127.0.0.1 in its name)
- enables the test server for loading the temporary cert
- implements the DES encryptor (removed TODO about refactoring the file layout as it's already covered by a TODO in the .h file)
- disabled KeygenHandler tests, as this is not implemented for openssl
- disables the (firefox) importer unittests.
BUG=None
TEST=net_unittests now run green
Review URL: http://codereview.chromium.org/5195001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67990 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/test_server.cc | 2 | ||||
| -rw-r--r-- | net/test/test_server.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/test/test_server.cc b/net/test/test_server.cc index 0eaf8b5..d2d3fde 100644 --- a/net/test/test_server.cc +++ b/net/test/test_server.cc @@ -314,7 +314,7 @@ FilePath TestServer::GetRootCertificatePath() { } bool TestServer::LoadTestRootCert() { -#if defined(USE_NSS) +#if defined(USE_OPENSSL) || defined(USE_NSS) if (cert_) return true; diff --git a/net/test/test_server.h b/net/test/test_server.h index 00a8fc9..1ae0a50 100644 --- a/net/test/test_server.h +++ b/net/test/test_server.h @@ -22,7 +22,7 @@ #include "base/scoped_handle_win.h" #endif -#if defined(USE_NSS) +#if defined(USE_OPENSSL) || defined(USE_NSS) #include "base/ref_counted.h" #include "net/base/x509_certificate.h" #endif @@ -200,7 +200,7 @@ class TestServer { // If |type_| is TYPE_HTTPS, the TLS settings to use for the test server. HTTPSOptions https_options_; -#if defined(USE_NSS) +#if defined(USE_OPENSSL) || defined(USE_NSS) scoped_refptr<X509Certificate> cert_; #endif |