From eb8571c4ca5fd70eb5a8c1cc7f50514675d95a2d Mon Sep 17 00:00:00 2001 From: Caleb Fenton Date: Thu, 9 Mar 2017 11:25:34 -0800 Subject: [PATCH] Release v1, update copyrights --- README.md | 6 +++--- README.rst | 4 ++-- apkid/__init__.py | 6 +++--- apkid/apkid.py | 2 +- apkid/rules/apk/common.yara | 2 +- apkid/rules/apk/packers.yara | 4 ++-- apkid/rules/dex/abnormal.yara | 2 +- apkid/rules/dex/anti-vm.yara | 2 +- apkid/rules/dex/common.yara | 2 +- apkid/rules/dex/compilers.yara | 2 +- apkid/rules/dex/obfuscators.yara | 2 +- apkid/rules/dex/packers.yara | 2 +- apkid/rules/elf/anti-vm.yara | 2 +- apkid/rules/elf/packers.yara | 2 +- prep-release.py | 13 ++++++------- 15 files changed, 26 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 32ac81b4..dba14948 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ pip install apkid ``` usage: apkid [-h] [-j] [-t TIMEOUT] [-o DIR] [FILE [FILE ...]] -APKiD - Android Application Identifier v0.9.5 +APKiD - Android Application Identifier v1.0.0 positional arguments: FILE apk, dex, or directory @@ -39,8 +39,8 @@ optional arguments: # Submitting New Packers / Compilers / Obfuscators -If you come across an APK or DEX that APKiD does not recognize, please open a GitHub issue and tell us: -* what you think it is +If you come across an APK or DEX which APKiD does not recognize, please open a GitHub issue and tell us: +* what you think it is * the file hash (either MD5, SHA1, SHA256) We are open to any type of concept you might have for "something interesting" to detect, so do not limit yourself solely to packers, compilers or obfuscators. If there is an interesting anti disassembler, anti vm, anti* trick, please make an issue. diff --git a/README.rst b/README.rst index 9a418c50..8f5c7d9f 100644 --- a/README.rst +++ b/README.rst @@ -37,7 +37,7 @@ Usage usage: apkid [-h] [-j] [-t TIMEOUT] [-o DIR] [FILE [FILE ...]] - APKiD - Android Application Identifier v0.9.5 + APKiD - Android Application Identifier v1.0.0 positional arguments: FILE apk, dex, or directory @@ -53,7 +53,7 @@ Usage Submitting New Packers / Compilers / Obfuscators ================================================ -If you come across an APK or DEX that APKiD does not recognize, please +If you come across an APK or DEX which APKiD does not recognize, please open a GitHub issue and tell us: \* what you think it is \* the file hash (either MD5, SHA1, SHA256) diff --git a/apkid/__init__.py b/apkid/__init__.py index abba5a5d..77e5516b 100644 --- a/apkid/__init__.py +++ b/apkid/__init__.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- """ - Copyright (C) 2016 RedNaga. http://rednaga.io + Copyright (C) 2017 RedNaga. http://rednaga.io All rights reserved. Contact: rednaga@protonmail.com @@ -27,10 +27,10 @@ """ __title__ = 'apkid' -__version__ = '0.9.5' +__version__ = '1.0.0' __author__ = 'Caleb Fenton & Tim Strazzere' __license__ = 'GPL & Commercial' -__copyright__ = 'Copyright (C) 2016 RedNaga' +__copyright__ = 'Copyright (C) 2017 RedNaga' import argparse diff --git a/apkid/apkid.py b/apkid/apkid.py index 432fd8ad..da8c3914 100644 --- a/apkid/apkid.py +++ b/apkid/apkid.py @@ -1,5 +1,5 @@ """ - Copyright (C) 2016 RedNaga. http://rednaga.io + Copyright (C) 2017 RedNaga. http://rednaga.io All rights reserved. Contact: rednaga@protonmail.com diff --git a/apkid/rules/apk/common.yara b/apkid/rules/apk/common.yara index 2b242a3c..1c51ee14 100644 --- a/apkid/rules/apk/common.yara +++ b/apkid/rules/apk/common.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * diff --git a/apkid/rules/apk/packers.yara b/apkid/rules/apk/packers.yara index d3a47053..cefe7c58 100644 --- a/apkid/rules/apk/packers.yara +++ b/apkid/rules/apk/packers.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * @@ -38,7 +38,7 @@ rule dxshield : packer $res = "assets/DXINFO.XML" condition: - is_apk and ($decryptlib and $res) + is_apk and ($decryptlib and $res) } rule secneo : packer diff --git a/apkid/rules/dex/abnormal.yara b/apkid/rules/dex/abnormal.yara index 25eb02da..f213afd2 100644 --- a/apkid/rules/dex/abnormal.yara +++ b/apkid/rules/dex/abnormal.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * diff --git a/apkid/rules/dex/anti-vm.yara b/apkid/rules/dex/anti-vm.yara index 93a8c2bf..c9905c7d 100644 --- a/apkid/rules/dex/anti-vm.yara +++ b/apkid/rules/dex/anti-vm.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * diff --git a/apkid/rules/dex/common.yara b/apkid/rules/dex/common.yara index d6cc70f7..74d469ba 100644 --- a/apkid/rules/dex/common.yara +++ b/apkid/rules/dex/common.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * diff --git a/apkid/rules/dex/compilers.yara b/apkid/rules/dex/compilers.yara index b47f350e..d73dad8e 100644 --- a/apkid/rules/dex/compilers.yara +++ b/apkid/rules/dex/compilers.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * diff --git a/apkid/rules/dex/obfuscators.yara b/apkid/rules/dex/obfuscators.yara index c31482f8..31f31a16 100644 --- a/apkid/rules/dex/obfuscators.yara +++ b/apkid/rules/dex/obfuscators.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * diff --git a/apkid/rules/dex/packers.yara b/apkid/rules/dex/packers.yara index 5fa194f3..54c592b4 100644 --- a/apkid/rules/dex/packers.yara +++ b/apkid/rules/dex/packers.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * diff --git a/apkid/rules/elf/anti-vm.yara b/apkid/rules/elf/anti-vm.yara index 1604d218..1b999023 100644 --- a/apkid/rules/elf/anti-vm.yara +++ b/apkid/rules/elf/anti-vm.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * diff --git a/apkid/rules/elf/packers.yara b/apkid/rules/elf/packers.yara index b1066973..633ed118 100644 --- a/apkid/rules/elf/packers.yara +++ b/apkid/rules/elf/packers.yara @@ -1,5 +1,5 @@ /* - * Copyright (C) 2016 RedNaga. http://rednaga.io + * Copyright (C) 2017 RedNaga. http://rednaga.io * All rights reserved. Contact: rednaga@protonmail.com * * diff --git a/prep-release.py b/prep-release.py index 3033fd5d..3ea9ca01 100755 --- a/prep-release.py +++ b/prep-release.py @@ -7,13 +7,13 @@ import yara rules_dir = 'apkid/rules/' -compiled_rules_path = "%srules.yarc" % rules_dir +compiled_rules_path = os.path.join(rules_dir, 'rules.yarc') -print "[*] Converting Markdown README to reStructuredText" +print("[*] Converting Markdown README to reStructuredText") rst = pypandoc.convert_file('README.md', 'rst') with open('README.rst', 'w+', encoding='utf-8') as f: f.write(rst) -print "[*] Finished converting to README.rst ({} bytes)".format(len(rst)) +print("[*] Finished converting to README.rst ({} bytes)").format(len(rst)) yara_files = {} for root, dirnames, filenames in os.walk(rules_dir): @@ -21,17 +21,16 @@ path = os.path.join(root, filename) yara_files[path] = path -# print yara_files -print "[*] Compiling {} Yara rule files".format(len(yara_files)) +print("[*] Compiling {} Yara rule files").format(len(yara_files)) rules = yara.compile(filepaths=yara_files) rules.save(compiled_rules_path) count = 0 for _ in rules: count += 1 -print "[*] Saved {} rules to {}".format(count, compiled_rules_path) +print("[*] Saved {} rules to {}").format(count, compiled_rules_path) -# print "[*] Registering ..." +# print("[*] Registering ...") # os.system("python setup.py register") # print "[*] Cleaning up ..."