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

Unified Diff: net/quic/test_tools/crypto_test_utils_chromium.cc

Issue 1454993002: QUIC - Code to verify SCT tag with certificate transparency verifier (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase with TOT - use scoped_refptr<const CTLogVerifier> Created 5 years, 1 month 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/quic/quic_stream_factory_test.cc ('k') | net/tools/quic/quic_client_bin.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/test_tools/crypto_test_utils_chromium.cc
diff --git a/net/quic/test_tools/crypto_test_utils_chromium.cc b/net/quic/test_tools/crypto_test_utils_chromium.cc
index f61714422b3647214daacc57e3f02092c993a01e..6cceeb473db4f314931d515b2a60a0d7dd1253fa 100644
--- a/net/quic/test_tools/crypto_test_utils_chromium.cc
+++ b/net/quic/test_tools/crypto_test_utils_chromium.cc
@@ -16,7 +16,9 @@
#include "net/cert/cert_status_flags.h"
#include "net/cert/cert_verifier.h"
#include "net/cert/cert_verify_result.h"
+#include "net/cert/ct_verifier.h"
#include "net/cert/mock_cert_verifier.h"
+#include "net/cert/multi_log_ct_verifier.h"
#include "net/cert/test_root_certs.h"
#include "net/cert/x509_certificate.h"
#include "net/cert/x509_util.h"
@@ -44,12 +46,15 @@ class TestProofVerifierChromium : public ProofVerifierChromium {
TestProofVerifierChromium(
scoped_ptr<CertVerifier> cert_verifier,
scoped_ptr<TransportSecurityState> transport_security_state,
+ scoped_ptr<CTVerifier> cert_transparency_verifier,
const std::string& cert_file)
: ProofVerifierChromium(cert_verifier.get(),
nullptr,
- transport_security_state.get()),
+ transport_security_state.get(),
+ cert_transparency_verifier.get()),
cert_verifier_(cert_verifier.Pass()),
- transport_security_state_(transport_security_state.Pass()) {
+ transport_security_state_(transport_security_state.Pass()),
+ cert_transparency_verifier_(cert_transparency_verifier.Pass()) {
// Load and install the root for the validated chain.
scoped_refptr<X509Certificate> root_cert =
ImportCertFromFile(GetTestCertsDirectory(), cert_file);
@@ -64,6 +69,7 @@ class TestProofVerifierChromium : public ProofVerifierChromium {
ScopedTestRoot scoped_root_;
scoped_ptr<CertVerifier> cert_verifier_;
scoped_ptr<TransportSecurityState> transport_security_state_;
+ scoped_ptr<CTVerifier> cert_transparency_verifier_;
};
const char kSignature[] = "signature";
@@ -127,9 +133,11 @@ class FakeProofVerifier : public TestProofVerifierChromium {
public:
FakeProofVerifier(scoped_ptr<CertVerifier> cert_verifier,
scoped_ptr<TransportSecurityState> transport_security_state,
+ scoped_ptr<CTVerifier> cert_transparency_verifier,
const std::string& cert_file)
: TestProofVerifierChromium(cert_verifier.Pass(),
transport_security_state.Pass(),
+ cert_transparency_verifier.Pass(),
cert_file) {}
~FakeProofVerifier() override {}
@@ -230,16 +238,16 @@ ProofVerifier* ProofVerifierForTestingInternal(bool use_real_proof_verifier) {
if (use_real_proof_verifier) {
return new TestProofVerifierChromium(
cert_verifier.Pass(), make_scoped_ptr(new TransportSecurityState),
- "quic_root.crt");
+ make_scoped_ptr(new MultiLogCTVerifier), "quic_root.crt");
}
#if defined(USE_OPENSSL)
return new TestProofVerifierChromium(
cert_verifier.Pass(), make_scoped_ptr(new TransportSecurityState),
- "quic_root.crt");
+ make_scoped_ptr(new MultiLogCTVerifier), "quic_root.crt");
#else
- return new FakeProofVerifier(cert_verifier.Pass(),
- make_scoped_ptr(new TransportSecurityState),
- "quic_root.crt");
+ return new FakeProofVerifier(
+ cert_verifier.Pass(), make_scoped_ptr(new TransportSecurityState),
+ make_scoped_ptr(new MultiLogCTVerifier), "quic_root.crt");
#endif
}
« no previous file with comments | « net/quic/quic_stream_factory_test.cc ('k') | net/tools/quic/quic_client_bin.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698