sync pki to chrome 6e6fa5a08b94199de10eea22845963baf548628b

Change-Id: I17662a3b03413300183af641529d3c3dd8f98cab
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/61486
Auto-Submit: Bob Beck <bbe@google.com>
Commit-Queue: Adam Langley <agl@google.com>
Reviewed-by: Adam Langley <agl@google.com>

pki/parse_certificate_fuzzer.cc

diff --git a/pki/parse_certificate_fuzzer.cc b/pki/parse_certificate_fuzzer.cc
index 6a26d25..caf0c0e 100644
--- a/pki/parse_certificate_fuzzer.cc
+++ b/pki/parse_certificate_fuzzer.cc
@@ -7,15 +7,15 @@
 
 #include "cert_errors.h"
 #include "parsed_certificate.h"
-#include "fillins/x509_util.h"
-#include <openssl/span.h>
+#include <openssl/pool.h>
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   bssl::CertErrors errors;
   std::shared_ptr<const ParsedCertificate> cert =
       ParsedCertificate::Create(
-          x509_util::CreateCryptoBuffer(bssl::MakeSpan(data, size)), {},
-          &errors);
+          bssl::UniquePtr<CRYPTO_BUFFER>(
+              CRYPTO_BUFFER_new(data, size, nullptr)),
+          {}, &errors);
 
   // Severe errors must be provided iff the parsing failed.
   CHECK_EQ(errors.ContainsAnyErrorWithSeverity(net::CertError::SEVERITY_HIGH),

pki/path_builder_unittest.cc

diff --git a/pki/path_builder_unittest.cc b/pki/path_builder_unittest.cc
index 4f3ca4d..da8aa6e 100644
--- a/pki/path_builder_unittest.cc
+++ b/pki/path_builder_unittest.cc
@@ -9,8 +9,6 @@
 #include "fillins/path_service.h"
 #include "fillins/file_util.h"
 
-
-#include "pem.h"
 #include "cert_error_params.h"
 #include "cert_issuer_source_static.h"
 #include "common_cert_errors.h"

pki/signature_algorithm_unittest.cc

diff --git a/pki/signature_algorithm_unittest.cc b/pki/signature_algorithm_unittest.cc
index ff60891..1c420a3 100644
--- a/pki/signature_algorithm_unittest.cc
+++ b/pki/signature_algorithm_unittest.cc
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "fillins/file_util.h"
-#include "pem.h"
 #include "input.h"
 #include "parser.h"
 #include <gtest/gtest.h>

pki/verify_certificate_chain_typed_unittest.h

diff --git a/pki/verify_certificate_chain_typed_unittest.h b/pki/verify_certificate_chain_typed_unittest.h
index ba4b51a..e253847 100644
--- a/pki/verify_certificate_chain_typed_unittest.h
+++ b/pki/verify_certificate_chain_typed_unittest.h
@@ -5,7 +5,6 @@
 #ifndef BSSL_PKI_VERIFY_CERTIFICATE_CHAIN_TYPED_UNITTEST_H_
 #define BSSL_PKI_VERIFY_CERTIFICATE_CHAIN_TYPED_UNITTEST_H_
 
-#include "pem.h"
 #include "parsed_certificate.h"
 #include "simple_path_builder_delegate.h"
 #include "test_helpers.h"