Handle all non-overridable SSL errors in the same place

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/utf_string_conversions.h"
 #include "content/public/browser/cert_store.h"
 #include "grit/chromium_strings.h"
@@ skipping 180 matching lines @@
       details = l10n_util::GetStringFUTF16(
           IDS_CERT_ERROR_WEAK_KEY_DETAILS, UTF8ToUTF16(request_url.host()));
       short_description = l10n_util::GetStringUTF16(
           IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION);
       extra_info.push_back(
           l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXTRA_INFO_1));
       extra_info.push_back(
           l10n_util::GetStringUTF16(
               IDS_CERT_ERROR_WEAK_KEY_EXTRA_INFO_2));
       break;
+    case CERT_WEAK_KEY_DH:
+      title = l10n_util::GetStringUTF16(
+          IDS_ERRORPAGES_HEADING_WEAK_SERVER_EPHEMERAL_DH_KEY);
+      details = l10n_util::GetStringFUTF16(
+          IDS_CERT_ERROR_WEAK_KEY_DETAILS, UTF8ToUTF16(request_url.host()));
+      short_description = l10n_util::GetStringUTF16(
+          IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION);
+      extra_info.push_back(
+          l10n_util::GetStringUTF16(
+              IDS_ERRORPAGES_SUMMARY_WEAK_SERVER_EPHEMERAL_DH_KEY));
+    case CERT_PINNED_KEY_MISSING:
+      title = l10n_util::GetStringUTF16(
+          IDS_ERRORPAGES_HEADING_PINNING_FAILURE);
+      details = l10n_util::GetStringUTF16(
+          IDS_ERRORPAGES_SUMMARY_PINNING_FAILURE);
+      short_description = l10n_util::GetStringUTF16(
+          IDS_ERRORPAGES_DETAILS_PINNING_FAILURE);
     case UNKNOWN:
       title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_TITLE);
       details = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS);
       short_description =
           l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DESCRIPTION);
       break;
     default:
       NOTREACHED();
   }
   return SSLErrorInfo(title, details, short_description, extra_info);
@@ skipping 18 matching lines @@
     case net::ERR_CERT_UNABLE_TO_CHECK_REVOCATION:
       return CERT_UNABLE_TO_CHECK_REVOCATION;
     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_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,
@@ skipping 33 matching lines @@
             cert_id, &cert);
         DCHECK(r);
       }
       if (errors)
         errors->push_back(
             SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url));
     }
   }
   return count;
 }