Release v1, update copyrights

CalebFenton · CalebFenton · commit eb8571c4ca5f · 2017-03-09T11:25:34.000-08:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,31 +7,30 @@
 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):
     for filename in fnmatch.filter(filenames, '*.yara'):
         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 ..."

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2016 RedNaga. http://rednaga.io`
	`2`	`+ * Copyright (C) 2017 RedNaga. http://rednaga.io`
`3`	`3`	`* All rights reserved. Contact: rednaga@protonmail.com`
`4`	`4`	`*`
`5`	`5`	`*`