From 4bf31d18da0faddcf0a39262c743c4ea95de95ac Mon Sep 17 00:00:00 2001 From: suetfei Date: Fri, 5 Aug 2022 12:28:10 -0700 Subject: [PATCH] Internal Flow change PiperOrigin-RevId: 465623255 --- internal/crypto/aead.cc | 10 +++++----- internal/crypto/aead.h | 2 +- internal/crypto/aead_unittest.cc | 2 +- internal/crypto/ec_private_key.cc | 18 +++++++++--------- internal/crypto/ec_private_key.h | 4 ++-- internal/crypto/ec_private_key_unittest.cc | 2 +- internal/crypto/ec_signature_creator.cc | 4 ++-- internal/crypto/ec_signature_creator.h | 2 +- internal/crypto/ec_signature_creator_impl.cc | 16 ++++++++-------- internal/crypto/ec_signature_creator_impl.h | 2 +- .../crypto/ec_signature_creator_unittest.cc | 8 ++++---- internal/crypto/encryptor.cc | 12 ++++++------ internal/crypto/encryptor.h | 2 +- internal/crypto/encryptor_unittest.cc | 6 +++--- internal/crypto/hkdf.cc | 8 ++++---- internal/crypto/hkdf.h | 2 +- internal/crypto/hmac.cc | 12 ++++++------ internal/crypto/hmac.h | 4 ++-- internal/crypto/hmac_unittest.cc | 2 +- internal/crypto/nearby_base.cc | 2 +- internal/crypto/openssl_util.cc | 6 +++--- internal/crypto/openssl_util.h | 2 +- internal/crypto/random.cc | 4 ++-- internal/crypto/random.h | 2 +- internal/crypto/random_unittest.cc | 4 ++-- internal/crypto/rsa_private_key.cc | 14 +++++++------- internal/crypto/rsa_private_key.h | 4 ++-- internal/crypto/rsa_private_key_unittest.cc | 2 +- internal/crypto/secure_hash.cc | 8 ++++---- internal/crypto/secure_hash.h | 2 +- internal/crypto/secure_hash_unittest.cc | 4 ++-- internal/crypto/secure_util.cc | 4 ++-- internal/crypto/secure_util.h | 2 +- internal/crypto/sha2.cc | 6 +++--- internal/crypto/sha2.h | 2 +- internal/crypto/sha2_unittest.cc | 2 +- internal/crypto/signature_verifier.cc | 12 ++++++------ internal/crypto/signature_verifier.h | 2 +- internal/crypto/signature_verifier_unittest.cc | 2 +- internal/crypto/symmetric_key.cc | 10 +++++----- internal/crypto/symmetric_key.h | 2 +- internal/crypto/symmetric_key_unittest.cc | 4 ++-- internal/platform/implementation/g3/crypto.cc | 2 +- .../platform/implementation/windows/crypto.cc | 4 ++-- presence/encryption.cc | 6 +++--- 45 files changed, 116 insertions(+), 116 deletions(-) diff --git a/internal/crypto/aead.cc b/internal/crypto/aead.cc index b364d5cb..5e3f3359 100644 --- a/internal/crypto/aead.cc +++ b/internal/crypto/aead.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/aead.h" +#include "internal/crypto/aead.h" #include #include @@ -22,10 +22,10 @@ #include #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/nearby_base.h" -#include "third_party/nearby/internal/crypto/openssl_util.h" -#include "third_party/openssl/aes.h" -#include "third_party/openssl/evp.h" +#include "internal/crypto/nearby_base.h" +#include "internal/crypto/openssl_util.h" +#include +#include namespace crypto { diff --git a/internal/crypto/aead.h b/internal/crypto/aead.h index 6e2099b9..b471a7ed 100644 --- a/internal/crypto/aead.h +++ b/internal/crypto/aead.h @@ -25,7 +25,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" struct evp_aead_st; diff --git a/internal/crypto/aead_unittest.cc b/internal/crypto/aead_unittest.cc index 6361f4c5..a39e2271 100644 --- a/internal/crypto/aead_unittest.cc +++ b/internal/crypto/aead_unittest.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/aead.h" +#include "internal/crypto/aead.h" #include #include diff --git a/internal/crypto/ec_private_key.cc b/internal/crypto/ec_private_key.cc index 6b101d89..fd2fd1a4 100644 --- a/internal/crypto/ec_private_key.cc +++ b/internal/crypto/ec_private_key.cc @@ -1,4 +1,4 @@ -#include "third_party/nearby/internal/crypto/ec_private_key.h" +#include "internal/crypto/ec_private_key.h" // Copyright 2020 Google LLC // @@ -23,15 +23,15 @@ #include #include -#include "third_party/nearby/internal/crypto/openssl_util.h" +#include "internal/crypto/openssl_util.h" #include "internal/platform/logging.h" -#include "third_party/openssl/bn.h" -#include "third_party/openssl/bytestring.h" -#include "third_party/openssl/ec.h" -#include "third_party/openssl/ec_key.h" -#include "third_party/openssl/evp.h" -#include "third_party/openssl/mem.h" -#include "third_party/openssl/pkcs8.h" +#include +#include +#include +#include +#include +#include +#include namespace crypto { diff --git a/internal/crypto/ec_private_key.h b/internal/crypto/ec_private_key.h index 2b62b18f..56f512b9 100644 --- a/internal/crypto/ec_private_key.h +++ b/internal/crypto/ec_private_key.h @@ -23,8 +23,8 @@ #include #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" -#include "third_party/openssl/base.h" +#include "internal/crypto/crypto_export.h" +#include namespace crypto { diff --git a/internal/crypto/ec_private_key_unittest.cc b/internal/crypto/ec_private_key_unittest.cc index 1f366f3a..6f488725 100644 --- a/internal/crypto/ec_private_key_unittest.cc +++ b/internal/crypto/ec_private_key_unittest.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/ec_private_key.h" +#include "internal/crypto/ec_private_key.h" #include diff --git a/internal/crypto/ec_signature_creator.cc b/internal/crypto/ec_signature_creator.cc index 51da2fbb..499a1641 100644 --- a/internal/crypto/ec_signature_creator.cc +++ b/internal/crypto/ec_signature_creator.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/ec_signature_creator.h" +#include "internal/crypto/ec_signature_creator.h" #include -#include "third_party/nearby/internal/crypto/ec_signature_creator_impl.h" +#include "internal/crypto/ec_signature_creator_impl.h" #include "internal/platform/logging.h" namespace crypto { diff --git a/internal/crypto/ec_signature_creator.h b/internal/crypto/ec_signature_creator.h index bcb9074a..a87fa9b9 100644 --- a/internal/crypto/ec_signature_creator.h +++ b/internal/crypto/ec_signature_creator.h @@ -22,7 +22,7 @@ #include #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" namespace crypto { diff --git a/internal/crypto/ec_signature_creator_impl.cc b/internal/crypto/ec_signature_creator_impl.cc index c55bef2d..e302c1bc 100644 --- a/internal/crypto/ec_signature_creator_impl.cc +++ b/internal/crypto/ec_signature_creator_impl.cc @@ -12,20 +12,20 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/ec_signature_creator_impl.h" +#include "internal/crypto/ec_signature_creator_impl.h" #include #include #include -#include "third_party/nearby/internal/crypto/ec_private_key.h" -#include "third_party/nearby/internal/crypto/openssl_util.h" -#include "third_party/openssl/bn.h" -#include "third_party/openssl/ec.h" -#include "third_party/openssl/ecdsa.h" -#include "third_party/openssl/evp.h" -#include "third_party/openssl/sha.h" +#include "internal/crypto/ec_private_key.h" +#include "internal/crypto/openssl_util.h" +#include +#include +#include +#include +#include namespace crypto { diff --git a/internal/crypto/ec_signature_creator_impl.h b/internal/crypto/ec_signature_creator_impl.h index f3e412c0..74599886 100644 --- a/internal/crypto/ec_signature_creator_impl.h +++ b/internal/crypto/ec_signature_creator_impl.h @@ -20,7 +20,7 @@ #include #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/ec_signature_creator.h" +#include "internal/crypto/ec_signature_creator.h" namespace crypto { diff --git a/internal/crypto/ec_signature_creator_unittest.cc b/internal/crypto/ec_signature_creator_unittest.cc index 2d8d58d1..e4eab224 100644 --- a/internal/crypto/ec_signature_creator_unittest.cc +++ b/internal/crypto/ec_signature_creator_unittest.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/ec_signature_creator.h" +#include "internal/crypto/ec_signature_creator.h" #include @@ -22,9 +22,9 @@ #include "gtest/gtest.h" #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/ec_private_key.h" -#include "third_party/nearby/internal/crypto/nearby_base.h" -#include "third_party/nearby/internal/crypto/signature_verifier.h" +#include "internal/crypto/ec_private_key.h" +#include "internal/crypto/nearby_base.h" +#include "internal/crypto/signature_verifier.h" TEST(ECSignatureCreatorTest, BasicTest) { // Do a verify round trip. diff --git a/internal/crypto/encryptor.cc b/internal/crypto/encryptor.cc index 54eb63b9..469c0179 100644 --- a/internal/crypto/encryptor.cc +++ b/internal/crypto/encryptor.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/encryptor.h" +#include "internal/crypto/encryptor.h" #include #include @@ -24,12 +24,12 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/nearby_base.h" -#include "third_party/nearby/internal/crypto/openssl_util.h" -#include "third_party/nearby/internal/crypto/symmetric_key.h" +#include "internal/crypto/nearby_base.h" +#include "internal/crypto/openssl_util.h" +#include "internal/crypto/symmetric_key.h" #include "internal/platform/logging.h" -#include "third_party/openssl/aes.h" -#include "third_party/openssl/evp.h" +#include +#include namespace crypto { diff --git a/internal/crypto/encryptor.h b/internal/crypto/encryptor.h index 07400240..f90a5ac7 100644 --- a/internal/crypto/encryptor.h +++ b/internal/crypto/encryptor.h @@ -26,7 +26,7 @@ #include "absl/strings/string_view.h" #include "absl/types/optional.h" #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" namespace crypto { diff --git a/internal/crypto/encryptor_unittest.cc b/internal/crypto/encryptor_unittest.cc index b6a7b3f2..351ae995 100644 --- a/internal/crypto/encryptor_unittest.cc +++ b/internal/crypto/encryptor_unittest.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/encryptor.h" +#include "internal/crypto/encryptor.h" #include @@ -24,8 +24,8 @@ #include "gtest/gtest.h" #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/nearby_base.h" -#include "third_party/nearby/internal/crypto/symmetric_key.h" +#include "internal/crypto/nearby_base.h" +#include "internal/crypto/symmetric_key.h" TEST(EncryptorTest, EncryptDecrypt) { std::unique_ptr key( diff --git a/internal/crypto/hkdf.cc b/internal/crypto/hkdf.cc index 0dfb46cc..dbbf61a3 100644 --- a/internal/crypto/hkdf.cc +++ b/internal/crypto/hkdf.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/openssl/hkdf.h" +#include #include #include @@ -22,10 +22,10 @@ #include #include "absl/strings/string_view.h" -#include "third_party/nearby/internal/crypto/hkdf.h" -#include "third_party/nearby/internal/crypto/hmac.h" +#include "internal/crypto/hkdf.h" +#include "internal/crypto/hmac.h" #include "internal/platform/logging.h" -#include "src/include/openssl/digest.h" +#include namespace crypto { diff --git a/internal/crypto/hkdf.h b/internal/crypto/hkdf.h index b8022979..81803270 100644 --- a/internal/crypto/hkdf.h +++ b/internal/crypto/hkdf.h @@ -22,7 +22,7 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" namespace crypto { diff --git a/internal/crypto/hmac.cc b/internal/crypto/hmac.cc index 75785a61..b5ac2688 100644 --- a/internal/crypto/hmac.cc +++ b/internal/crypto/hmac.cc @@ -12,18 +12,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/openssl/hmac.h" +#include #include #include #include -#include "third_party/nearby/internal/crypto/hmac.h" -#include "third_party/nearby/internal/crypto/nearby_base.h" -#include "third_party/nearby/internal/crypto/openssl_util.h" -#include "third_party/nearby/internal/crypto/secure_util.h" -#include "third_party/nearby/internal/crypto/symmetric_key.h" +#include "internal/crypto/hmac.h" +#include "internal/crypto/nearby_base.h" +#include "internal/crypto/openssl_util.h" +#include "internal/crypto/secure_util.h" +#include "internal/crypto/symmetric_key.h" #include "internal/platform/logging.h" namespace crypto { diff --git a/internal/crypto/hmac.h b/internal/crypto/hmac.h index 1771bed7..c56d7c7b 100644 --- a/internal/crypto/hmac.h +++ b/internal/crypto/hmac.h @@ -28,8 +28,8 @@ #include "absl/base/attributes.h" #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" -#include "third_party/nearby/internal/crypto/nearby_base.h" +#include "internal/crypto/crypto_export.h" +#include "internal/crypto/nearby_base.h" namespace crypto { diff --git a/internal/crypto/hmac_unittest.cc b/internal/crypto/hmac_unittest.cc index 56ec7ada..99677752 100644 --- a/internal/crypto/hmac_unittest.cc +++ b/internal/crypto/hmac_unittest.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/hmac.h" +#include "internal/crypto/hmac.h" #include #include diff --git a/internal/crypto/nearby_base.cc b/internal/crypto/nearby_base.cc index 2911f71e..17683c9e 100644 --- a/internal/crypto/nearby_base.cc +++ b/internal/crypto/nearby_base.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/nearby_base.h" +#include "internal/crypto/nearby_base.h" #include #include diff --git a/internal/crypto/openssl_util.cc b/internal/crypto/openssl_util.cc index 17844da0..1568612d 100644 --- a/internal/crypto/openssl_util.cc +++ b/internal/crypto/openssl_util.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/openssl_util.h" +#include "internal/crypto/openssl_util.h" #include #include @@ -21,8 +21,8 @@ #include "absl/strings/string_view.h" #include "internal/platform/logging.h" -#include "third_party/openssl/crypto.h" -#include "third_party/openssl/err.h" +#include +#include namespace crypto { diff --git a/internal/crypto/openssl_util.h b/internal/crypto/openssl_util.h index 2f2defec..2ddb517a 100644 --- a/internal/crypto/openssl_util.h +++ b/internal/crypto/openssl_util.h @@ -18,7 +18,7 @@ #include #include -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" #include "internal/platform/logging.h" namespace crypto { diff --git a/internal/crypto/random.cc b/internal/crypto/random.cc index 1ce13aa4..6f68e7b5 100644 --- a/internal/crypto/random.cc +++ b/internal/crypto/random.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/random.h" +#include "internal/crypto/random.h" #include -#include "third_party/openssl/rand.h" +#include namespace crypto { diff --git a/internal/crypto/random.h b/internal/crypto/random.h index ac9809bc..72adde00 100644 --- a/internal/crypto/random.h +++ b/internal/crypto/random.h @@ -18,7 +18,7 @@ #include #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" namespace crypto { diff --git a/internal/crypto/random_unittest.cc b/internal/crypto/random_unittest.cc index d3843957..3854da62 100644 --- a/internal/crypto/random_unittest.cc +++ b/internal/crypto/random_unittest.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/random.h" +#include "internal/crypto/random.h" #include #include #include "gtest/gtest.h" -#include "third_party/nearby/internal/crypto/nearby_base.h" +#include "internal/crypto/nearby_base.h" // Basic functionality tests. Does NOT test the security of the random data. diff --git a/internal/crypto/rsa_private_key.cc b/internal/crypto/rsa_private_key.cc index 48710546..57e7b1c1 100644 --- a/internal/crypto/rsa_private_key.cc +++ b/internal/crypto/rsa_private_key.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/rsa_private_key.h" +#include "internal/crypto/rsa_private_key.h" #include @@ -21,13 +21,13 @@ #include #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/openssl_util.h" +#include "internal/crypto/openssl_util.h" #include "internal/platform/logging.h" -#include "third_party/openssl/bn.h" -#include "third_party/openssl/bytestring.h" -#include "third_party/openssl/evp.h" -#include "third_party/openssl/mem.h" -#include "third_party/openssl/rsa.h" +#include +#include +#include +#include +#include namespace crypto { diff --git a/internal/crypto/rsa_private_key.h b/internal/crypto/rsa_private_key.h index 5694ef62..58a8e986 100644 --- a/internal/crypto/rsa_private_key.h +++ b/internal/crypto/rsa_private_key.h @@ -22,8 +22,8 @@ #include #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" -#include "third_party/openssl/base.h" +#include "internal/crypto/crypto_export.h" +#include namespace crypto { diff --git a/internal/crypto/rsa_private_key_unittest.cc b/internal/crypto/rsa_private_key_unittest.cc index 22fda40e..bfe25b49 100644 --- a/internal/crypto/rsa_private_key_unittest.cc +++ b/internal/crypto/rsa_private_key_unittest.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/rsa_private_key.h" +#include "internal/crypto/rsa_private_key.h" #include diff --git a/internal/crypto/secure_hash.cc b/internal/crypto/secure_hash.cc index f4693302..e950de1d 100644 --- a/internal/crypto/secure_hash.cc +++ b/internal/crypto/secure_hash.cc @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/secure_hash.h" +#include "internal/crypto/secure_hash.h" #include #include -#include "third_party/nearby/internal/crypto/openssl_util.h" -#include "third_party/openssl/mem.h" -#include "third_party/openssl/sha.h" +#include "internal/crypto/openssl_util.h" +#include +#include namespace crypto { diff --git a/internal/crypto/secure_hash.h b/internal/crypto/secure_hash.h index c6061705..32a30809 100644 --- a/internal/crypto/secure_hash.h +++ b/internal/crypto/secure_hash.h @@ -19,7 +19,7 @@ #include -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" namespace crypto { diff --git a/internal/crypto/secure_hash_unittest.cc b/internal/crypto/secure_hash_unittest.cc index f232b808..94950328 100644 --- a/internal/crypto/secure_hash_unittest.cc +++ b/internal/crypto/secure_hash_unittest.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/secure_hash.h" +#include "internal/crypto/secure_hash.h" #include #include @@ -21,7 +21,7 @@ #include #include "gtest/gtest.h" -#include "third_party/nearby/internal/crypto/sha2.h" +#include "internal/crypto/sha2.h" TEST(SecureHashTest, TestUpdate) { // Example B.3 from FIPS 180-2: long message. diff --git a/internal/crypto/secure_util.cc b/internal/crypto/secure_util.cc index 20c3cce0..9cc13b23 100644 --- a/internal/crypto/secure_util.cc +++ b/internal/crypto/secure_util.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/secure_util.h" +#include "internal/crypto/secure_util.h" -#include "third_party/openssl/mem.h" +#include namespace crypto { diff --git a/internal/crypto/secure_util.h b/internal/crypto/secure_util.h index 8f9556a3..4db08bbe 100644 --- a/internal/crypto/secure_util.h +++ b/internal/crypto/secure_util.h @@ -17,7 +17,7 @@ #include -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" namespace crypto { diff --git a/internal/crypto/sha2.cc b/internal/crypto/sha2.cc index d8a56ef0..995bbcae 100644 --- a/internal/crypto/sha2.cc +++ b/internal/crypto/sha2.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/sha2.h" +#include "internal/crypto/sha2.h" #include @@ -21,8 +21,8 @@ #include #include "absl/strings/string_view.h" -#include "third_party/nearby/internal/crypto/secure_hash.h" -#include "third_party/openssl/sha.h" +#include "internal/crypto/secure_hash.h" +#include namespace crypto { diff --git a/internal/crypto/sha2.h b/internal/crypto/sha2.h index d40747b8..30195717 100644 --- a/internal/crypto/sha2.h +++ b/internal/crypto/sha2.h @@ -22,7 +22,7 @@ #include "absl/strings/string_view.h" #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" namespace crypto { diff --git a/internal/crypto/sha2_unittest.cc b/internal/crypto/sha2_unittest.cc index 6423ecef..69e66025 100644 --- a/internal/crypto/sha2_unittest.cc +++ b/internal/crypto/sha2_unittest.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/sha2.h" +#include "internal/crypto/sha2.h" #include #include diff --git a/internal/crypto/signature_verifier.cc b/internal/crypto/signature_verifier.cc index 3029c678..1328a823 100644 --- a/internal/crypto/signature_verifier.cc +++ b/internal/crypto/signature_verifier.cc @@ -12,16 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/signature_verifier.h" +#include "internal/crypto/signature_verifier.h" #include -#include "third_party/nearby/internal/crypto/openssl_util.h" +#include "internal/crypto/openssl_util.h" #include "internal/platform/logging.h" -#include "third_party/openssl/bytestring.h" -#include "src/include/openssl/digest.h" -#include "third_party/openssl/evp.h" -#include "third_party/openssl/rsa.h" +#include +#include +#include +#include namespace crypto { diff --git a/internal/crypto/signature_verifier.h b/internal/crypto/signature_verifier.h index 3465be63..18a00202 100644 --- a/internal/crypto/signature_verifier.h +++ b/internal/crypto/signature_verifier.h @@ -21,7 +21,7 @@ #include #include "absl/types/span.h" -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" namespace crypto { diff --git a/internal/crypto/signature_verifier_unittest.cc b/internal/crypto/signature_verifier_unittest.cc index 37c20c17..70e9ea44 100644 --- a/internal/crypto/signature_verifier_unittest.cc +++ b/internal/crypto/signature_verifier_unittest.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/signature_verifier.h" +#include "internal/crypto/signature_verifier.h" #include #include diff --git a/internal/crypto/symmetric_key.cc b/internal/crypto/symmetric_key.cc index 534649c1..13c24bd4 100644 --- a/internal/crypto/symmetric_key.cc +++ b/internal/crypto/symmetric_key.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/symmetric_key.h" +#include "internal/crypto/symmetric_key.h" #include #include @@ -22,11 +22,11 @@ #include #include -#include "third_party/nearby/internal/crypto/nearby_base.h" -#include "third_party/nearby/internal/crypto/openssl_util.h" +#include "internal/crypto/nearby_base.h" +#include "internal/crypto/openssl_util.h" #include "internal/platform/logging.h" -#include "third_party/openssl/evp.h" -#include "third_party/openssl/rand.h" +#include +#include namespace crypto { diff --git a/internal/crypto/symmetric_key.h b/internal/crypto/symmetric_key.h index fdab6ea7..054a8ad1 100644 --- a/internal/crypto/symmetric_key.h +++ b/internal/crypto/symmetric_key.h @@ -20,7 +20,7 @@ #include #include -#include "third_party/nearby/internal/crypto/crypto_export.h" +#include "internal/crypto/crypto_export.h" namespace crypto { diff --git a/internal/crypto/symmetric_key_unittest.cc b/internal/crypto/symmetric_key_unittest.cc index 3504e471..4fe70b41 100644 --- a/internal/crypto/symmetric_key_unittest.cc +++ b/internal/crypto/symmetric_key_unittest.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "third_party/nearby/internal/crypto/symmetric_key.h" +#include "internal/crypto/symmetric_key.h" #include #include #include "gtest/gtest.h" #include "absl/strings/ascii.h" -#include "third_party/nearby/internal/crypto/nearby_base.h" +#include "internal/crypto/nearby_base.h" TEST(SymmetricKeyTest, GenerateRandomKey) { std::unique_ptr key( diff --git a/internal/platform/implementation/g3/crypto.cc b/internal/platform/implementation/g3/crypto.cc index fdad337e..40b07956 100644 --- a/internal/platform/implementation/g3/crypto.cc +++ b/internal/platform/implementation/g3/crypto.cc @@ -19,7 +19,7 @@ #include "absl/strings/string_view.h" #include "internal/platform/byte_array.h" -#include "src/include/openssl/digest.h" +#include namespace location { namespace nearby { diff --git a/internal/platform/implementation/windows/crypto.cc b/internal/platform/implementation/windows/crypto.cc index deafea99..80f57cce 100644 --- a/internal/platform/implementation/windows/crypto.cc +++ b/internal/platform/implementation/windows/crypto.cc @@ -20,9 +20,9 @@ #include "absl/strings/string_view.h" #include "internal/platform/byte_array.h" #if defined NEARBY_WINDOWS_DLL -#include "third_party/openssl/boringssl/src/include/openssl/digest.h" +#include #else -#include "src/include/openssl/digest.h" +#include #endif // Function implementations for platform/api/crypto.h. diff --git a/presence/encryption.cc b/presence/encryption.cc index 74851ec8..b17e63e1 100644 --- a/presence/encryption.cc +++ b/presence/encryption.cc @@ -22,9 +22,9 @@ #include "absl/status/statusor.h" #include "absl/strings/str_format.h" #include "internal/platform/logging.h" -#include "third_party/openssl/cipher.h" // NOLINT -#include "third_party/openssl/crypto.h" -#include "third_party/openssl/evp.h" // NOLINT +#include // NOLINT +#include +#include // NOLINT #include "third_party/tink/cc/subtle/hkdf.h" #include "third_party/tink/cc/subtle/random.h"