Certificate Transparency: Change CTVerifyResult to have a single list

net/test/ct_test_util.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/test/ct_test_util.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <vector>
 
@@ skipping 381 matching lines @@
   // log used in the tests.
   sct[15] = 't';
 
   std::string sct_list;
   ct::EncodeSCTListForTesting(sct, &sct_list);
   return sct_list;
 }
 
 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
 
 }  // namespace net