Skip to content

refactor: do not use service_data mac #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
IvoGruber wants to merge 1 commit into from
Closed

refactor: do not use service_data mac #323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions src/bthome_ble/parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,19 +420,6 @@ def _set_manufacture_name_type_and_title(
self.set_title(f"{name} {identifier}")
self.set_device_type(device_type)

def _get_mac_readable(
self, service_info: BluetoothServiceInfoBleak, service_data: bytes
) -> str:
match self.bthome_version:
case BTHomeVersion.V1:
return service_info.address
case BTHomeVersion.V2:
if is_mac_included(service_data):
return get_mac(service_data)
return service_info.address
case _:
raise ValueError

def _get_payload(self, service_data: bytes) -> bytes:
match self.bthome_version:
case BTHomeVersion.V1:
Expand Down Expand Up @@ -802,7 +789,7 @@ def _get_nonce(
) -> bytes:
"""Creates the nounce for decryption."""
counter = get_counter(service_data)
mac_readable = self._get_mac_readable(service_info, service_data)
mac_readable = service_info.address
bthome_mac = bytes.fromhex(mac_readable.replace(":", ""))
match self.bthome_version:
case BTHomeVersion.V1:
Expand Down Expand Up @@ -848,15 +835,14 @@ def _check_empty_decrypted_payload(
self,
decrypted_payload: bytes | None,
service_info: BluetoothServiceInfoBleak,
service_data: bytes,
) -> None:
"""Raises an ValueError if decrypted values is empty."""
if decrypted_payload is None:
self.bindkey_verified = False
_LOGGER.error(
"%s: Decryption failed for %s, decrypted payload is None",
self.title,
self._get_mac_readable(service_info, service_data),
service_info.address,
)
raise ValueError

Expand Down Expand Up @@ -887,9 +873,7 @@ def _decrypt_bthome(
)
except InvalidTag as error:
self._handle_decryption_error(error, encrypted_payload, nonce, mic)
self._check_empty_decrypted_payload(
decrypted_payload, service_info, service_data
)
self._check_empty_decrypted_payload(decrypted_payload, service_info)

self.decryption_failed = False
self.bindkey_verified = True
Expand Down