Handle all non-overridable SSL errors in the same place

net/cert/cert_status_flags.cc

 // Copyright (c) 2011 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/cert_status_flags.h"
 
 #include "base/logging.h"
 #include "net/base/net_errors.h"
 
 namespace net {
@@ skipping 25 matching lines @@
     // We should not use ERR_CERT_CONTAINS_ERRORS in new code.
     case ERR_CERT_CONTAINS_ERRORS:
       NOTREACHED();
       // Falls through.
     case ERR_CERT_INVALID:
       return CERT_STATUS_INVALID;
     case ERR_CERT_WEAK_SIGNATURE_ALGORITHM:
       return CERT_STATUS_WEAK_SIGNATURE_ALGORITHM;
     case ERR_CERT_WEAK_KEY:
       return CERT_STATUS_WEAK_KEY;
+    case ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN:
+      return CERT_STATUS_PINNED_KEY_MISSING;
+    case ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY:
+      return CERT_STATUS_WEAK_DH_KEY;
     default:
       return 0;
   }
 }
 
 int MapCertStatusToNetError(CertStatus cert_status) {
   // A certificate may have multiple errors.  We report the most
   // serious error.
 
   // Unrecoverable errors
   if (cert_status & CERT_STATUS_REVOKED)
     return ERR_CERT_REVOKED;
   if (cert_status & CERT_STATUS_INVALID)
     return ERR_CERT_INVALID;
+  if (cert_status & CERT_STATUS_PINNED_KEY_MISSING)
+    return ERR_SSL_PINNED_KEY_NOT_IN_CERT_CHAIN;
+  if (cert_status & CERT_STATUS_WEAK_DH_KEY)
+    return ERR_SSL_WEAK_SERVER_EPHEMERAL_DH_KEY;
 
   // Recoverable errors
   if (cert_status & CERT_STATUS_AUTHORITY_INVALID)
     return ERR_CERT_AUTHORITY_INVALID;
   if (cert_status & CERT_STATUS_COMMON_NAME_INVALID)
     return ERR_CERT_COMMON_NAME_INVALID;
   if (cert_status & CERT_STATUS_WEAK_SIGNATURE_ALGORITHM)
     return ERR_CERT_WEAK_SIGNATURE_ALGORITHM;
   if (cert_status & CERT_STATUS_WEAK_KEY)
     return ERR_CERT_WEAK_KEY;
   if (cert_status & CERT_STATUS_DATE_INVALID)
     return ERR_CERT_DATE_INVALID;
 
   // Unknown status.  Give it the benefit of the doubt.
   if (cert_status & CERT_STATUS_UNABLE_TO_CHECK_REVOCATION)
     return ERR_CERT_UNABLE_TO_CHECK_REVOCATION;
   if (cert_status & CERT_STATUS_NO_REVOCATION_MECHANISM)
     return ERR_CERT_NO_REVOCATION_MECHANISM;
 
   NOTREACHED();
   return ERR_UNEXPECTED;
 }
 
 }  // namespace net