mirror of
https://github.com/kidfromjupiter/nearby.git
synced 2026-09-16 15:36:12 -04:00
Internal fix
PiperOrigin-RevId: 494245945
This commit is contained in:
committed by
Copybara-Service
parent
2706d66519
commit
32163382b9
@@ -26,7 +26,7 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#include "absl/types/span.h"
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#include "internal/crypto/openssl_util.h"
|
||||
|
||||
@@ -27,11 +27,11 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#ifndef NEARBY_SWIFTPM
|
||||
#include "absl/log/log.h"
|
||||
#include "absl/log/log.h" // nogncheck
|
||||
#endif
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "absl/types/span.h"
|
||||
@@ -162,8 +162,8 @@ size_t Encryptor::MaxOutput(bool do_encrypt, size_t length) {
|
||||
}
|
||||
|
||||
absl::optional<size_t> Encryptor::Crypt(bool do_encrypt,
|
||||
absl::Span<const uint8_t> input,
|
||||
absl::Span<uint8_t> output) {
|
||||
absl::Span<const uint8_t> input,
|
||||
absl::Span<uint8_t> output) {
|
||||
DCHECK(key_); // Must call Init() before En/De-crypt.
|
||||
|
||||
const EVP_CIPHER* cipher = GetCipherForKey(key_);
|
||||
@@ -200,8 +200,8 @@ absl::optional<size_t> Encryptor::Crypt(bool do_encrypt,
|
||||
}
|
||||
|
||||
absl::optional<size_t> Encryptor::CryptCTR(bool do_encrypt,
|
||||
absl::Span<const uint8_t> input,
|
||||
absl::Span<uint8_t> output) {
|
||||
absl::Span<const uint8_t> input,
|
||||
absl::Span<uint8_t> output) {
|
||||
if (iv_.size() != AES_BLOCK_SIZE) {
|
||||
LOG(ERROR) << "Counter value not set in CTR mode.";
|
||||
return absl::nullopt;
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#include "absl/strings/string_view.h"
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#include "internal/crypto/hmac.h"
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#include "absl/types/span.h"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#ifdef NEARBY_SWIFTPM
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/log.h"
|
||||
#include "absl/log/log.h" // nogncheck
|
||||
#endif
|
||||
#include "absl/strings/string_view.h"
|
||||
#include <openssl/crypto.h>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#include "absl/types/span.h"
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#include "internal/crypto/openssl_util.h"
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#include "internal/crypto/nearby_base.h"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#elif defined(NEARBY_CHROMIUM)
|
||||
#include "glog/logging.h"
|
||||
#else
|
||||
#include "absl/log/log.h"
|
||||
#include "absl/log/log.h" // nogncheck
|
||||
#endif
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "internal/platform/byte_array.h"
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
#elif defined(NEARBY_SWIFTPM)
|
||||
#include "internal/platform/logging.h"
|
||||
#else
|
||||
#include "absl/log/check.h"
|
||||
#include "absl/log/check.h" // nogncheck
|
||||
#endif
|
||||
|
||||
#include "internal/platform/mutex.h"
|
||||
|
||||
Reference in New Issue
Block a user