TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Turn off encryption over AWDL for upgrade transmissions

Browse Source 
PiperOrigin-RevId: 766826551
This commit is contained in:
Guogang Li
2025-06-03 14:41:21 -07:00
committed by Copybara-Service
parent e96ebef1d3
commit a45c18eb14
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/awdl_bwu_handler.cc
+5 -1
View File
@@ -233,7 +233,11 @@ ByteArray AwdlBwuHandler::HandleInitializeUpgradedMediumForEndpoint(
<< " and service_type: " << service_type
<< " and has password: " << (password.empty() ? "false" : "true");
return parser::ForBwuAwdlPathAvailable(service_name, service_type, password);
// The AWDL upgraded medium is running under TLS, so we don't need to
// encryption for it again.
return parser::ForBwuAwdlPathAvailable(
service_name, service_type, password,
/*supports_disabling_encryption=*/true);
}
void AwdlBwuHandler::HandleRevertInitiatorStateForService(
connections/implementation/offline_frames.cc
+4 -1
View File
@@ -307,7 +307,8 @@ ByteArray ForBwuWifiLanPathAvailable(const std::string& ip_address,
ByteArray ForBwuAwdlPathAvailable(const std::string& service_name,
const std::string& service_type,
const std::string& password) {
const std::string& password,
bool supports_disabling_encryption) {
OfflineFrame frame;
frame.set_version(OfflineFrame::V1);
@@ -319,6 +320,8 @@ ByteArray ForBwuAwdlPathAvailable(const std::string& service_name,
auto* upgrade_path_info = sub_frame->mutable_upgrade_path_info();
upgrade_path_info->set_medium(UpgradePathInfo::AWDL);
upgrade_path_info->set_supports_client_introduction_ack(true);
upgrade_path_info->set_supports_disabling_encryption(
supports_disabling_encryption);
auto* awdl_socket = upgrade_path_info->mutable_awdl_credentials();
awdl_socket->set_service_name(service_name);
awdl_socket->set_service_type(service_type);
connections/implementation/offline_frames.h
+2 -1
View File
@@ -84,7 +84,8 @@ ByteArray ForBwuWifiLanPathAvailable(const std::string& ip_address,
std::int32_t port);
ByteArray ForBwuAwdlPathAvailable(const std::string& service_name,
const std::string& service_type,
const std::string& password);
const std::string& password,
bool supports_disabling_encryption);
ByteArray ForBwuWifiAwarePathAvailable(const std::string& service_id,
const std::string& service_info,
const std::string& password,
connections/implementation/offline_frames_test.cc
+3 -2
View File
@@ -447,11 +447,12 @@ TEST(OfflineFramesTest, CanGenerateBwuAwdlPathAvailable) {
service_type: "nearby_upgrade"
password: "password"
>
supports_disabling_encryption: true
>
>
>)pb";
ByteArray bytes =
ForBwuAwdlPathAvailable("service_name", "nearby_upgrade", "password");
ByteArray bytes = ForBwuAwdlPathAvailable("service_name", "nearby_upgrade",
"password", true);
auto response = FromBytes(bytes);
ASSERT_TRUE(response.ok());
OfflineFrame message = response.result();