Skip to content

Avoid temp array during encrypt and decrypt #204

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

Merged
rytilahti merged 5 commits into from
Sep 23, 2021
Merged

Avoid temp array during encrypt and decrypt #204

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c79ff46
Avoid temp array during encrypt
bdraco Sep 22, 2021
255d952
black
bdraco Sep 22, 2021
14513a1
Update kasa/protocol.py
bdraco Sep 23, 2021
f6fa8de
Update kasa/protocol.py
bdraco Sep 23, 2021
e78aa2f
update decrypt as well
bdraco Sep 23, 2021
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
38 changes: 19 additions & 19 deletions kasa/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,24 +89,32 @@ async def query(host: str, request: Union[str, Dict], retry_count: int = 3) -> D
# make mypy happy, this should never be reached..
raise SmartDeviceException("Query reached somehow to unreachable")

@staticmethod
def _xor_payload(unencrypted):
key = TPLinkSmartHomeProtocol.INITIALIZATION_VECTOR
for unencryptedbyte in unencrypted:
key = key ^ unencryptedbyte
yield key

@staticmethod
def encrypt(request: str) -> bytes:
"""Encrypt a request for a TP-Link Smart Home Device.

:param request: plaintext request data
:return: ciphertext to be send over wire, in bytes
"""
key = TPLinkSmartHomeProtocol.INITIALIZATION_VECTOR

plainbytes = request.encode()
buffer = bytearray(struct.pack(">I", len(plainbytes)))
return struct.pack(">I", len(plainbytes)) + bytes(
TPLinkSmartHomeProtocol._xor_payload(plainbytes)
)

for plainbyte in plainbytes:
cipherbyte = key ^ plainbyte
@staticmethod
def _xor_encrypted_payload(ciphertext):
key = TPLinkSmartHomeProtocol.INITIALIZATION_VECTOR
for cipherbyte in ciphertext:
plainbyte = key ^ cipherbyte
key = cipherbyte
buffer.append(cipherbyte)

return bytes(buffer)
yield plainbyte

@staticmethod
def decrypt(ciphertext: bytes) -> str:
Expand All @@ -115,14 +123,6 @@ def decrypt(ciphertext: bytes) -> str:
:param ciphertext: encrypted response data
:return: plaintext response
"""
key = TPLinkSmartHomeProtocol.INITIALIZATION_VECTOR
buffer = []

for cipherbyte in ciphertext:
plainbyte = key ^ cipherbyte
key = cipherbyte
buffer.append(plainbyte)

plaintext = bytes(buffer)

return plaintext.decode()
return bytes(
TPLinkSmartHomeProtocol._xor_encrypted_payload(ciphertext)
).decode()