From 9b64982af0c2cfe849fe789de838dcc0395ee21a Mon Sep 17 00:00:00 2001 From: Yuxin Wu Date: Fri, 17 Jul 2020 12:06:01 -0700 Subject: [PATCH] fix encoding (fix #67) --- decrypt-db.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/decrypt-db.py b/decrypt-db.py index 04fd32c..91d841b 100755 --- a/decrypt-db.py +++ b/decrypt-db.py @@ -116,10 +116,18 @@ def get_imei(): candidates.append(imei) logger.info(f"found imei={imei} in CompatibleInfo.cfg") logger.info(f"Possible imei: {candidates}") - return [x.encode('ascii') for x in set(candidates)] + return list(set(candidates)) def get_key(imei, uin): + """ + Args: + imei, uin: str + """ + if isinstance(uin, str): + uin = uin.encode('ascii') + if isinstance(imei, str): + imei = imei.encode('ascii') a = md5(imei + uin) return a.hexdigest()[:7] @@ -162,7 +170,6 @@ if __name__ == "__main__": output_file = args.input + ".decrypted" assert not os.path.isfile(output_file), f"Output {output_file} exists!" for uin in uins: - uin = str(uin).encode('ascii') for imei in imeis: key = get_key(imei, uin) logger.info(f"Trying key {key} ...")