Revert 52799 - Add support for parsing certificate formats other than raw, DE...

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 416 matching lines @@
       &principal->common_name, &principal->locality_name,
       &principal->state_or_province_name, &principal->country_name };
   for (int i = 0; i < arraysize(single_value_lists); ++i) {
     int length = static_cast<int>(single_value_lists[i]->size());
     DCHECK(single_value_lists[i]->size() <= 1);
     if (single_value_lists[i]->size() > 0)
       *(single_values[i]) = (*(single_value_lists[i]))[0];
   }
 }
 
-void AddCertsFromStore(HCERTSTORE store,
-                       X509Certificate::OSCertHandles* results) {
-  PCCERT_CONTEXT cert = NULL;
-
-  while ((cert = CertEnumCertificatesInStore(store, cert)) != NULL) {
-    PCCERT_CONTEXT to_add = NULL;
-    if (CertAddCertificateContextToStore(
-        NULL,  // The cert won't be persisted in any cert store. This breaks
-               // any association the context currently has to |store|, which
-               // allows us, the caller, to safely close |store| without
-               // releasing the cert handles.
-        cert,
-        CERT_STORE_ADD_USE_EXISTING,
-        &to_add) && to_add != NULL) {
-      // When processing stores generated from PKCS#7/PKCS#12 files, it
-      // appears that the order returned is the inverse of the order that it
-      // appeared in the file.
-      // TODO(rsleevi): Ensure this order is consistent across all Win
-      // versions
-      results->insert(results->begin(), to_add);
-    }
-  }
-}
-
-X509Certificate::OSCertHandles ParsePKCS7(const char* data, size_t length) {
-  X509Certificate::OSCertHandles results;
-  CERT_BLOB data_blob;
-  data_blob.cbData = length;
-  data_blob.pbData = reinterpret_cast<BYTE*>(const_cast<char*>(data));
-
-  HCERTSTORE out_store = NULL;
-
-  DWORD expected_types = CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED |
-                         CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED_EMBED |
-                         CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED;
-
-  if (!CryptQueryObject(CERT_QUERY_OBJECT_BLOB, &data_blob, expected_types,
-                        CERT_QUERY_FORMAT_FLAG_BINARY, 0, NULL, NULL, NULL,
-                        &out_store, NULL, NULL) || out_store == NULL) {
-    return results;
-  }
-
-  AddCertsFromStore(out_store, &results);
-  CertCloseStore(out_store, CERT_CLOSE_STORE_CHECK_FLAG);
-
-  return results;
-}
-
 }  // namespace
 
 void X509Certificate::Initialize() {
   std::wstring subject_info;
   std::wstring issuer_info;
   DWORD name_size;
   DCHECK(cert_handle_);
   name_size = CertNameToStr(cert_handle_->dwCertEncodingType,
                             &cert_handle_->pCertInfo->Subject,
                             CERT_X500_NAME_STR | CERT_NAME_STR_CRLF_FLAG,
@@ skipping 299 matching lines @@
       NULL,  // the cert won't be persisted in any cert store
       X509_ASN_ENCODING,
       reinterpret_cast<const BYTE*>(data), length,
       CERT_STORE_ADD_USE_EXISTING,
       &cert_handle))
     return NULL;
 
   return cert_handle;
 }
 
-X509Certificate::OSCertHandles X509Certificate::CreateOSCertHandlesFromBytes(
-    const char* data, int length, Format format) {
-  OSCertHandles results;
-  switch (format) {
-    case FORMAT_DER: {
-      OSCertHandle handle = CreateOSCertHandleFromBytes(data, length);
-      if (handle != NULL)
-        results.push_back(handle);
-      break;
-    }
-    case FORMAT_PKCS7:
-      results = ParsePKCS7(data, length);
-      break;
-    default:
-      NOTREACHED() << "Certificate format " << format << " unimplemented";
-      break;
-  }
-
-  return results;
-}
-
 
 // static
 X509Certificate::OSCertHandle X509Certificate::DupOSCertHandle(
     OSCertHandle cert_handle) {
   return CertDuplicateCertificateContext(cert_handle);
 }
 
 // static
 void X509Certificate::FreeOSCertHandle(OSCertHandle cert_handle) {
   CertFreeCertificateContext(cert_handle);
@@ skipping 10 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