DO NOT REVIEW: Certificate Transparency: Extend SCT verify result enum.

net/cert/ct_signed_certificate_timestamp_log_param.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/cert/ct_signed_certificate_timestamp_log_param.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 52 matching lines @@
 // list is a dictionary created by SCTToDictionary.
 std::unique_ptr<base::ListValue> SCTListToPrintableValues(
     const ct::SCTList& sct_list) {
   std::unique_ptr<base::ListValue> output_scts(new base::ListValue());
   for (const auto& sct : sct_list)
     output_scts->Append(SCTToDictionary(*(sct.get())));
 
   return output_scts;
 }
 
+// Given a list of SCTs and their status, return a ListValue instance where
+// each item in the list is a dictionary created by SCTToDictionary, only
+// if its status matches |match_status|
+std::unique_ptr<base::ListValue> SCTListAndStatusToPrintableValues(
+    const ct::SCTAndStatusList& sct_status_list,
+    ct::SCTVerifyStatus match_status) {
+  std::unique_ptr<base::ListValue> output_scts(new base::ListValue());
+  for (const auto& sct_and_status : sct_status_list)
+    if (sct_and_status.second == match_status)
+      output_scts->Append(SCTToDictionary(*(sct_and_status.first.get())));
+
+  return output_scts;
+}
+
 }  // namespace
 
 std::unique_ptr<base::Value> NetLogSignedCertificateTimestampCallback(
     const ct::CTVerifyResult* ct_result,
     NetLogCaptureMode capture_mode) {
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   dict->Set("verified_scts",
             SCTListToPrintableValues(ct_result->verified_scts));
 
-  dict->Set("invalid_scts",
-            SCTListToPrintableValues(ct_result->invalid_scts));
+  dict->Set("invalid_signature_scts",
+            SCTListAndStatusToPrintableValues(
+                ct_result->invalid_scts, ct::SCT_STATUS_INVALID_SIGNATURE));
+
+  dict->Set("bad_timestamp_scts",
+            SCTListAndStatusToPrintableValues(
+                ct_result->invalid_scts, ct::SCT_STATUS_INVALID_TIMESTAMP));
 
   dict->Set("unknown_logs_scts",
             SCTListToPrintableValues(ct_result->unknown_logs_scts));
 
   return std::move(dict);
 }
 
 std::unique_ptr<base::Value> NetLogRawSignedCertificateTimestampCallback(
     const std::string* embedded_scts,
     const std::string* sct_list_from_ocsp,
     const std::string* sct_list_from_tls_extension,
     NetLogCaptureMode capture_mode) {
   std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
 
   SetBinaryData("embedded_scts", *embedded_scts, dict.get());
   SetBinaryData("scts_from_ocsp_response", *sct_list_from_ocsp, dict.get());
   SetBinaryData("scts_from_tls_extension", *sct_list_from_tls_extension,
                 dict.get());
 
   return std::move(dict);
 }
 
 }  // namespace net