| Index: net/cert/internal/path_builder_verify_certificate_chain_unittest.cc
|
| diff --git a/net/cert/internal/path_builder_verify_certificate_chain_unittest.cc b/net/cert/internal/path_builder_verify_certificate_chain_unittest.cc
|
| index e08ea30895beff8e049380a3b49727176ff180d5..32517594c8d74b812cd2f70640dc765cc26804e1 100644
|
| --- a/net/cert/internal/path_builder_verify_certificate_chain_unittest.cc
|
| +++ b/net/cert/internal/path_builder_verify_certificate_chain_unittest.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "net/cert/internal/cert_issuer_source_static.h"
|
| #include "net/cert/internal/signature_policy.h"
|
| -#include "net/cert/internal/trust_store.h"
|
| +#include "net/cert/internal/trust_store_static.h"
|
| #include "net/cert/internal/verify_certificate_chain_typed_unittest.h"
|
|
|
| namespace net {
|
| @@ -22,19 +22,23 @@ class PathBuilderDelegate {
|
| SimpleSignaturePolicy signature_policy(1024);
|
| ASSERT_FALSE(chain.empty());
|
|
|
| - TrustStore trust_store;
|
| - for (const auto& root : roots)
|
| + TrustStoreStatic trust_store;
|
| + CertIssuerSourceStatic cert_issuer_source;
|
| +
|
| + for (const auto& root : roots) {
|
| trust_store.AddTrustedCertificate(root);
|
| + cert_issuer_source.AddCert(root);
|
| + }
|
|
|
| - CertIssuerSourceStatic intermediate_cert_issuer_source;
|
| - for (size_t i = 1; i < chain.size(); ++i)
|
| - intermediate_cert_issuer_source.AddCert(chain[i]);
|
| + for (const auto& cert : chain)
|
| + cert_issuer_source.AddCert(cert);
|
|
|
| CertPathBuilder::Result result;
|
| // First cert in the |chain| is the target.
|
| - CertPathBuilder path_builder(chain.front(), &trust_store, &signature_policy,
|
| - time, &result);
|
| - path_builder.AddCertIssuerSource(&intermediate_cert_issuer_source);
|
| + CertPathBuilder path_builder(chain.front(), &signature_policy, time,
|
| + &result);
|
| + path_builder.AddTrustStore(&trust_store);
|
| + path_builder.AddCertIssuerSource(&cert_issuer_source);
|
|
|
| CompletionStatus rv = path_builder.Run(base::Closure());
|
| EXPECT_EQ(CompletionStatus::SYNC, rv);
|
|
|