diff options
Diffstat (limited to 'chromium/net/test/ct_test_util.cc')
| -rw-r--r-- | chromium/net/test/ct_test_util.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromium/net/test/ct_test_util.cc b/chromium/net/test/ct_test_util.cc index c22dd3a4ddb..c8b25f88ddf 100644 --- a/chromium/net/test/ct_test_util.cc +++ b/chromium/net/test/ct_test_util.cc @@ -179,7 +179,6 @@ void GetX509CertLogEntry(LogEntry* entry) { } void GetX509CertTreeLeaf(MerkleTreeLeaf* tree_leaf) { - tree_leaf->log_id = HexToBytes(kTestKeyId); tree_leaf->timestamp = base::Time::FromJsTime(kTestTimestamp); GetX509CertLogEntry(&tree_leaf->log_entry); tree_leaf->extensions = HexToBytes(kDefaultExtensions); @@ -195,7 +194,6 @@ void GetPrecertLogEntry(LogEntry* entry) { } void GetPrecertTreeLeaf(MerkleTreeLeaf* tree_leaf) { - tree_leaf->log_id = HexToBytes(kTestKeyId); tree_leaf->timestamp = base::Time::FromJsTime(kTestTimestamp); GetPrecertLogEntry(&tree_leaf->log_entry); tree_leaf->extensions = HexToBytes(kDefaultExtensions); @@ -401,15 +399,19 @@ std::string GetSCTListWithInvalidSCT() { bool CheckForSingleVerifiedSCTInResult(const ct::CTVerifyResult& result, const std::string& log_description) { - return (result.verified_scts.size() == 1U) && result.invalid_scts.empty() && - result.unknown_logs_scts.empty() && - result.verified_scts[0]->log_description == log_description; + return (result.scts.size() == 1 && + result.scts[0].status == ct::SCT_STATUS_OK && + result.scts[0].sct->log_description == log_description); } bool CheckForSCTOrigin(const ct::CTVerifyResult& result, ct::SignedCertificateTimestamp::Origin origin) { - return (result.verified_scts.size() > 0) && - (result.verified_scts[0]->origin == origin); + for (const auto& sct_and_status : result.scts) + if (sct_and_status.status == SCT_STATUS_OK && + sct_and_status.sct->origin == origin) + return true; + + return false; } } // namespace ct |