Remove unnecessary starboardizations from Crypto

youtube · Dec 19, 2023 · 9f019fd · 9f019fd
1 parent ebd0e67
commit 9f019fd
Show file tree

Hide file tree

Showing 62 changed files with 118 additions and 84 deletions.
diff --git a/crypto/aead.cc b/crypto/aead.cc
@@ -4,11 +4,12 @@
 
 #include "crypto/aead.h"
 
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
 
 #include "base/strings/string_util.h"
 #include "crypto/openssl_util.h"
-#include "starboard/types.h"
 #include "third_party/boringssl/src/include/openssl/aes.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"
 

diff --git a/crypto/aead.h b/crypto/aead.h
@@ -5,11 +5,12 @@
 #ifndef CRYPTO_AEAD_H_
 #define CRYPTO_AEAD_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/strings/string_piece.h"
 #include "crypto/crypto_export.h"
-#include "starboard/types.h"
 
 struct evp_aead_st;
 

diff --git a/crypto/apple_keychain.h b/crypto/apple_keychain.h
@@ -10,7 +10,6 @@
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/capi_util.cc b/crypto/capi_util.cc
@@ -4,11 +4,9 @@
 
 #include "crypto/capi_util.h"
 
+#include <stddef.h>
 #include <stdlib.h>
 
