diff --git a/presence/implementation/BUILD b/presence/implementation/BUILD index 9af1f57f..e73fdeaa 100644 --- a/presence/implementation/BUILD +++ b/presence/implementation/BUILD @@ -270,7 +270,6 @@ cc_test( "//internal/platform/implementation/g3", # build_cleaner: keep "//presence/implementation/mediums", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/random", "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], diff --git a/presence/implementation/broadcast_manager.cc b/presence/implementation/broadcast_manager.cc index b7b74b69..6d58ccc6 100644 --- a/presence/implementation/broadcast_manager.cc +++ b/presence/implementation/broadcast_manager.cc @@ -18,6 +18,7 @@ #include #include +#include "internal/crypto/random.h" #include "presence/implementation/advertisement_factory.h" namespace nearby { @@ -157,7 +158,7 @@ void BroadcastManager::StopBroadcast(BroadcastSessionId id) { } BroadcastSessionId BroadcastManager::GenerateBroadcastSessionId() { - return absl::Uniform(bit_gen_); + return ::crypto::RandData(); } void BroadcastManager::BroadcastSessionState::SetAdvertisingSession( diff --git a/presence/implementation/broadcast_manager.h b/presence/implementation/broadcast_manager.h index 10fc5b87..9d03e9fb 100644 --- a/presence/implementation/broadcast_manager.h +++ b/presence/implementation/broadcast_manager.h @@ -21,7 +21,6 @@ #include #include "absl/base/thread_annotations.h" -#include "absl/random/random.h" #include "absl/strings/string_view.h" #include "internal/platform/single_thread_executor.h" #include "internal/proto/credential.pb.h" @@ -89,7 +88,6 @@ class BroadcastManager { ABSL_EXCLUSIVE_LOCKS_REQUIRED(*executor_); absl::flat_hash_map sessions_ ABSL_GUARDED_BY(*executor_); - absl::BitGen bit_gen_; }; } // namespace presence diff --git a/presence/implementation/mediums/BUILD b/presence/implementation/mediums/BUILD index dd2ea5c3..9d2783db 100644 --- a/presence/implementation/mediums/BUILD +++ b/presence/implementation/mediums/BUILD @@ -28,7 +28,6 @@ cc_library( deps = [ "//internal/platform:comm", "//internal/platform:uuid", - "//internal/platform/implementation:comm", "//presence:types", ], ) @@ -42,7 +41,6 @@ cc_test( shard_count = 16, deps = [ ":mediums", - "//internal/platform:base", "//internal/platform:comm", "//internal/platform:test_util", "//internal/platform:types", @@ -51,8 +49,6 @@ cc_test( "//internal/platform/implementation/g3", # build_cleaner: keep "//presence:types", "@com_github_protobuf_matchers//protobuf-matchers", - "@com_google_absl//absl/strings", - "@com_google_absl//absl/time", "@com_google_googletest//:gtest_main", ], ) diff --git a/presence/implementation/scan_manager.cc b/presence/implementation/scan_manager.cc index dba1023a..ec2dfab4 100644 --- a/presence/implementation/scan_manager.cc +++ b/presence/implementation/scan_manager.cc @@ -21,8 +21,8 @@ #include #include -#include "absl/random/random.h" #include "absl/types/variant.h" +#include "internal/crypto/random.h" #include "internal/platform/future.h" #include "internal/platform/implementation/ble_v2.h" #include "internal/platform/implementation/credential_callbacks.h" @@ -50,7 +50,7 @@ namespace presence { ScanSessionId ScanManager::StartScan(ScanRequest scan_request, ScanCallback cb) { - ScanSessionId id = absl::Uniform(bit_gen_); + ScanSessionId id = ::crypto::RandData(); RunOnServiceControllerThread( "start-scan", [this, id, scan_request, scan_callback = std::move(cb)]() diff --git a/presence/implementation/scan_manager.h b/presence/implementation/scan_manager.h index 5b51a4be..0a95b269 100644 --- a/presence/implementation/scan_manager.h +++ b/presence/implementation/scan_manager.h @@ -21,7 +21,6 @@ #include #include "absl/container/flat_hash_map.h" -#include "absl/random/random.h" #include "internal/platform/single_thread_executor.h" #include "internal/proto/credential.pb.h" #include "presence/data_types.h" @@ -86,7 +85,6 @@ class ScanManager { absl::flat_hash_map scan_sessions_ ABSL_GUARDED_BY(*executor_); SingleThreadExecutor* executor_; - absl::BitGen bit_gen_; }; } // namespace presence diff --git a/presence/implementation/scan_manager_test.cc b/presence/implementation/scan_manager_test.cc index 648ee886..ce657af5 100644 --- a/presence/implementation/scan_manager_test.cc +++ b/presence/implementation/scan_manager_test.cc @@ -25,7 +25,6 @@ #include "gmock/gmock.h" #include "protobuf-matchers/protocol-buffer-matchers.h" #include "gtest/gtest.h" -#include "absl/random/random.h" #include "absl/time/time.h" #include "internal/platform/bluetooth_adapter.h" #include "internal/platform/count_down_latch.h"