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 f1d60f069a9a02ee4c37c89946a136dc2aa0e2c3..6abc1c117f9b65f20e96b4a8a6617b3e03fcd3cc 100644 |
--- a/net/quic/test_tools/crypto_test_utils_chromium.cc |
+++ b/net/quic/test_tools/crypto_test_utils_chromium.cc |
@@ -6,8 +6,10 @@ |
#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
+#include "net/base/net_errors.h" |
#include "net/base/test_data_directory.h" |
#include "net/cert/cert_verifier.h" |
+#include "net/cert/mock_cert_verifier.h" |
#include "net/cert/test_root_certs.h" |
#include "net/cert/x509_certificate.h" |
#include "net/http/transport_security_state.h" |
@@ -23,6 +25,7 @@ namespace { |
class TestProofVerifierChromium : public ProofVerifierChromium { |
public: |
+ // TODO(rch): |transport_security_state| should be a scoped_ptr. |
TestProofVerifierChromium(CertVerifier* cert_verifier, |
TransportSecurityState* transport_security_state, |
const std::string& cert_file) |
@@ -108,15 +111,29 @@ class FakeProofVerifier : public ProofVerifier { |
// static |
ProofSource* CryptoTestUtils::ProofSourceForTesting() { |
- return new ProofSourceChromium(); |
+ ProofSourceChromium* source = new ProofSourceChromium(); |
+ base::FilePath certs_dir = GetTestCertsDirectory(); |
+ CHECK(source->Initialize( |
+ certs_dir.AppendASCII("quic_chain.crt"), |
+ certs_dir.AppendASCII("quic_test.example.com.key.pkcs8"))); |
+ return source; |
} |
// static |
ProofVerifier* CryptoTestUtils::ProofVerifierForTesting() { |
- TestProofVerifierChromium* proof_verifier = new TestProofVerifierChromium( |
- CertVerifier::CreateDefault(), new TransportSecurityState, |
- "quic_root.crt"); |
- return proof_verifier; |
+ // TODO(rch): use a real cert verifier? |
+ MockCertVerifier* cert_verifier = new MockCertVerifier(); |
+ net::CertVerifyResult verify_result; |
+ verify_result.verified_cert = |
+ ImportCertFromFile(GetTestCertsDirectory(), "quic_test.example.com.crt"); |
+ cert_verifier->AddResultForCertAndHost(verify_result.verified_cert.get(), |
+ "test.example.com", verify_result, OK); |
+ verify_result.verified_cert = ImportCertFromFile( |
+ GetTestCertsDirectory(), "quic_test_ecc.example.com.crt"); |
+ cert_verifier->AddResultForCertAndHost(verify_result.verified_cert.get(), |
+ "test.example.com", verify_result, OK); |
+ return new TestProofVerifierChromium( |
+ cert_verifier, new TransportSecurityState, "quic_root.crt"); |
} |
// static |