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

net/cert/multi_log_ct_verifier.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/multi_log_ct_verifier.h"
 
 #include <vector>
+#include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/values.h"
 #include "net/base/net_errors.h"
 #include "net/cert/ct_log_verifier.h"
 #include "net/cert/ct_objects_extractor.h"
 #include "net/cert/ct_serialization.h"
 #include "net/cert/ct_signed_certificate_timestamp_log_param.h"
@@ skipping 172 matching lines @@
   // Assume this SCT is untrusted until proven otherwise.
   const auto& it = logs_.find(sct->log_id);
   if (it == logs_.end()) {
     DVLOG(1) << "SCT does not match any known log.";
     result->unknown_logs_scts.push_back(sct);
     LogSCTStatusToUMA(ct::SCT_STATUS_LOG_UNKNOWN);
     return false;
   }
 
   sct->log_description = it->second->description();
+  ct::SCTVerifyStatus sct_status = ct::SCT_STATUS_NONE;
 
   if (!it->second->Verify(expected_entry, *sct.get())) {
     DVLOG(1) << "Unable to verify SCT signature.";
-    result->invalid_scts.push_back(sct);
-    LogSCTStatusToUMA(ct::SCT_STATUS_INVALID);
-    return false;
+    sct_status = ct::SCT_STATUS_INVALID_SIGNATURE;
   }
 
   // SCT verified ok, just make sure the timestamp is legitimate.
   if (sct->timestamp > base::Time::Now()) {
     DVLOG(1) << "SCT is from the future!";
-    result->invalid_scts.push_back(sct);
-    LogSCTStatusToUMA(ct::SCT_STATUS_INVALID);
+    sct_status = ct::SCT_STATUS_INVALID_TIMESTAMP;
+  }
+
+  if (sct_status == ct::SCT_STATUS_INVALID_TIMESTAMP ||
+      sct_status == ct::SCT_STATUS_INVALID_SIGNATURE) {
+    result->invalid_scts.push_back(std::make_pair(sct, sct_status));
+    LogSCTStatusToUMA(sct_status);
     return false;
   }
 
   LogSCTStatusToUMA(ct::SCT_STATUS_OK);
   result->verified_scts.push_back(sct);
   if (observer_)
     observer_->OnSCTVerified(cert, sct.get());
   return true;
 }
 
 } // namespace net