Cleanup HPKP error handling and weak DH key handling

components/ssl_errors/error_info.cc

 // Copyright 2015 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 "components/ssl_errors/error_info.h"
 
 #include <stddef.h>
 
 #include "base/i18n/message_formatter.h"
 #include "base/macros.h"
@@ skipping 113 matching lines @@
           UTF8ToUTF16(request_url.host()));
       short_description = l10n_util::GetStringUTF16(
           IDS_CERT_ERROR_WEAK_SIGNATURE_ALGORITHM_DESCRIPTION);
       break;
     case CERT_WEAK_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);
       break;
-    case CERT_WEAK_KEY_DH:
-      details = l10n_util::GetStringFUTF16(IDS_CERT_ERROR_WEAK_KEY_DETAILS,

[davidben, 2016/06/21 00:14:11]

Remove this string? (Huh. Given the text of this string, I rather suspect
someone was confused about what weak DH group was. The text says it's in the
certificate, but it's not.)

[Ryan Sleevi, 2016/06/21 00:23:04]

It's used right above :)

[davidben, 2016/06/21 00:27:52]

...wow, I'm blind. Also apparently I get confused by codesearch's UI. :-)

-                                           UTF8ToUTF16(request_url.host()));
-      short_description =
-          l10n_util::GetStringUTF16(IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION);

[davidben, 2016/06/21 00:14:11]

Ditto.

[Ryan Sleevi, 2016/06/21 00:23:05]

Ditto :)

-      break;
     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,
@@ skipping 46 matching lines @@
     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
 void ErrorInfo::GetErrorsForCertStatus(
@@ skipping 32 matching lines @@
 
   for (size_t i = 0; i < arraysize(kErrorFlags); ++i) {
     if ((cert_status & kErrorFlags[i]) && errors) {
       errors->push_back(
           ErrorInfo::CreateError(kErrorTypes[i], cert.get(), url));
     }
   }
 }
 
 }  // namespace ssl_errors