diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 10:57:07 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-18 10:57:07 +0000 |
| commit | 83e1ae34e3774ba031cec21aaa14aa081734e5d1 (patch) | |
| tree | 78ccc411ac13983f467c1825a7c3cd92dd717dbb /net/net.gyp | |
| parent | fdc67c496828c005b108be85730a4b830bd3b69b (diff) | |
| download | chromium_src-83e1ae34e3774ba031cec21aaa14aa081734e5d1.zip chromium_src-83e1ae34e3774ba031cec21aaa14aa081734e5d1.tar.gz chromium_src-83e1ae34e3774ba031cec21aaa14aa081734e5d1.tar.bz2 | |
Remove NSSCertDatabase from ClientCertStoreChromeOS unittest.
The database was only used to import a PKCS#12 file. By changing to separate key (PKCS#8 format) and cert (X509 in PEM encoding), only dependencies on the lower level RSAPrivateKey, X509Certificate and PK11_* NSS functions are required.
Note this removes at the same time a call to the deprecated NSSCertDatabase::GetInstance().
Also
- fixes multi profile cases of the unit test and the CA matching (the latter is now identical to all other platforms).
- fixes a bug in the matching of client certs from software slots, because of reused cert database names
- gets rid of the error output that occurred during the PKCS12 import because the file contained also a CA cert:
[ERROR:nsPKCS12Blob.cpp(219)] Could not grab a handle to the certificate in the slot from the corresponding PKCS#12 DER certificate.
BUG=210525, 329735,315285
Review URL: https://codereview.chromium.org/394013005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284056 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index fb5b853..bda1845 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -938,6 +938,7 @@ 'socket/socket_test_util.h', 'test/cert_test_util.cc', 'test/cert_test_util.h', + 'test/cert_test_util_nss.cc', 'test/ct_test_util.cc', 'test/ct_test_util.h', 'test/embedded_test_server/embedded_test_server.cc', @@ -1021,6 +1022,11 @@ 'dns/mock_mdns_socket_factory.h' ] }], + [ 'use_nss != 1', { + 'sources!': [ + 'test/cert_test_util_nss.cc', + ], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [4267, ], |