auracaster/bumble_mirror
3
0
Fork 1
mirror of https://github.com/google/bumble.git synced 2026-05-08 03:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add maximum encryption key size to PairingDelegate

Browse Source 
So far the maxmium encryption key size has been hardcoded to 16 bytes in
'send_pairing_request_command()' and 'send_pairing_response_comman()'. By
making this configurable via the PairingDelegate, one can test how devices
respond to smaller encryption key sizes. Default remains 16 bytes.
This commit is contained in:
Jan-Marcel Dietrich
2024-11-28 14:05:49 +01:00
parent 082d55af10
commit 07f9997a49
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bumble/pairing.py
View File

@@ -139,16 +139,19 @@ class PairingDelegate:
io_capability: IoCapability io_capability: IoCapability
local_initiator_key_distribution: KeyDistribution local_initiator_key_distribution: KeyDistribution
local_responder_key_distribution: KeyDistribution local_responder_key_distribution: KeyDistribution
maximum_encryption_key_size: int
def __init__( def __init__(
self, self,
io_capability: IoCapability = NO_OUTPUT_NO_INPUT, io_capability: IoCapability = NO_OUTPUT_NO_INPUT,
local_initiator_key_distribution: KeyDistribution = DEFAULT_KEY_DISTRIBUTION, local_initiator_key_distribution: KeyDistribution = DEFAULT_KEY_DISTRIBUTION,
local_responder_key_distribution: KeyDistribution = DEFAULT_KEY_DISTRIBUTION, local_responder_key_distribution: KeyDistribution = DEFAULT_KEY_DISTRIBUTION,
maximum_encryption_key_size: int = 16
) -> None: ) -> None:
self.io_capability = io_capability self.io_capability = io_capability
self.local_initiator_key_distribution = local_initiator_key_distribution self.local_initiator_key_distribution = local_initiator_key_distribution
self.local_responder_key_distribution = local_responder_key_distribution self.local_responder_key_distribution = local_responder_key_distribution
self.maximum_encryption_key_size = maximum_encryption_key_size
@property @property
def classic_io_capability(self) -> int: def classic_io_capability(self) -> int:

9
bumble/smp.py
View File

@@ -695,6 +695,7 @@ class Session:
self.ltk_ediv = 0 self.ltk_ediv = 0
self.ltk_rand = bytes(8) self.ltk_rand = bytes(8)
self.link_key: Optional[bytes] = None self.link_key: Optional[bytes] = None
self.maximum_encryption_key_size: int = 0
self.initiator_key_distribution: int = 0 self.initiator_key_distribution: int = 0
self.responder_key_distribution: int = 0 self.responder_key_distribution: int = 0
self.peer_random_value: Optional[bytes] = None self.peer_random_value: Optional[bytes] = None
@@ -741,6 +742,10 @@ class Session:
else: else:
self.pairing_result = None self.pairing_result = None
self.maximum_encryption_key_size = (
pairing_config.delegate.maximum_encryption_key_size
)
# Key Distribution (default values before negotiation) # Key Distribution (default values before negotiation)
self.initiator_key_distribution = ( self.initiator_key_distribution = (
pairing_config.delegate.local_initiator_key_distribution pairing_config.delegate.local_initiator_key_distribution
@@ -993,7 +998,7 @@ class Session:
io_capability=self.io_capability, io_capability=self.io_capability,
oob_data_flag=self.oob_data_flag, oob_data_flag=self.oob_data_flag,
auth_req=self.auth_req, auth_req=self.auth_req,
maximum_encryption_key_size=16, maximum_encryption_key_size=self.maximum_encryption_key_size,
initiator_key_distribution=self.initiator_key_distribution, initiator_key_distribution=self.initiator_key_distribution,
responder_key_distribution=self.responder_key_distribution, responder_key_distribution=self.responder_key_distribution,
) )
@@ -1005,7 +1010,7 @@ class Session:
io_capability=self.io_capability, io_capability=self.io_capability,
oob_data_flag=self.oob_data_flag, oob_data_flag=self.oob_data_flag,
auth_req=self.auth_req, auth_req=self.auth_req,
maximum_encryption_key_size=16, maximum_encryption_key_size=self.maximum_encryption_key_size,
initiator_key_distribution=self.initiator_key_distribution, initiator_key_distribution=self.initiator_key_distribution,
responder_key_distribution=self.responder_key_distribution, responder_key_distribution=self.responder_key_distribution,
) )