Add a CERT_RDN_ENCODED_BLOB case to CertSubjectCommonNameHasNull...

net/base/x509_certificate_win.cc

 // Copyright (c) 2006-2008 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 "base/logging.h"
 #include "base/pickle.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
@@ skipping 186 matching lines @@
     //       utf8String        UTF8String      (SIZE (1..ub-common-name)),
     //       bmpString         BMPString       (SIZE (1..ub-common-name)) }
     //
     // We also check IA5String and VisibleString.
     for (DWORD i = 0; i < name_info->cRDN; ++i) {
       PCERT_RDN rdn = &name_info->rgRDN[i];
       for (DWORD j = 0; j < rdn->cRDNAttr; ++j) {
         PCERT_RDN_ATTR rdn_attr = &rdn->rgRDNAttr[j];
         if (strcmp(rdn_attr->pszObjId, szOID_COMMON_NAME) == 0) {
           switch (rdn_attr->dwValueType) {
+            // After the CryptoAPI ASN.1 security vulnerabilities described in
+            // http://www.microsoft.com/technet/security/Bulletin/MS09-056.mspx
+            // were patched, we get CERT_RDN_ENCODED_BLOB for a common name
+            // that contains a NULL character.
+            case CERT_RDN_ENCODED_BLOB:
+              break;
             // Array of 8-bit characters.
             case CERT_RDN_PRINTABLE_STRING:
             case CERT_RDN_TELETEX_STRING:
             case CERT_RDN_IA5_STRING:
             case CERT_RDN_VISIBLE_STRING:
               for (DWORD k = 0; k < rdn_attr->Value.cbData; ++k) {
                 if (rdn_attr->Value.pbData[k] == '\0')
                   return true;
               }
               break;
@@ skipping 522 matching lines @@
   DWORD sha1_size = sizeof(sha1.data);
   rv = CryptHashCertificate(NULL, CALG_SHA1, 0, cert->pbCertEncoded,
                             cert->cbCertEncoded, sha1.data, &sha1_size);
   DCHECK(rv && sha1_size == sizeof(sha1.data));
   if (!rv)
     memset(sha1.data, 0, sizeof(sha1.data));
   return sha1;
 }
 
 }  // namespace net