Add missing includes in chaps_util/*

Add missing imports to files in chaps_util/ folder. These required includes were probably satisfied indirectly, but that's against the style guide. Bug: b:288880151 Change-Id: I7ea0196a5118faaa9c5eae4103d58578bd947682 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5171581 Reviewed-by: Michael Ershov <miersh@google.com> Reviewed-by: Oleksandr Sarapulov <olsa@google.com> Commit-Queue: Felipe Andrade <fsandrade@chromium.org> Cr-Commit-Position: refs/heads/main@{#1244014}
chromium · Jan 8, 2024 · 235535b · 235535b
1 parent 0090b38
commit 235535b
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 3 deletions.
diff --git a/chromeos/ash/components/chaps_util/chaps_slot_session.cc b/chromeos/ash/components/chaps_util/chaps_slot_session.cc
@@ -8,6 +8,9 @@
 #include <pkcs11.h>
 #include <pkcs11t.h>
 
+#include <memory>
+#include <optional>
+
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"

diff --git a/chromeos/ash/components/chaps_util/chaps_util.cc b/chromeos/ash/components/chaps_util/chaps_util.cc
@@ -4,6 +4,7 @@
 
 #include "chromeos/ash/components/chaps_util/chaps_util.h"
 
+#include <memory>
 #include <ostream>
 
 #include "base/functional/callback.h"

diff --git a/chromeos/ash/components/chaps_util/chaps_util.h b/chromeos/ash/components/chaps_util/chaps_util.h
@@ -6,6 +6,7 @@
 #define CHROMEOS_ASH_COMPONENTS_CHAPS_UTIL_CHAPS_UTIL_H_
 
 #include <pk11pub.h>
+#include <stdint.h>
 
 #include <memory>
 #include <vector>

diff --git a/chromeos/ash/components/chaps_util/chaps_util_impl.cc b/chromeos/ash/components/chaps_util/chaps_util_impl.cc
@@ -9,9 +9,11 @@
 #include <pk11pub.h>
 #include <pkcs11.h>
 #include <pkcs11t.h>
+#include <stdint.h>
 
 #include <optional>
 #include <ostream>
+#include <string>
 #include <vector>
 
 #include "base/check.h"
@@ -25,8 +27,10 @@
 #include "chromeos/ash/components/chaps_util/pkcs12_validator.h"
 #include "crypto/chaps_support.h"
 #include "crypto/scoped_nss_types.h"
+#include "third_party/boringssl/src/include/openssl/base.h"
 #include "third_party/boringssl/src/include/openssl/mem.h"
 #include "third_party/boringssl/src/include/openssl/pkcs8.h"
+#include "third_party/boringssl/src/include/openssl/stack.h"
 
 namespace chromeos {
 

diff --git a/chromeos/ash/components/chaps_util/chaps_util_impl.h b/chromeos/ash/components/chaps_util/chaps_util_impl.h
@@ -5,7 +5,10 @@
 #ifndef CHROMEOS_ASH_COMPONENTS_CHAPS_UTIL_CHAPS_UTIL_IMPL_H_
 #define CHROMEOS_ASH_COMPONENTS_CHAPS_UTIL_CHAPS_UTIL_IMPL_H_
 
+#include <stdint.h>
+
 #include <memory>
+#include <string>
 #include <vector>
 
 #include "base/component_export.h"

diff --git a/chromeos/ash/components/chaps_util/chaps_util_impl_unittest.cc b/chromeos/ash/components/chaps_util/chaps_util_impl_unittest.cc
@@ -6,14 +6,17 @@
 
 #include <pkcs11t.h>
 #include <secmodt.h>
+#include <stdint.h>
 
 #include <map>
 #include <optional>
 #include <utility>
 #include <vector>
 
 #include "base/base64.h"
+#include "base/containers/span.h"
 #include "base/files/file_util.h"
+#include "base/memory/raw_ptr.h"
 #include "chromeos/ash/components/chaps_util/chaps_slot_session.h"
 #include "chromeos/ash/components/chaps_util/pkcs12_reader.h"
 #include "crypto/nss_key_util.h"
@@ -24,7 +27,9 @@
 #include "net/test/test_data_directory.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/boringssl/src/include/openssl/base.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
+#include "third_party/boringssl/src/include/openssl/stack.h"
 #include "third_party/boringssl/src/include/openssl/x509.h"
 
 namespace chromeos {

diff --git a/chromeos/ash/components/chaps_util/key_helper.cc b/chromeos/ash/components/chaps_util/key_helper.cc
@@ -3,7 +3,14 @@
 // found in the LICENSE file.
 
 #include "chromeos/ash/components/chaps_util/key_helper.h"
+
+#include <pk11pub.h>
+#include <stdint.h>
+
+#include <vector>
+
 #include "base/hash/sha1.h"
+#include "crypto/scoped_nss_types.h"
 #include "net/cert/x509_util_nss.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
 #include "third_party/boringssl/src/include/openssl/bytestring.h"

diff --git a/chromeos/ash/components/chaps_util/pkcs12_reader.cc b/chromeos/ash/components/chaps_util/pkcs12_reader.cc
@@ -1,15 +1,23 @@
 // Copyright 2023 The Chromium Authors
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
+
+#include "chromeos/ash/components/chaps_util/pkcs12_reader.h"
+
+#include <stdint.h>
+
+#include <string>
 #include <vector>
 
+#include "base/containers/span.h"
 #include "chromeos/ash/components/chaps_util/key_helper.h"
-#include "chromeos/ash/components/chaps_util/pkcs12_reader.h"
 #include "crypto/nss_util.h"
 #include "net/cert/x509_util_nss.h"
+#include "third_party/boringssl/src/include/openssl/base.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
 #include "third_party/boringssl/src/include/openssl/mem.h"
 #include "third_party/boringssl/src/include/openssl/pkcs8.h"
+#include "third_party/boringssl/src/include/openssl/stack.h"
 
 namespace chromeos {
 

diff --git a/chromeos/ash/components/chaps_util/pkcs12_reader.h b/chromeos/ash/components/chaps_util/pkcs12_reader.h
@@ -5,17 +5,20 @@
 #ifndef CHROMEOS_ASH_COMPONENTS_CHAPS_UTIL_PKCS12_READER_H_
 #define CHROMEOS_ASH_COMPONENTS_CHAPS_UTIL_PKCS12_READER_H_
 
-#include <cstdint>
+#include <nss/certt.h>
+#include <stdint.h>
+
 #include <string>
 #include <vector>
 
-#include <nss/certt.h>
 #include "base/component_export.h"
 #include "base/containers/span.h"
 #include "chromeos/ash/components/chaps_util/chaps_slot_session.h"
 #include "crypto/scoped_nss_types.h"
 #include "net/cert/x509_certificate.h"
+#include "third_party/boringssl/src/include/openssl/base.h"
 #include "third_party/boringssl/src/include/openssl/pkcs7.h"
+#include "third_party/boringssl/src/include/openssl/stack.h"
 
 namespace chromeos {
 

diff --git a/chromeos/ash/components/chaps_util/pkcs12_reader_unittest.cc b/chromeos/ash/components/chaps_util/pkcs12_reader_unittest.cc
@@ -5,19 +5,28 @@
 #include "chromeos/ash/components/chaps_util/pkcs12_reader.h"
 
 #include <pk11pub.h>
+#include <stdint.h>
 
+#include <memory>
+#include <string>
 #include <vector>
 
 #include "base/base64.h"
+#include "base/containers/span.h"
 #include "chromeos/ash/components/chaps_util/key_helper.h"
 #include "crypto/scoped_test_nss_db.h"
+#include "net/cert/x509_certificate.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_data_directory.h"
 #include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/boringssl/src/include/openssl/base.h"
+#include "third_party/boringssl/src/include/openssl/bn.h"
 #include "third_party/boringssl/src/include/openssl/ec_key.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"
 #include "third_party/boringssl/src/include/openssl/mem.h"
 #include "third_party/boringssl/src/include/openssl/rsa.h"
+#include "third_party/boringssl/src/include/openssl/stack.h"
 #include "third_party/boringssl/src/include/openssl/x509.h"
 
 namespace chromeos {

diff --git a/chromeos/ash/components/chaps_util/pkcs12_validator.cc b/chromeos/ash/components/chaps_util/pkcs12_validator.cc
@@ -4,11 +4,20 @@
 
 #include "chromeos/ash/components/chaps_util/pkcs12_validator.h"
 
+#include <stdint.h>
+
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "base/containers/span.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "chromeos/ash/components/chaps_util/pkcs12_reader.h"
+#include "third_party/boringssl/src/include/openssl/base.h"
 #include "third_party/boringssl/src/include/openssl/mem.h"
 #include "third_party/boringssl/src/include/openssl/pkcs8.h"
+#include "third_party/boringssl/src/include/openssl/stack.h"
 
 namespace chromeos {
 namespace {

diff --git a/chromeos/ash/components/chaps_util/pkcs12_validator.h b/chromeos/ash/components/chaps_util/pkcs12_validator.h
@@ -9,11 +9,15 @@
 #ifndef CHROMEOS_ASH_COMPONENTS_CHAPS_UTIL_PKCS12_VALIDATOR_H_
 #define CHROMEOS_ASH_COMPONENTS_CHAPS_UTIL_PKCS12_VALIDATOR_H_
 
+#include <string>
+#include <vector>
+
 #include "base/memory/raw_ptr_cast.h"
 #include "base/memory/raw_ptr_exclusion.h"
 #include "base/memory/raw_ref.h"
 #include "chromeos/ash/components/chaps_util/pkcs12_reader.h"
 #include "third_party/boringssl/src/include/openssl/base.h"
+#include "third_party/boringssl/src/include/openssl/stack.h"
 
 namespace chromeos {
 

diff --git a/chromeos/ash/components/chaps_util/test_util.cc b/chromeos/ash/components/chaps_util/test_util.cc
@@ -5,15 +5,18 @@
 #include "chromeos/ash/components/chaps_util/test_util.h"
 
 #include <pk11pub.h>
+#include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
+#include "base/functional/bind.h"
 #include "base/functional/callback_forward.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/ash/components/chaps_util/chaps_util.h"
 #include "crypto/nss_key_util.h"
+#include "crypto/scoped_nss_types.h"
 
 namespace chromeos {
 

diff --git a/chromeos/ash/components/chaps_util/test_util.h b/chromeos/ash/components/chaps_util/test_util.h
@@ -6,6 +6,7 @@
 #define CHROMEOS_ASH_COMPONENTS_CHAPS_UTIL_TEST_UTIL_H_
 
 #include <pk11pub.h>
+#include <stdint.h>
 
 #include <memory>
 #include <string>
@@ -14,6 +15,7 @@
 #include "base/functional/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/ash/components/chaps_util/chaps_util.h"
+#include "crypto/scoped_nss_types.h"
 
 namespace chromeos {