Fix some include spelling in libpki Change-Id: I70dc5425c30d2d0bd6ebb7ee883865b58b715213 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/85867 Commit-Queue: David Benjamin <davidben@google.com> Auto-Submit: David Benjamin <davidben@google.com> Reviewed-by: Matt Mueller <mattm@google.com> Commit-Queue: Matt Mueller <mattm@google.com>
diff --git a/pki/merkle_tree.cc b/pki/merkle_tree.cc index 08ba35a..43994ba 100644 --- a/pki/merkle_tree.cc +++ b/pki/merkle_tree.cc
@@ -19,7 +19,7 @@ #include <openssl/mem.h> #include <openssl/span.h> -#include "openssl/sha2.h" +#include <openssl/sha2.h> BSSL_NAMESPACE_BEGIN
diff --git a/pki/path_builder.cc b/pki/path_builder.cc index a3806e8..53597b6 100644 --- a/pki/path_builder.cc +++ b/pki/path_builder.cc
@@ -23,11 +23,11 @@ #include <openssl/base.h> #include <openssl/pki/verify_error.h> #include <openssl/sha2.h> +#include <openssl/span.h> #include "cert_issuer_source.h" #include "certificate_policies.h" #include "common_cert_errors.h" -#include "openssl/span.h" #include "parse_certificate.h" #include "parse_name.h" // For CertDebugString. #include "parsed_certificate.h"
diff --git a/pki/path_builder_unittest.cc b/pki/path_builder_unittest.cc index 32da535..16656df 100644 --- a/pki/path_builder_unittest.cc +++ b/pki/path_builder_unittest.cc
@@ -17,6 +17,12 @@ #include <algorithm> #include <memory> +#include <gmock/gmock.h> +#include <gtest/gtest.h> + +#include <openssl/pool.h> +#include <openssl/pki/verify.h> + #include "cert_error_params.h" #include "cert_issuer_source.h" #include "cert_issuer_source_static.h" @@ -24,7 +30,6 @@ #include "common_cert_errors.h" #include "input.h" #include "mock_signature_verify_cache.h" -#include "openssl/pki/verify.h" #include "parsed_certificate.h" #include "simple_path_builder_delegate.h" #include "string_util.h" @@ -34,10 +39,6 @@ #include "trust_store_in_memory.h" #include "verify_certificate_chain.h" -#include <gmock/gmock.h> -#include <gtest/gtest.h> -#include <openssl/pool.h> - BSSL_NAMESPACE_BEGIN // TODO(crbug.com/634443): Assert the errors for each ResultPath.
diff --git a/pki/trust_store.cc b/pki/trust_store.cc index 96339f9..4aa0a47 100644 --- a/pki/trust_store.cc +++ b/pki/trust_store.cc
@@ -12,17 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "trust_store.h" + #include <cassert> #include <cstring> #include <optional> -#include "trust_store.h" +#include <openssl/base.h> +#include <openssl/bytestring.h> +#include <openssl/mem.h> +#include <openssl/pool.h> #include "merkle_tree.h" -#include "openssl/base.h" -#include "openssl/bytestring.h" -#include "openssl/mem.h" -#include "openssl/pool.h" #include "parse_certificate.h" #include "parsed_certificate.h" #include "string_util.h"
diff --git a/pki/trust_store.h b/pki/trust_store.h index 3c8418f..10c563f 100644 --- a/pki/trust_store.h +++ b/pki/trust_store.h
@@ -20,10 +20,10 @@ #include <optional> #include <openssl/base.h> +#include <openssl/sha2.h> #include "cert_issuer_source.h" #include "merkle_tree.h" -#include "openssl/sha2.h" #include "parsed_certificate.h" BSSL_NAMESPACE_BEGIN
diff --git a/pki/trust_store_in_memory.cc b/pki/trust_store_in_memory.cc index 29f1aec..bd0782d 100644 --- a/pki/trust_store_in_memory.cc +++ b/pki/trust_store_in_memory.cc
@@ -13,7 +13,8 @@ // limitations under the License. #include "trust_store_in_memory.h" -#include "openssl/span.h" + +#include <openssl/span.h> BSSL_NAMESPACE_BEGIN
diff --git a/pki/trust_store_in_memory_unittest.cc b/pki/trust_store_in_memory_unittest.cc index dd304af..b033474 100644 --- a/pki/trust_store_in_memory_unittest.cc +++ b/pki/trust_store_in_memory_unittest.cc
@@ -14,11 +14,14 @@ #include "trust_store_in_memory.h" -#include <gtest/gtest.h> #include <memory> #include <vector> + +#include <gtest/gtest.h> + +#include <openssl/span.h> + #include "merkle_tree.h" -#include "openssl/span.h" #include "test_helpers.h" #include "trust_store.h"
diff --git a/pki/verify_certificate_chain.cc b/pki/verify_certificate_chain.cc index 3a2b22d..6e64dea 100644 --- a/pki/verify_certificate_chain.cc +++ b/pki/verify_certificate_chain.cc
@@ -19,6 +19,10 @@ #include <openssl/base.h> #include <openssl/bytestring.h> +#include <openssl/mem.h> +#include <openssl/sha2.h> +#include <openssl/span.h> + #include "cert_error_params.h" #include "cert_errors.h" #include "common_cert_errors.h" @@ -26,9 +30,6 @@ #include "input.h" #include "merkle_tree.h" #include "name_constraints.h" -#include "openssl/mem.h" -#include "openssl/sha2.h" -#include "openssl/span.h" #include "parse_certificate.h" #include "parse_values.h" #include "signature_algorithm.h"
diff --git a/pki/verify_unittest.cc b/pki/verify_unittest.cc index 5dfb9e6..61c6658 100644 --- a/pki/verify_unittest.cc +++ b/pki/verify_unittest.cc
@@ -23,11 +23,11 @@ #include <gtest/gtest.h> #include <openssl/pki/verify.h> #include <openssl/pki/verify_error.h> +#include <openssl/pool.h> #include <openssl/sha2.h> #include "encode_values.h" #include "merkle_tree.h" -#include "openssl/pool.h" #include "parse_certificate.h" #include "parsed_certificate.h" #include "string_util.h"