From eea1416911425a79293b970fa32657c8cd641e43 Mon Sep 17 00:00:00 2001 From: K4YT3X Date: Wed, 21 Aug 2019 11:03:37 -0400 Subject: [PATCH 1/3] organized code, using pathlib instead of string, using pyzipper instead of pyminizip, etc. --- prep_file.py | 161 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 95 insertions(+), 66 deletions(-) diff --git a/prep_file.py b/prep_file.py index c7ca105..1292492 100644 --- a/prep_file.py +++ b/prep_file.py @@ -1,84 +1,113 @@ -#!/usr/bin/python +#!/usr/bin/env python3 +# -*- coding: utf-8 -*- +""" +Name: Prep File +Author: ytisf +Date of Creation: Unknown +Last Modified: May 26, 2019 -import os -import sys +Dev: K4YT3X +Last Modified: August 21, 2019 + +Licensed under the GNU General Public License Version 3 (GNU GPL v3), + available at: https://www.gnu.org/licenses/gpl-3.0.txt +(C) 2014-2019 ytisf +""" + +# built-in imports import hashlib +import pathlib +import sys +import time +import traceback try: - import pyminizip -except ImportError: - sys.stderr.write("Could not import 'pyminizip'. Did you install requirements?\n") - sys.stderr.write("You can always just get 'pyminizip' by 'pip install --user pyminizip'.\n") - sys.exit(1) + import pyzipper +except ImportError as e: + print('Could not import "pyzipper". Did you install requirements?', file=sys.stderr) + print('You can always just get "pyzipper" by "pip install --user pyzipper"', file=sys.stderr) + raise e -OUTPUT_FOLDER = "OUTPUT" +COMPRESSION_PASSWORD = 'infected' +OUTPUT_FOLDER = pathlib.Path('OUTPUT') -def _help(): +def print_help(): + """ print help message + + print program help message and return None """ - hmmmm. nope. - :return: - """ - print("Please run with '%s filename'." % sys.argv[0]) + print(f'usage: {__file__} [INPUT_FILE]') return -def _Do(file_path): +def prepare_file(file_path): + """ prep file from file path for submission + + take file name, encrypt in ZIP with password 'infected', create MD5 + and SHA1 sums and store all of that in a directory of it's own + + Arguments: + file_path {pathlib.Path} -- path object of input file """ - Prep file from file path for submission. Take file name, encrypt in ZIP with password 'infected', create MD5 - and SHA1 sums and store all of that in a directory of it's own. - :param file_path: str - :return: Bool - """ - if not os.path.isfile(file_path): - _help() - sys.stderr.write("Seems like '%s' is not a file.\n" % file_path) - return False + OUTPUT_FOLDER.mkdir(parents=True, exist_ok=True) - try: - os.mkdir(OUTPUT_FOLDER) - except OSError: - sys.stderr.write("Folder exists. Please remove it before continuing.\n") - return False + # create ZIP Archive + # we are using 7z because "zipfile" did not support adding a password + # Apparently "pyminizip" works just as well. + print('Info: Creating encrypted ZIP archive') + with pyzipper.AESZipFile(OUTPUT_FOLDER / f'{file_path.name}.zip', 'w', compression=pyzipper.ZIP_LZMA, encryption=pyzipper.WZ_AES) as zip_file: + zip_file.setpassword(COMPRESSION_PASSWORD.encode()) + zip_file.write(file_path) + print('Info: Created ZIP archive') - if "\\" in file_path: - filename = file_path.split("\\")[:-1] - elif "/" in file_path: - filename = file_path.split("/")[:-1] - else: - filename = file_path + # calculating file hashes + md5sum = hashlib.md5(open(OUTPUT_FOLDER / f'{file_path.name}.zip', 'rb').read()).hexdigest() + sha1sum = hashlib.sha1(open(OUTPUT_FOLDER / f'{file_path.name}.zip', 'rb').read()).hexdigest() - # Create ZIP Archive: - # We used 7z because 'zipfile' did not support adding a password. Apparently 'pyminizip' works just as well. - try: - pyminizip.compress(file_path, OUTPUT_FOLDER, "%s.zip" % filename, "infected", 9) - except Exception as e: - sys.stderr.write("Unknown error occurred. Please report this to us so that we can fix this.\n") - sys.stderr.write(str(e)) - return False - - compressed_path = '%s/%s.zip' % (OUTPUT_FOLDER, filename) - sys.stdout.write("[+]\tCreated ZIP Archive.\n") - md5sum = hashlib.md5(open(compressed_path, 'rb').read()).hexdigest() - sha1sum = hashlib.sha1(open(compressed_path, 'rb').read()).hexdigest() - open("%s/%s.md5" % (OUTPUT_FOLDER, filename), 'w').write(md5sum) - open("%s/%s.sha" % (OUTPUT_FOLDER, filename), 'w').write(sha1sum) - open("%s/%s.pass" % (OUTPUT_FOLDER, filename), 'w').write("infected") - return True + # writing file hashes and password to files + open(OUTPUT_FOLDER / f'{file_path.name}.md5', 'w').write(md5sum) + open(OUTPUT_FOLDER / f'{file_path.name}.sha', 'w').write(sha1sum) + open(OUTPUT_FOLDER / f'{file_path.name}.pass', 'w').write(COMPRESSION_PASSWORD) -if __name__ == "__main__": - if len(sys.argv) != 2: - _help() - sys.exit(1) - stt = _Do(sys.argv[1]) - if stt: - sys.stdout.write("Please don't forget to add details to 'conf/maldb.db' " - "and placing the folder in the appropriate directory.\n") - sys.stdout.write("Thanks for helping us get this accessible to everyone.\n") - sys.stdout.write("\n") - sys.exit(0) - else: - sys.exit(1) - +# start timer +start_time = time.time() + +# if this file is being imported +if __name__ != '__main__': + print('Error: This file cannot be imported', file=sys.stderr) + ImportError('File not importable') + +# check if there's a right amount of arguments provided +if len(sys.argv) != 2: + print_help() + exit(1) + +# convert input file path into file object +try: + input_file = pathlib.Path(sys.argv[1]) +except Exception: + print('Error: input file format invalid', file=sys.stderr) + +# input file validity check +if not input_file.is_file(): + print_help() + print(f'Seems like {str(input_file)} is not a file', file=sys.stderr) + exit(1) + +# zip file +try: + prepare_file(input_file) +except Exception: + print('Unexpected exception has been caught') + print('Compression has failed') + print('Please report the following error message to us so we can fix it') + traceback.print_exc() + exit(1) + +print('Script finished') +print(f'Time taken: {round((time.time() - start_time), 5)} seconds') +print('Please don\'t forget to add details to "conf/maldb.db" and placing the folder in the appropriate directory') +print('Thanks for helping us to get this accessible to everyone') From aacd0da1edb6df79bf24dd746c441598f192a645 Mon Sep 17 00:00:00 2001 From: K4YT3X Date: Wed, 21 Aug 2019 11:21:26 -0400 Subject: [PATCH 2/3] renamed files to match database records --- .../{SkyGoFree.md5 => Android.Skygofree.md5} | 0 .../{SkyGoFree.pass => Android.Skygofree.pass} | 0 .../{SkyGoFree.sha1 => Android.Skygofree.sha1} | 0 .../{SkyGoFree.zip => Android.Skygofree.zip} | Bin ...cker20Nov2013.md5 => CryptoLocker_20Nov2013.md5} | 0 ...er20Nov2013.pass => CryptoLocker_20Nov2013.pass} | 0 ...Nov2013.sha256 => CryptoLocker_20Nov2013.sha256} | 0 ...cker20Nov2013.zip => CryptoLocker_20Nov2013.zip} | Bin .../{OSX.OceanLotus.A.B.md5 => OSX.OceanLotus.md5} | 0 ...{OSX.OceanLotus.A.B.pass => OSX.OceanLotus.pass} | 0 .../{OSX.OceanLotus.A.B.sha => OSX.OceanLotus.sha} | 0 .../{OSX.OceanLotus.A.B.zip => OSX.OceanLotus.zip} | Bin .../Trojan.Destover-SonySigned.md5} | 0 .../Trojan.Destover-SonySigned.pass} | 0 .../Trojan.Destover-SonySigned.sha256} | 0 .../Trojan.Destover-SonySigned.zip} | Bin .../{Torjan.Sinowal.md5 => Trojan.Sinowal.md5} | 0 .../{Torjan.Sinowal.pass => Trojan.Sinowal.pass} | 0 ...{Torjan.Sinowal.sha256 => Trojan.Sinowal.sha256} | 0 .../{Torjan.Sinowal.zip => Trojan.Sinowal.zip} | Bin .../Win32.Invicea_Tunnel.md5 | 0 .../Win32.Invicea_Tunnel.pass | 0 .../Win32.Invicea_Tunnel.sha256 | 0 .../Win32.Invicea_Tunnel.zip | Bin .../Win32.Reveton.md5} | 0 .../Win32.Reveton.pass} | 0 .../Win32.Reveton.sha256} | 0 .../Win32.Reveton.zip} | Bin .../{Win32.XAgent.bin.zip => Win32.XAgent.zip} | Bin .../ZeusVM.md5 => Win32.ZeusVM/Win32.ZeusVM.md5} | 0 .../ZeusVM.pass => Win32.ZeusVM/Win32.ZeusVM.pass} | 0 .../Win32.ZeusVM.sha256} | 0 .../ZeusVM.zip => Win32.ZeusVM/Win32.ZeusVM.zip} | Bin 33 files changed, 0 insertions(+), 0 deletions(-) rename malwares/Binaries/Android.Skygofree/{SkyGoFree.md5 => Android.Skygofree.md5} (100%) rename malwares/Binaries/Android.Skygofree/{SkyGoFree.pass => Android.Skygofree.pass} (100%) rename malwares/Binaries/Android.Skygofree/{SkyGoFree.sha1 => Android.Skygofree.sha1} (100%) rename malwares/Binaries/Android.Skygofree/{SkyGoFree.zip => Android.Skygofree.zip} (100%) rename malwares/Binaries/CryptoLocker_20Nov2013/{CryptoLocker20Nov2013.md5 => CryptoLocker_20Nov2013.md5} (100%) rename malwares/Binaries/CryptoLocker_20Nov2013/{CryptoLocker20Nov2013.pass => CryptoLocker_20Nov2013.pass} (100%) rename malwares/Binaries/CryptoLocker_20Nov2013/{CryptoLocker20Nov2013.sha256 => CryptoLocker_20Nov2013.sha256} (100%) rename malwares/Binaries/CryptoLocker_20Nov2013/{CryptoLocker20Nov2013.zip => CryptoLocker_20Nov2013.zip} (100%) rename malwares/Binaries/OSX.OceanLotus/{OSX.OceanLotus.A.B.md5 => OSX.OceanLotus.md5} (100%) rename malwares/Binaries/OSX.OceanLotus/{OSX.OceanLotus.A.B.pass => OSX.OceanLotus.pass} (100%) rename malwares/Binaries/OSX.OceanLotus/{OSX.OceanLotus.A.B.sha => OSX.OceanLotus.sha} (100%) rename malwares/Binaries/OSX.OceanLotus/{OSX.OceanLotus.A.B.zip => OSX.OceanLotus.zip} (100%) rename malwares/Binaries/{Trojan.Destover-Sony/Trojan.Destover-Sony.md5 => Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.md5} (100%) rename malwares/Binaries/{Trojan.Destover-Sony/Trojan.Destover-Sony.pass => Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.pass} (100%) rename malwares/Binaries/{Trojan.Destover-Sony/Trojan.Destover-Sony.sha256 => Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.sha256} (100%) rename malwares/Binaries/{Trojan.Destover-Sony/Trojan.Destover-Sony.zip => Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.zip} (100%) rename malwares/Binaries/Trojan.Sinowal/{Torjan.Sinowal.md5 => Trojan.Sinowal.md5} (100%) rename malwares/Binaries/Trojan.Sinowal/{Torjan.Sinowal.pass => Trojan.Sinowal.pass} (100%) rename malwares/Binaries/Trojan.Sinowal/{Torjan.Sinowal.sha256 => Trojan.Sinowal.sha256} (100%) rename malwares/Binaries/Trojan.Sinowal/{Torjan.Sinowal.zip => Trojan.Sinowal.zip} (100%) rename malwares/Binaries/{Win32.Invincea_Tunnel => Win32.Invicea_Tunnel}/Win32.Invicea_Tunnel.md5 (100%) rename malwares/Binaries/{Win32.Invincea_Tunnel => Win32.Invicea_Tunnel}/Win32.Invicea_Tunnel.pass (100%) rename malwares/Binaries/{Win32.Invincea_Tunnel => Win32.Invicea_Tunnel}/Win32.Invicea_Tunnel.sha256 (100%) rename malwares/Binaries/{Win32.Invincea_Tunnel => Win32.Invicea_Tunnel}/Win32.Invicea_Tunnel.zip (100%) rename malwares/Binaries/{Win32.Reveton.Y/Win32.Reveton.Y.md5 => Win32.Reveton/Win32.Reveton.md5} (100%) rename malwares/Binaries/{Win32.Reveton.Y/Win32.Reveton.Y.pass => Win32.Reveton/Win32.Reveton.pass} (100%) rename malwares/Binaries/{Win32.Reveton.Y/Win32.Reveton.Y.sha256 => Win32.Reveton/Win32.Reveton.sha256} (100%) rename malwares/Binaries/{Win32.Reveton.Y/Win32.Reveton.Y.zip => Win32.Reveton/Win32.Reveton.zip} (100%) rename malwares/Binaries/Win32.XAgent/{Win32.XAgent.bin.zip => Win32.XAgent.zip} (100%) rename malwares/Binaries/{ZeusVM/ZeusVM.md5 => Win32.ZeusVM/Win32.ZeusVM.md5} (100%) rename malwares/Binaries/{ZeusVM/ZeusVM.pass => Win32.ZeusVM/Win32.ZeusVM.pass} (100%) rename malwares/Binaries/{ZeusVM/ZeusVM.sha256 => Win32.ZeusVM/Win32.ZeusVM.sha256} (100%) rename malwares/Binaries/{ZeusVM/ZeusVM.zip => Win32.ZeusVM/Win32.ZeusVM.zip} (100%) diff --git a/malwares/Binaries/Android.Skygofree/SkyGoFree.md5 b/malwares/Binaries/Android.Skygofree/Android.Skygofree.md5 similarity index 100% rename from malwares/Binaries/Android.Skygofree/SkyGoFree.md5 rename to malwares/Binaries/Android.Skygofree/Android.Skygofree.md5 diff --git a/malwares/Binaries/Android.Skygofree/SkyGoFree.pass b/malwares/Binaries/Android.Skygofree/Android.Skygofree.pass similarity index 100% rename from malwares/Binaries/Android.Skygofree/SkyGoFree.pass rename to malwares/Binaries/Android.Skygofree/Android.Skygofree.pass diff --git a/malwares/Binaries/Android.Skygofree/SkyGoFree.sha1 b/malwares/Binaries/Android.Skygofree/Android.Skygofree.sha1 similarity index 100% rename from malwares/Binaries/Android.Skygofree/SkyGoFree.sha1 rename to malwares/Binaries/Android.Skygofree/Android.Skygofree.sha1 diff --git a/malwares/Binaries/Android.Skygofree/SkyGoFree.zip b/malwares/Binaries/Android.Skygofree/Android.Skygofree.zip similarity index 100% rename from malwares/Binaries/Android.Skygofree/SkyGoFree.zip rename to malwares/Binaries/Android.Skygofree/Android.Skygofree.zip diff --git a/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.md5 b/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.md5 similarity index 100% rename from malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.md5 rename to malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.md5 diff --git a/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.pass b/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.pass similarity index 100% rename from malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.pass rename to malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.pass diff --git a/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.sha256 b/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.sha256 similarity index 100% rename from malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.sha256 rename to malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.sha256 diff --git a/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.zip b/malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.zip similarity index 100% rename from malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker20Nov2013.zip rename to malwares/Binaries/CryptoLocker_20Nov2013/CryptoLocker_20Nov2013.zip diff --git a/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.md5 b/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.md5 similarity index 100% rename from malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.md5 rename to malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.md5 diff --git a/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.pass b/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.pass similarity index 100% rename from malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.pass rename to malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.pass diff --git a/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.sha b/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.sha similarity index 100% rename from malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.sha rename to malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.sha diff --git a/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.zip b/malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.zip similarity index 100% rename from malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.A.B.zip rename to malwares/Binaries/OSX.OceanLotus/OSX.OceanLotus.zip diff --git a/malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.md5 b/malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.md5 similarity index 100% rename from malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.md5 rename to malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.md5 diff --git a/malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.pass b/malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.pass similarity index 100% rename from malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.pass rename to malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.pass diff --git a/malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.sha256 b/malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.sha256 similarity index 100% rename from malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.sha256 rename to malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.sha256 diff --git a/malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.zip b/malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.zip similarity index 100% rename from malwares/Binaries/Trojan.Destover-Sony/Trojan.Destover-Sony.zip rename to malwares/Binaries/Trojan.Destover-SonySigned/Trojan.Destover-SonySigned.zip diff --git a/malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.md5 b/malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.md5 similarity index 100% rename from malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.md5 rename to malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.md5 diff --git a/malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.pass b/malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.pass similarity index 100% rename from malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.pass rename to malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.pass diff --git a/malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.sha256 b/malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.sha256 similarity index 100% rename from malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.sha256 rename to malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.sha256 diff --git a/malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.zip b/malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.zip similarity index 100% rename from malwares/Binaries/Trojan.Sinowal/Torjan.Sinowal.zip rename to malwares/Binaries/Trojan.Sinowal/Trojan.Sinowal.zip diff --git a/malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.md5 b/malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.md5 similarity index 100% rename from malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.md5 rename to malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.md5 diff --git a/malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.pass b/malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.pass similarity index 100% rename from malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.pass rename to malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.pass diff --git a/malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.sha256 b/malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.sha256 similarity index 100% rename from malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.sha256 rename to malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.sha256 diff --git a/malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.zip b/malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.zip similarity index 100% rename from malwares/Binaries/Win32.Invincea_Tunnel/Win32.Invicea_Tunnel.zip rename to malwares/Binaries/Win32.Invicea_Tunnel/Win32.Invicea_Tunnel.zip diff --git a/malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.md5 b/malwares/Binaries/Win32.Reveton/Win32.Reveton.md5 similarity index 100% rename from malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.md5 rename to malwares/Binaries/Win32.Reveton/Win32.Reveton.md5 diff --git a/malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.pass b/malwares/Binaries/Win32.Reveton/Win32.Reveton.pass similarity index 100% rename from malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.pass rename to malwares/Binaries/Win32.Reveton/Win32.Reveton.pass diff --git a/malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.sha256 b/malwares/Binaries/Win32.Reveton/Win32.Reveton.sha256 similarity index 100% rename from malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.sha256 rename to malwares/Binaries/Win32.Reveton/Win32.Reveton.sha256 diff --git a/malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.zip b/malwares/Binaries/Win32.Reveton/Win32.Reveton.zip similarity index 100% rename from malwares/Binaries/Win32.Reveton.Y/Win32.Reveton.Y.zip rename to malwares/Binaries/Win32.Reveton/Win32.Reveton.zip diff --git a/malwares/Binaries/Win32.XAgent/Win32.XAgent.bin.zip b/malwares/Binaries/Win32.XAgent/Win32.XAgent.zip similarity index 100% rename from malwares/Binaries/Win32.XAgent/Win32.XAgent.bin.zip rename to malwares/Binaries/Win32.XAgent/Win32.XAgent.zip diff --git a/malwares/Binaries/ZeusVM/ZeusVM.md5 b/malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.md5 similarity index 100% rename from malwares/Binaries/ZeusVM/ZeusVM.md5 rename to malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.md5 diff --git a/malwares/Binaries/ZeusVM/ZeusVM.pass b/malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.pass similarity index 100% rename from malwares/Binaries/ZeusVM/ZeusVM.pass rename to malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.pass diff --git a/malwares/Binaries/ZeusVM/ZeusVM.sha256 b/malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.sha256 similarity index 100% rename from malwares/Binaries/ZeusVM/ZeusVM.sha256 rename to malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.sha256 diff --git a/malwares/Binaries/ZeusVM/ZeusVM.zip b/malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.zip similarity index 100% rename from malwares/Binaries/ZeusVM/ZeusVM.zip rename to malwares/Binaries/Win32.ZeusVM/Win32.ZeusVM.zip From 69396d5d20c33d2ee1dd0ffa722d37b02114cf04 Mon Sep 17 00:00:00 2001 From: K4YT3X Date: Wed, 21 Aug 2019 11:42:38 -0400 Subject: [PATCH 3/3] fixed typos and mismatching records in the database --- conf/maldb.db | Bin 40960 -> 40960 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/conf/maldb.db b/conf/maldb.db index 2503824e1965405e3dc681d4266233785319a08c..b25c5b82ed707fe49621b25ab0d66b7a8ef106d5 100644 GIT binary patch delta 283 zcmZoTz|?SnX@WH4jEOSNj59VSENACrWZuRc&h(dQ>1F|rDNGy;VS#)M!HSZTWjUoM z?|0?ie2L41SHz5oVJ`D(W_zYb#TV)h#*lMEMxM-~7Hv_2yKLXYP8~~UCb^;dxv5`R?vz-`v0R?0*4ggn^I~XOC zVHi9JT`vv*O%pQ@lOYxwvpE`Y0R>el4ggh?up2D`E-|y+8zcxB0&oBb0Av6F)B!&L zWC8~PqXNhSF$0(YJduGS0%sDFF()PnZWRsyZy6mElb;_UvrHx90SW*B09aoa9T5=^ zlW+td6-{|WZ*OfbL0?K?ZZa@1Gb^%m(