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
diff --git a/net/base/x509_certificate_win.cc b/net/base/x509_certificate_win.cc
index 50796223da2267ddd9ad05a297419815af8af7d7..325b0bcf8664c5bd301ae8790b4cbcd79f1db296 100644
--- a/net/base/x509_certificate_win.cc
+++ b/net/base/x509_certificate_win.cc
@@ -428,11 +428,16 @@ bool X509Certificate::WriteOSCertHandleToPickle(OSCertHandle cert_handle,
 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(
@@ -453,10 +458,6 @@ void X509Certificate::GetPublicKeyInfo(OSCertHandle cert_handle,
     case CALG_ECDH:
       *type = kPublicKeyTypeECDH;
       break;
-    default:
-      *type = kPublicKeyTypeUnknown;
-      *size_bits = 0;
-      break;
   }
 }