-#include "starboard/memory.h"
-#include "starboard/types.h"
-
 namespace crypto {
 
 void* WINAPI CryptAlloc(size_t size) {

diff --git a/crypto/capi_util.h b/crypto/capi_util.h
@@ -6,9 +6,9 @@
 #define CRYPTO_CAPI_UTIL_H_
 
 #include <windows.h>
+#include <stddef.h>
 
 #include "crypto/crypto_export.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/ec_private_key.cc b/crypto/ec_private_key.cc
@@ -4,11 +4,13 @@
 
 #include "crypto/ec_private_key.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <utility>
 
 #include "base/logging.h"
 #include "crypto/openssl_util.h"
-#include "starboard/types.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
 #include "third_party/boringssl/src/include/openssl/bytestring.h"
 #include "third_party/boringssl/src/include/openssl/ec.h"

diff --git a/crypto/ec_private_key.h b/crypto/ec_private_key.h
@@ -5,14 +5,16 @@
 #ifndef CRYPTO_EC_PRIVATE_KEY_H_
 #define CRYPTO_EC_PRIVATE_KEY_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
-#include "starboard/types.h"
 #include "third_party/boringssl/src/include/openssl/base.h"
 
 namespace crypto {

diff --git a/crypto/ec_private_key_unittest.cc b/crypto/ec_private_key_unittest.cc
@@ -4,11 +4,12 @@
 
 #include "crypto/ec_private_key.h"
 
+#include <stdint.h>
+
 #include <memory>
 #include <vector>
 
 #include "base/macros.h"
-#include "starboard/types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

diff --git a/crypto/ec_signature_creator.h b/crypto/ec_signature_creator.h
@@ -5,12 +5,13 @@
 #ifndef CRYPTO_EC_SIGNATURE_CREATOR_H_
 #define CRYPTO_EC_SIGNATURE_CREATOR_H_
 
+#include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "crypto/crypto_export.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/ec_signature_creator_impl.cc b/crypto/ec_signature_creator_impl.cc
@@ -4,10 +4,12 @@
 
 #include "crypto/ec_signature_creator_impl.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "crypto/ec_private_key.h"
 #include "crypto/openssl_util.h"
-#include "starboard/types.h"
 #include "third_party/boringssl/src/include/openssl/bn.h"
 #include "third_party/boringssl/src/include/openssl/ec.h"
 #include "third_party/boringssl/src/include/openssl/ecdsa.h"

diff --git a/crypto/ec_signature_creator_impl.h b/crypto/ec_signature_creator_impl.h
@@ -5,12 +5,13 @@
 #ifndef CRYPTO_EC_SIGNATURE_CREATOR_IMPL_H_
 #define CRYPTO_EC_SIGNATURE_CREATOR_IMPL_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "crypto/ec_signature_creator.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/ec_signature_creator_unittest.cc b/crypto/ec_signature_creator_unittest.cc
@@ -4,13 +4,14 @@
 
 #include "crypto/ec_signature_creator.h"
 
+#include <stdint.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "crypto/ec_private_key.h"
 #include "crypto/signature_verifier.h"
-#include "starboard/types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(rch): Add some exported keys from each to

diff --git a/crypto/encryptor.cc b/crypto/encryptor.cc
@@ -4,13 +4,14 @@
 
 #include "crypto/encryptor.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/sys_byteorder.h"
 #include "crypto/openssl_util.h"
 #include "crypto/symmetric_key.h"
-#include "starboard/memory.h"
-#include "starboard/types.h"
 #include "third_party/boringssl/src/include/openssl/aes.h"
 #include "third_party/boringssl/src/include/openssl/evp.h"
 

diff --git a/crypto/encryptor.h b/crypto/encryptor.h
@@ -5,13 +5,15 @@
 #ifndef CRYPTO_ENCRYPTOR_H_
 #define CRYPTO_ENCRYPTOR_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <memory>
 #include <string>
 
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/encryptor_unittest.cc b/crypto/encryptor_unittest.cc
@@ -4,14 +4,14 @@
 
 #include "crypto/encryptor.h"
 
+#include <stddef.h>
+
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "crypto/symmetric_key.h"
-#include "starboard/memory.h"
-#include "starboard/types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(EncryptorTest, EncryptDecrypt) {

diff --git a/crypto/hkdf.cc b/crypto/hkdf.cc
@@ -4,11 +4,13 @@
 
 #include "crypto/hkdf.h"
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <memory>
 
 #include "base/logging.h"
 #include "crypto/hmac.h"
-#include "starboard/types.h"
 #include "third_party/boringssl/src/include/openssl/digest.h"
 #include "third_party/boringssl/src/include/openssl/hkdf.h"
 

diff --git a/crypto/hkdf.h b/crypto/hkdf.h
@@ -5,11 +5,12 @@
 #ifndef CRYPTO_HKDF_H_
 #define CRYPTO_HKDF_H_
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/strings/string_piece.h"
 #include "crypto/crypto_export.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/hmac.cc b/crypto/hmac.cc
@@ -4,6 +4,8 @@
 
 #include "crypto/hmac.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <string>
 
@@ -12,7 +14,6 @@
 #include "crypto/openssl_util.h"
 #include "crypto/secure_util.h"
 #include "crypto/symmetric_key.h"
-#include "starboard/types.h"
 #include "third_party/boringssl/src/include/openssl/hmac.h"
 
 namespace crypto {

diff --git a/crypto/hmac.h b/crypto/hmac.h
@@ -8,14 +8,15 @@
 #ifndef CRYPTO_HMAC_H_
 #define CRYPTO_HMAC_H_
 
+#include <stddef.h>
+
 #include <memory>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
 #include "crypto/crypto_export.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/hmac_unittest.cc b/crypto/hmac_unittest.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include <string>
 
 #include "base/macros.h"
 #include "crypto/hmac.h"
-#include "starboard/memory.h"
-#include "starboard/types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 static const size_t kSHA1DigestSize = 20;

diff --git a/crypto/mock_apple_keychain.h b/crypto/mock_apple_keychain.h
@@ -5,14 +5,16 @@
 #ifndef CRYPTO_MOCK_APPLE_KEYCHAIN_H_
 #define CRYPTO_MOCK_APPLE_KEYCHAIN_H_
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "crypto/apple_keychain.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/mock_apple_keychain_mac.cc b/crypto/mock_apple_keychain_mac.cc
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stddef.h>
+
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "crypto/mock_apple_keychain.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/nss_key_util.cc b/crypto/nss_key_util.cc
@@ -8,13 +8,13 @@
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <secmod.h>
+#include <stdint.h>
 
 #include <memory>
 
 #include "base/logging.h"
 #include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"
-#include "starboard/types.h"
 
 namespace crypto {
 

diff --git a/crypto/nss_key_util.h b/crypto/nss_key_util.h
@@ -5,12 +5,13 @@
 #ifndef CRYPTO_NSS_KEY_UTIL_H_
 #define CRYPTO_NSS_KEY_UTIL_H_
 
+#include <stdint.h>
+
 #include <vector>
 
 #include "build/build_config.h"
 #include "crypto/crypto_export.h"
 #include "crypto/scoped_nss_types.h"
-#include "starboard/types.h"
 
 typedef struct PK11SlotInfoStr PK11SlotInfo;
 

diff --git a/crypto/nss_key_util_unittest.cc b/crypto/nss_key_util_unittest.cc
@@ -6,12 +6,12 @@
 
 #include <keyhi.h>
 #include <pk11pub.h>
+#include <stdint.h>
 
 #include <vector>
 
 #include "crypto/nss_util.h"
 #include "crypto/scoped_nss_types.h"
-#include "starboard/types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace crypto {

diff --git a/crypto/nss_util.cc b/crypto/nss_util.cc
@@ -17,8 +17,6 @@
 #include <utility>
 #include <vector>
 
-#include "starboard/types.h"
-
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/debug/alias.h"

diff --git a/crypto/nss_util.h b/crypto/nss_util.h
@@ -5,12 +5,13 @@
 #ifndef CRYPTO_NSS_UTIL_H_
 #define CRYPTO_NSS_UTIL_H_
 
+#include <stdint.h>
+
 #include <string>
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "crypto/crypto_export.h"
-#include "starboard/types.h"
 
 namespace base {
 class Time;