Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: net/base/transport_security_state_unittest.cc

Issue 9812035: Introduce CertVerifierProc to handle system cert validation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Lint Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/test_certificate_data.h ('k') | net/base/x509_certificate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/transport_security_state_unittest.cc
===================================================================
--- net/base/transport_security_state_unittest.cc (revision 128125)
+++ net/base/transport_security_state_unittest.cc (working copy)
@@ -15,7 +15,10 @@
#include "net/base/cert_test_util.h"
#include "net/base/cert_verifier.h"
#include "net/base/cert_verify_result.h"
+#include "net/base/net_errors.h"
+#include "net/base/net_log.h"
#include "net/base/ssl_info.h"
+#include "net/base/test_completion_callback.h"
#include "net/base/test_root_certs.h"
#include "net/base/x509_certificate.h"
#include "net/http/http_util.h"
@@ -287,9 +290,15 @@
// Verify has the side-effect of populating public_key_hashes, which
// ParsePinsHeader needs. (It wants to check pins against the validated
// chain, not just the presented chain.)
+ int rv = ERR_FAILED;
CertVerifyResult result;
- int rv = ssl_info.cert->Verify("127.0.0.1", 0, NULL, &result);
- ASSERT_EQ(0, rv);
+ scoped_ptr<CertVerifier> verifier(CertVerifier::CreateDefault());
+ TestCompletionCallback callback;
+ CertVerifier::RequestHandle handle = NULL;
+ rv = verifier->Verify(ssl_info.cert, "127.0.0.1", 0, NULL, &result,
+ callback.callback(), &handle, BoundNetLog());
+ rv = callback.GetResult(rv);
+ ASSERT_EQ(OK, rv);
// Normally, ssl_client_socket_nss would do this, but for a unit test we
// fake it.
ssl_info.public_key_hashes = result.public_key_hashes;
« no previous file with comments | « net/base/test_certificate_data.h ('k') | net/base/x509_certificate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698