Certificate Transparency: Change CTVerifyResult to have a single list

net/test/ct_test_util.cc

Index: net/test/ct_test_util.cc
diff --git a/net/test/ct_test_util.cc b/net/test/ct_test_util.cc
index 3d79967f14f24e9c1220928ece2f522e18face23..590fbf7504d8910695b8e77c53c6cc2b87109649 100644
--- a/net/test/ct_test_util.cc
+++ b/net/test/ct_test_util.cc
@@ -399,15 +399,22 @@ 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);
+  if (result.scts.size() == 0)

[eroman, 2016/08/11 22:55:50]

[optional] Can delete this line.

[Eran Messeri, 2016/08/13 21:53:26]

Done.

+    return false;
+
+  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