Revert "Reject certificates that are valid for too long."

chrome/browser/ssl/ssl_error_info.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 "chrome/browser/ssl/ssl_error_info.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/grit/chromium_strings.h"
@@ skipping 127 matching lines @@
           IDS_CERT_ERROR_WEAK_KEY_DETAILS, UTF8ToUTF16(request_url.host()));
       short_description = l10n_util::GetStringUTF16(
           IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION);
     case CERT_NAME_CONSTRAINT_VIOLATION:
       details = l10n_util::GetStringFUTF16(
           IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DETAILS,
           UTF8ToUTF16(request_url.host()));
       short_description = l10n_util::GetStringUTF16(
           IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DESCRIPTION);
       break;
-    case CERT_VALIDITY_TOO_LONG:
-      details =
-          l10n_util::GetStringFUTF16(IDS_CERT_ERROR_VALIDITY_TOO_LONG_DETAILS,
-                                     UTF8ToUTF16(request_url.host()));
-      short_description = l10n_util::GetStringUTF16(
-          IDS_CERT_ERROR_VALIDITY_TOO_LONG_DESCRIPTION);
-      break;
     case CERT_PINNED_KEY_MISSING:
       details = l10n_util::GetStringUTF16(
           IDS_ERRORPAGES_SUMMARY_PINNING_FAILURE);
       short_description = l10n_util::GetStringUTF16(
           IDS_ERRORPAGES_DETAILS_PINNING_FAILURE);
       break;
     case UNKNOWN:
       details = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS);
       short_description =
           l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DESCRIPTION);
@@ skipping 26 matching lines @@
     case net::ERR_CERT_REVOKED:
       return CERT_REVOKED;
     case net::ERR_CERT_INVALID:
       return CERT_INVALID;
     case net::ERR_CERT_WEAK_SIGNATURE_ALGORITHM:
       return CERT_WEAK_SIGNATURE_ALGORITHM;
     case net::ERR_CERT_WEAK_KEY:
       return CERT_WEAK_KEY;
     case net::ERR_CERT_NAME_CONSTRAINT_VIOLATION:
       return CERT_NAME_CONSTRAINT_VIOLATION;
-    case net::ERR_CERT_VALIDITY_TOO_LONG:
-      return CERT_VALIDITY_TOO_LONG;
     case net::ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
       return CERT_WEAK_KEY_DH;
     case net::ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN:
       return CERT_PINNED_KEY_MISSING;
     default:
       NOTREACHED();
       return UNKNOWN;
     }
 }
 
 // static
 int SSLErrorInfo::GetErrorsForCertStatus(int cert_id,
                                          net::CertStatus cert_status,
                                          const GURL& url,
                                          std::vector<SSLErrorInfo>* errors) {
   const net::CertStatus kErrorFlags[] = {
-      net::CERT_STATUS_COMMON_NAME_INVALID,
-      net::CERT_STATUS_DATE_INVALID,
-      net::CERT_STATUS_AUTHORITY_INVALID,
-      net::CERT_STATUS_NO_REVOCATION_MECHANISM,
-      net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION,
-      net::CERT_STATUS_REVOKED,
-      net::CERT_STATUS_INVALID,
-      net::CERT_STATUS_WEAK_SIGNATURE_ALGORITHM,
-      net::CERT_STATUS_WEAK_KEY,
-      net::CERT_STATUS_NAME_CONSTRAINT_VIOLATION,
-      net::CERT_STATUS_VALIDITY_TOO_LONG,
+    net::CERT_STATUS_COMMON_NAME_INVALID,
+    net::CERT_STATUS_DATE_INVALID,
+    net::CERT_STATUS_AUTHORITY_INVALID,
+    net::CERT_STATUS_NO_REVOCATION_MECHANISM,
+    net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION,
+    net::CERT_STATUS_REVOKED,
+    net::CERT_STATUS_INVALID,
+    net::CERT_STATUS_WEAK_SIGNATURE_ALGORITHM,
+    net::CERT_STATUS_WEAK_KEY,
+    net::CERT_STATUS_NAME_CONSTRAINT_VIOLATION,
   };
 
   const ErrorType kErrorTypes[] = {
-      CERT_COMMON_NAME_INVALID,
-      CERT_DATE_INVALID,
-      CERT_AUTHORITY_INVALID,
-      CERT_NO_REVOCATION_MECHANISM,
-      CERT_UNABLE_TO_CHECK_REVOCATION,
-      CERT_REVOKED,
-      CERT_INVALID,
-      CERT_WEAK_SIGNATURE_ALGORITHM,
-      CERT_WEAK_KEY,
-      CERT_NAME_CONSTRAINT_VIOLATION,
-      CERT_VALIDITY_TOO_LONG,
+    CERT_COMMON_NAME_INVALID,
+    CERT_DATE_INVALID,
+    CERT_AUTHORITY_INVALID,
+    CERT_NO_REVOCATION_MECHANISM,
+    CERT_UNABLE_TO_CHECK_REVOCATION,
+    CERT_REVOKED,
+    CERT_INVALID,
+    CERT_WEAK_SIGNATURE_ALGORITHM,
+    CERT_WEAK_KEY,
+    CERT_NAME_CONSTRAINT_VIOLATION,
   };
   DCHECK(arraysize(kErrorFlags) == arraysize(kErrorTypes));
 
   scoped_refptr<net::X509Certificate> cert = NULL;
   int count = 0;
   for (size_t i = 0; i < arraysize(kErrorFlags); ++i) {
     if (cert_status & kErrorFlags[i]) {
       count++;
       if (!cert.get()) {
         bool r = content::CertStore::GetInstance()->RetrieveCert(
             cert_id, &cert);
         DCHECK(r);
       }
-      if (errors) {
+      if (errors)
         errors->push_back(
             SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url));
-      }
     }
   }
   return count;
 }