Skip to content

Commit 3026904

Browse files
committed
Update config_decryptor_aes_with_iv.py
1 parent 6383643 commit 3026904

1 file changed

Lines changed: 1 addition & 6 deletions

File tree

src/rat_king_parser/config_parser/utils/decryptors/config_decryptor_aes_with_iv.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,8 @@ def decrypt_encrypted_strings(
173173
return decrypted_config_strings
174174

175175
# Extracts AES key candidates from the payload
176-
<<<<<<< Updated upstream
177176
def _get_aes_key_candidates(self, encrypted_strings: dict[str, str]) -> list[bytes]:
178-
=======
179-
def _get_aes_key_candidates(
180-
self, encrypted_strings: dict[str, str]
181-
) -> list[bytes]:
182-
>>>>>>> Stashed changes
177+
183178
logger.debug("Extracting AES key candidates...")
184179
keys = []
185180

0 commit comments

Comments
 (0)