pyezvizapi 1.0.4.1__py3-none-any.whl → 1.0.4.2__py3-none-any.whl

pyezvizapi/utils.py

@@ -153,39 +153,102 @@ def decrypt_image(input_data: bytes, password: str) -> bytes:
         bytes: Decrypted image data
 
     """
-    if len(input_data) < 48:
-        raise PyEzvizError("Invalid image data")
-
-    # check header
     header_len = len(HIK_ENCRYPTION_HEADER)
+    min_length = header_len + 32  # header + md5 hash
 
-    if input_data[:header_len] != HIK_ENCRYPTION_HEADER:
+    if len(input_data) < min_length:
+        raise PyEzvizError("Invalid image data")
+
+    header_index = input_data.find(HIK_ENCRYPTION_HEADER)
+    if header_index == -1:
         _LOGGER.debug("Image header doesn't contain %s", HIK_ENCRYPTION_HEADER)
         return input_data
 
-    file_hash = input_data[16:48]
+    if header_index:
+        _LOGGER.debug("Image header found at offset %s, trimming preamble", header_index)
+        input_data = input_data[header_index:]
+        if len(input_data) < min_length:
+            raise PyEzvizError("Invalid image data after trimming preamble")
+
+    hash_end = header_len + 32
+    blocks = _split_encrypted_blocks(input_data, header_len, min_length)
+    if not blocks:
+        raise PyEzvizError("Invalid image data")
+
+    decrypted_parts = [
+        _decrypt_single_block(block, password, header_len, hash_end) for block in blocks
+    ]
+    if len(decrypted_parts) > 1:
+        _LOGGER.debug("Decrypted %s concatenated image blocks", len(decrypted_parts))
+    return b"".join(decrypted_parts)
+
+
+def _split_encrypted_blocks(
+    data: bytes, header_len: int, min_length: int
+) -> list[bytes]:
+    """Split concatenated hikencodepicture segments into individual blocks."""
+    blocks: list[bytes] = []
+    cursor = 0
+    data_len = len(data)
+
+    while cursor <= data_len - min_length:
+        if data[cursor : cursor + header_len] != HIK_ENCRYPTION_HEADER:
+            next_header = data.find(HIK_ENCRYPTION_HEADER, cursor + 1)
+            if next_header == -1:
+                break
+            cursor = next_header
+            continue
+
+        next_header = data.find(HIK_ENCRYPTION_HEADER, cursor + header_len)
+        block = data[cursor : next_header if next_header != -1 else data_len]
+        if len(block) < min_length:
+            break
+        blocks.append(block)
+        if next_header == -1:
+            break
+        cursor = next_header
+
+    return blocks
+
+
+def _decrypt_single_block(
+    block: bytes, password: str, header_len: int, hash_end: int
+) -> bytes:
+    """Decrypt a single hikencodepicture block."""
+    file_hash = block[header_len:hash_end]
     passwd_hash = md5(str.encode(md5(str.encode(password)).hexdigest())).hexdigest()
     if file_hash != str.encode(passwd_hash):
         raise PyEzvizError("Invalid password")
 
+    ciphertext = block[hash_end:]
+    if not ciphertext:
+        raise PyEzvizError("Missing ciphertext payload")
+
+    remainder = len(ciphertext) % AES.block_size
+    if remainder:
+        _LOGGER.debug(
+            "Ciphertext not aligned to 16 bytes; trimming %s trailing bytes", remainder
+        )
+        ciphertext = ciphertext[:-remainder]
+    if not ciphertext:
+        raise PyEzvizError("Ciphertext too short after alignment adjustment")
+
     key = str.encode(password.ljust(16, "\u0000")[:16])
     iv_code = bytes([48, 49, 50, 51, 52, 53, 54, 55, 0, 0, 0, 0, 0, 0, 0, 0])
     cipher = AES.new(key, AES.MODE_CBC, iv_code)
 
-    next_chunk = b""
-    output_data = b""
-    finished = False
-    i = 48  # offset HIK header + hash
     chunk_size = 1024 * AES.block_size
-    while not finished:
-        chunk, next_chunk = next_chunk, cipher.decrypt(input_data[i : i + chunk_size])
-        if len(next_chunk) == 0:
-            padding_length = chunk[-1]
-            chunk = chunk[:-padding_length]
-            finished = True
-        output_data += chunk
-        i += chunk_size
-    return output_data
+    output_data = bytearray()
+
+    for start in range(0, len(ciphertext), chunk_size):
+        block_chunk = cipher.decrypt(ciphertext[start : start + chunk_size])
+        if start + chunk_size >= len(ciphertext):
+            padding_length = block_chunk[-1]
+            block_chunk = block_chunk[:-padding_length]
+        output_data.extend(block_chunk)
+
+    return bytes(output_data)
+
 
 
 def return_password_hash(password: str) -> str:

{pyezvizapi-1.0.4.1.dist-info → pyezvizapi-1.0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyezvizapi
-Version: 1.0.4.1
+Version: 1.0.4.2
 Summary: EZVIZ API client for Home Assistant and CLI
 Home-page: https://github.com/RenierM26/pyEzvizApi/
 Author: Renier Moorcroft

{pyezvizapi-1.0.4.1.dist-info → pyezvizapi-1.0.4.2.dist-info}/RECORD

@@ -12,10 +12,10 @@ pyezvizapi/models.py,sha256=NQzwTP0yEe2IWU-Vc6nAn87xulpTuo0MX2Rcf0WxifA,4176
 pyezvizapi/mqtt.py,sha256=JGjO-uXdKtLidYN1wEZ_bxEKIlNLmnB82Ziiac6oxWs,22373
 pyezvizapi/test_cam_rtsp.py,sha256=pbuanoKs_Pryt2f5QctHIngzJG1nD6kv8nulQYh2yPc,5162
 pyezvizapi/test_mqtt.py,sha256=gBaurvo2bu-7sOe14AqNouepJHI-tPWzC3WTpDQbvHM,4155
-pyezvizapi/utils.py,sha256=WHGqI0bIy-G4yX6Vs7i_UDrr7dndx3yzbF_z7rDYGKE,13213
-pyezvizapi-1.0.4.1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.4.1.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pyezvizapi-1.0.4.1.dist-info/METADATA,sha256=aBfPakdjFSnVKiCtzCGzlA3RO515bTwdU5SDztAkSiw,7609
-pyezvizapi-1.0.4.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyezvizapi-1.0.4.1.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
-pyezvizapi-1.0.4.1.dist-info/RECORD,,
+pyezvizapi/utils.py,sha256=B-Lt4p14TTcJyrZvJ699GiUGj6qcd4vGmkKUf13bf_I,15455
+pyezvizapi-1.0.4.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.4.2.dist-info/licenses/LICENSE.md,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pyezvizapi-1.0.4.2.dist-info/METADATA,sha256=_fdaKK2rdx9u4pHrjjkDHvBYZs5rTJqrh0OqkTioojg,7609
+pyezvizapi-1.0.4.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyezvizapi-1.0.4.2.dist-info/top_level.txt,sha256=gMZTelIi8z7pXyTCQLLaIkxVRrDQ_lS2NEv0WgfHrHs,11
+pyezvizapi-1.0.4.2.dist-info/RECORD,,