net: don't crash when processing a certificate with an unknown public key.

net/base/x509_certificate_win.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 "net/base/x509_certificate.h"
 
 #include <blapi.h>  // Implement CalculateChainFingerprint() with NSS.
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 410 matching lines @@
                                                 Pickle* pickle) {
   return pickle->WriteData(
       reinterpret_cast<char*>(cert_handle->pbCertEncoded),
       cert_handle->cbCertEncoded);
 }
 
 // static
 void X509Certificate::GetPublicKeyInfo(OSCertHandle cert_handle,
                                        size_t* size_bits,
                                        PublicKeyType* type) {
+  *type = kPublicKeyTypeUnknown;
+  *size_bits = 0;
+
   PCCRYPT_OID_INFO oid_info = CryptFindOIDInfo(
       CRYPT_OID_INFO_OID_KEY,
       cert_handle->pCertInfo->SubjectPublicKeyInfo.Algorithm.pszObjId,
       CRYPT_PUBKEY_ALG_OID_GROUP_ID);
-  PCHECK(oid_info);
+  if (!oid_info)
+    return;
+
   CHECK(oid_info->dwGroupId == CRYPT_PUBKEY_ALG_OID_GROUP_ID);

[Ryan Sleevi, 2012/08/23 20:48:59]

nit: While you're here, CHECK_EQ ?

[agl, 2012/08/24 13:46:17]

Done.

 
   *size_bits = CertGetPublicKeyLength(
       X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
       &cert_handle->pCertInfo->SubjectPublicKeyInfo);
 
   switch (oid_info->Algid) {
     case CALG_RSA_SIGN:
     case CALG_RSA_KEYX:
       *type = kPublicKeyTypeRSA;
       break;
     case CALG_DSS_SIGN:
       *type = kPublicKeyTypeDSA;
       break;
     case CALG_ECDSA:
       *type = kPublicKeyTypeECDSA;
       break;
     case CALG_ECDH:
       *type = kPublicKeyTypeECDH;
       break;
-    default:
-      *type = kPublicKeyTypeUnknown;
-      *size_bits = 0;
-      break;
   }
 }
 
 }  // namespace net