Use PKCS7_get_raw_certificates in x509_certificate_bytes.cc.

net/cert/x509_certificate_bytes.cc

 // Copyright 2017 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/cert/x509_certificate.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "base/pickle.h"
 #include "crypto/openssl_util.h"
 #include "net/base/ip_address.h"
 #include "net/cert/asn1_util.h"
 #include "net/cert/internal/cert_errors.h"
 #include "net/cert/internal/name_constraints.h"
 #include "net/cert/internal/parse_name.h"
 #include "net/cert/internal/parsed_certificate.h"
 #include "net/cert/internal/signature_policy.h"
 #include "net/cert/internal/verify_name_match.h"
 #include "net/cert/internal/verify_signed_data.h"
 #include "net/cert/x509_util.h"
-#include "net/cert/x509_util_openssl.h"
 #include "net/der/parser.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"
+#include "third_party/boringssl/src/include/openssl/pkcs7.h"
 #include "third_party/boringssl/src/include/openssl/pool.h"
 #include "third_party/boringssl/src/include/openssl/sha.h"
 
 namespace net {
 
 namespace {
 
 // Converts a GeneralizedTime struct to a base::Time, returning true on success
 // or false if |generalized| was invalid or cannot be represented by
 // base::Time.
@@ skipping 101 matching lines @@
 // |handles|.
 void CreateOSCertHandlesFromPKCS7Bytes(
     const char* data,
     size_t length,
     X509Certificate::OSCertHandles* handles) {
   crypto::EnsureOpenSSLInit();
   crypto::OpenSSLErrStackTracer err_cleaner(FROM_HERE);
 
   CBS der_data;
   CBS_init(&der_data, reinterpret_cast<const uint8_t*>(data), length);
-  STACK_OF(X509)* certs = sk_X509_new_null();
+  STACK_OF(CRYPTO_BUFFER)* certs = sk_CRYPTO_BUFFER_new_null();
 
-  if (PKCS7_get_certificates(certs, &der_data)) {
-    for (size_t i = 0; i < sk_X509_num(certs); ++i) {
-      base::StringPiece stringpiece;
-      x509_util::GetDER(sk_X509_value(certs, i), &stringpiece);
-      handles->push_back(x509_util::CreateCryptoBuffer(stringpiece).release());
+  if (PKCS7_get_raw_certificates(certs, &der_data,
+                                 x509_util::GetBufferPool())) {
+    for (size_t i = 0; i < sk_CRYPTO_BUFFER_num(certs); ++i) {
+      handles->push_back(sk_CRYPTO_BUFFER_value(certs, i));
     }
   }
-  sk_X509_pop_free(certs, X509_free);
+  // |handles| took ownership of the individual buffers, so only free the list
+  // itself.
+  sk_CRYPTO_BUFFER_free(certs);
 }
 
 }  // namespace
 
 bool X509Certificate::Initialize() {
   der::Input tbs_certificate_tlv;
   der::Input signature_algorithm_tlv;
   der::BitString signature_value;
 
   if (!ParseCertificate(der::Input(CRYPTO_BUFFER_data(cert_handle_),
@@ skipping 308 matching lines @@
 
 // static
 bool X509Certificate::WriteOSCertHandleToPickle(OSCertHandle cert_handle,
                                                 base::Pickle* pickle) {
   return pickle->WriteData(
       reinterpret_cast<const char*>(CRYPTO_BUFFER_data(cert_handle)),
       CRYPTO_BUFFER_len(cert_handle));
 }
 
 }  // namespace net