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

net/base/x509_certificate_win.cc

Index: net/base/x509_certificate_win.cc
===================================================================
--- net/base/x509_certificate_win.cc	(revision 153489)
+++ net/base/x509_certificate_win.cc	(working copy)
@@ -428,13 +428,19 @@
 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);
-  CHECK(oid_info->dwGroupId == CRYPT_PUBKEY_ALG_OID_GROUP_ID);
+  if (!oid_info)
+    return;
 
+  CHECK_EQ(oid_info->dwGroupId,
+           static_cast<DWORD>(CRYPT_PUBKEY_ALG_OID_GROUP_ID));
+
   *size_bits = CertGetPublicKeyLength(
       X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
       &cert_handle->pCertInfo->SubjectPublicKeyInfo);
@@ -453,10 +459,6 @@
     case CALG_ECDH:
       *type = kPublicKeyTypeECDH;
       break;
-    default:
-      *type = kPublicKeyTypeUnknown;
-      *size_bits = 0;
-      break;
   }
 }