blackteay/kobackupdec
1
0
Fork 0
mirror of https://github.com/RealityNet/kobackupdec.git synced 2025-04-06 04:00:08 +08:00
Code Issues Projects Releases Wiki Activity

Added fixes by @realSnoopy

Browse Source
This commit is contained in:
dfirfpi 2020-06-07 18:10:50 +02:00
parent 3a587e38a2
commit 13326d9511
No known key found for this signature in database
GPG Key ID: EC61291E5446B028
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
kobackupdec.py
View File

@ -4,6 +4,7 @@
# Huawei KoBackup backups decryptor. # Huawei KoBackup backups decryptor.
# #
# Version History # Version History
# - 20200607: merged empty CheckMsg, update folder_to_media_type by @realSnoopy
# - 20200406: merged pull by @lp4n6, related to files and folders permissions # - 20200406: merged pull by @lp4n6, related to files and folders permissions
# - 20200405: added Python minor version check and note (thanks @lp4n6) # - 20200405: added Python minor version check and note (thanks @lp4n6)
# - 2020test: rewritten to handle v9 and v10 backups # - 2020test: rewritten to handle v9 and v10 backups
@ -56,7 +57,7 @@ from Crypto.Hash import HMAC
from Crypto.Protocol.KDF import PBKDF2 from Crypto.Protocol.KDF import PBKDF2
from Crypto.Util import Counter from Crypto.Util import Counter
VERSION = '20200406' VERSION = '20200607'
# Disabling check on doc strings and naming convention. # Disabling check on doc strings and naming convention.
# pylint: disable=C0111,C0103 # pylint: disable=C0111,C0103
@ -267,20 +268,25 @@ class Decryptor:
binascii.hexlify(self._bkey_sha256)) binascii.hexlify(self._bkey_sha256))
salt = self._checkMsg[32:] salt = self._checkMsg[32:]
logging.debug('SALT[%s] = %s', len(salt), binascii.hexlify(salt)) if salt:
logging.debug('SALT[%s] = %s', len(salt), binascii.hexlify(salt))
res = PBKDF2(self._bkey, salt, Decryptor.dklen, Decryptor.count, res = PBKDF2(self._bkey, salt, Decryptor.dklen, Decryptor.count,
Decryptor.prf, hmac_hash_module=None) Decryptor.prf, hmac_hash_module=None)
logging.debug('KEY check expected = %s', logging.debug('KEY check expected = %s',
binascii.hexlify(self._checkMsg[:32])) binascii.hexlify(self._checkMsg[:32]))
logging.debug('RESULT = %s', binascii.hexlify(res)) logging.debug('RESULT = %s', binascii.hexlify(res))
if res == self._checkMsg[:32]: if res == self._checkMsg[:32]:
logging.info('OK, backup key is correct!') logging.info('OK, backup key is correct!')
self._good = True self._good = True
else:
logging.error('KO, backup key is wrong!')
self._good = False
else: else:
logging.error('KO, backup key is wrong!') logging.warning('Empty CheckMsg! Cannot check backup password!')
self._good = False logging.warning('Assuming the provided password is correct...')
self._good = True
def decrypt_package(self, dec_material, data): def decrypt_package(self, dec_material, data):
if not self._good: if not self._good:
@ -711,7 +717,8 @@ def decrypt_files_in_root(decrypt_info, path_in, path_out):
def decrypt_files_in_folder(decrypt_info, folder, path_out): def decrypt_files_in_folder(decrypt_info, folder, path_out):
folder_to_media_type = {'movies': 'video', 'pictures': 'photo'} folder_to_media_type = {'movies': 'video', 'pictures': 'photo',
'audios': 'audio', }
media_out_dir = path_out.absolute().joinpath('storage') media_out_dir = path_out.absolute().joinpath('storage')
media_unk_dir = path_out.absolute().joinpath('unknown') media_unk_dir = path_out.absolute().joinpath('unknown')