From 9bdef6ede44974bfa8ce9ec9faae5ed006ed5d00 Mon Sep 17 00:00:00 2001 From: Nex Date: Thu, 10 Mar 2022 11:35:49 +0100 Subject: [PATCH] Fixing spacing --- mvt/android/modules/adb/sms.py | 1 - mvt/android/parsers/backup.py | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/mvt/android/modules/adb/sms.py b/mvt/android/modules/adb/sms.py index fa5f154..5d85d98 100644 --- a/mvt/android/modules/adb/sms.py +++ b/mvt/android/modules/adb/sms.py @@ -110,7 +110,6 @@ class SMS(AndroidExtraction): log.info("Extracted a total of %d SMS messages containing links", len(self.results)) - def _extract_sms_adb(self): """Use the Android backup command to extract SMS data from the native SMS app diff --git a/mvt/android/parsers/backup.py b/mvt/android/parsers/backup.py index f87a736..d5612a7 100644 --- a/mvt/android/parsers/backup.py +++ b/mvt/android/parsers/backup.py @@ -64,6 +64,7 @@ def parse_ab_header(data): "encryption": None } + def decrypt_master_key(password, user_salt, user_iv, pbkdf2_rounds, master_key_blob, format_version, checksum_salt): """Generate AES key from user password uisng PBKDF2 @@ -107,6 +108,7 @@ def decrypt_master_key(password, user_salt, user_iv, pbkdf2_rounds, master_key_b return master_key, master_iv + def decrypt_backup_data(encrypted_backup, password, encryption_algo, format_version): """ Generate encryption keyffrom password and do decryption @@ -137,6 +139,7 @@ def decrypt_backup_data(encrypted_backup, password, encryption_algo, format_vers unpadder = padding.PKCS7(128).unpadder() return unpadder.update(decrypted_tar) + def parse_backup_file(data, password=None): """ Parse an ab file, returns a tar file