From a9abd469ea6a8aff33db41f9984ea2d85a808d3d Mon Sep 17 00:00:00 2001 From: Colin Kuebler Date: Thu, 2 Jan 2020 16:29:28 -0500 Subject: [PATCH] Update references to Crypto with Cryptodome in discovery and smartconfig components --- scripts/smartconfig/multicast.py | 2 +- scripts/tuya-discovery.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/smartconfig/multicast.py b/scripts/smartconfig/multicast.py index 0eef865..8132fba 100755 --- a/scripts/smartconfig/multicast.py +++ b/scripts/smartconfig/multicast.py @@ -9,7 +9,7 @@ multicast strategy reverse engineered by kueblc from crc import crc_32 -from Crypto.Cipher import AES +from Cryptodome.Cipher import AES pad = lambda data, block_size : data + ('\0' * ( (block_size - len(data)) % block_size ) ) aes = AES.new( b'a3c6794oiu876t54', AES.MODE_ECB ) encrypt = lambda data : aes.encrypt( pad(data, 16).encode() ) diff --git a/scripts/tuya-discovery.py b/scripts/tuya-discovery.py index 1febbe7..9d0981c 100755 --- a/scripts/tuya-discovery.py +++ b/scripts/tuya-discovery.py @@ -9,11 +9,11 @@ Discover Tuya devices on the LAN via UDP broadcast import asyncio import json -from Crypto.Cipher import AES +from Cryptodome.Cipher import AES pad = lambda s: s + (16 - len(s) % 16) * chr(16 - len(s) % 16) unpad = lambda s: s[:-ord(s[len(s) - 1:])] -encrypt = lambda msg, key: AES.new(key, AES.MODE_ECB).encrypt(pad(msg)) -decrypt = lambda msg, key: unpad(AES.new(key, AES.MODE_ECB).decrypt(msg)) +encrypt = lambda msg, key: AES.new(key.encode(), AES.MODE_ECB).encrypt(pad(msg).encode()) +decrypt = lambda msg, key: unpad(AES.new(key.encode(), AES.MODE_ECB).decrypt(msg.encode())) from hashlib import md5 udpkey = md5(b"yGAdlopoPVldABfn").digest()