Certificate Transparency: Remove the obsolete invalid sct status.

content/common/ssl_status_serialization.cc

 // Copyright (c) 2012 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 "content/common/ssl_status_serialization.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/pickle.h"
 
 namespace {
 
 // Checks that an integer |security_style| is a valid SecurityStyle enum
 // value. Returns true if valid, false otherwise.
 bool CheckSecurityStyle(int security_style) {
   switch (security_style) {
     case content::SECURITY_STYLE_UNKNOWN:
     case content::SECURITY_STYLE_UNAUTHENTICATED:
     case content::SECURITY_STYLE_AUTHENTICATION_BROKEN:
     case content::SECURITY_STYLE_WARNING:
     case content::SECURITY_STYLE_AUTHENTICATED:
       return true;
   }
   return false;
 }
 
-// Checks that an integer |sct_status| is a valid net::ct::SCTVerifyStatus enum
-// value. Returns true if valid, false otherwise.
-bool CheckSCTStatus(uint32_t sct_status) {
-  switch (sct_status) {
-    case net::ct::SCT_STATUS_LOG_UNKNOWN:
-    // INVALID is deprecated and should not be used anymore, but it
-    // might have been previously written into the disk cache.
-    case net::ct::SCT_STATUS_INVALID:
-    case net::ct::SCT_STATUS_INVALID_SIGNATURE:
-    case net::ct::SCT_STATUS_OK:
-    case net::ct::SCT_STATUS_INVALID_TIMESTAMP:
-      return true;
-    case net::ct::SCT_STATUS_NONE:
-      // SCT_STATUS_NONE should never happen, so it isn't valid to
-      // receive a status of NONE in a serialized SSLStatus.
-      return false;
-  }
-  return false;
-}
-
 }  // namespace
 
 namespace content {
 
 std::string SerializeSecurityInfo(const SSLStatus& ssl_status) {
   base::Pickle pickle;
   pickle.WriteInt(ssl_status.security_style);
   pickle.WriteInt(ssl_status.cert_id);
   pickle.WriteUInt32(ssl_status.cert_status);
   pickle.WriteInt(ssl_status.security_bits);
@@ skipping 27 matching lines @@
     return false;
   }
 
   uint32_t num_sct_statuses;
   if (!iter.ReadUInt32(&num_sct_statuses)) {
     return false;
   }
 
   for (uint32_t i = 0; i < num_sct_statuses; i++) {
     uint32_t sct_status;
-    if (!iter.ReadUInt32(&sct_status) || !CheckSCTStatus(sct_status)) {
+    if (!iter.ReadUInt32(&sct_status) ||
+        !net::ct::IsValidSCTStatus(sct_status)) {
       *ssl_status = SSLStatus();
       return false;
     }
     ssl_status->sct_statuses.push_back(
         static_cast<net::ct::SCTVerifyStatus>(sct_status));
   }
 
   if (!iter.ReadBool(&ssl_status->pkp_bypassed)) {
     *ssl_status = SSLStatus();
     return false;
@@ skipping 15 matching lines @@
   // Sanity check |key_exchange_info|: 0 or greater.
   if (ssl_status->key_exchange_info < 0) {
     *ssl_status = SSLStatus();
     return false;
   }
 
   return true;
 }
 
 }  // namespace content