Merge pull request #40 from enzok/master

More fixes for Windows

.gitignore

@@ -1,6 +1,5 @@
 *.a
 *.o
-*.dll
 *.exe
 *.so
 *.pyc

setup.py

@@ -3,6 +3,8 @@
 # This file is part of SFlock - http://www.sflock.org/.
 # See the file 'docs/LICENSE.txt' for copying permission.
 
+import sys
+
 from setuptools import setup, find_packages
 from distutils.util import convert_path
 
@@ -13,6 +15,18 @@
 assert "__version__" in ver_module_ns
 version = ver_module_ns["__version__"]
 
+install_requires=[
+    "click",
+    "cryptography>=2.1",
+    "olefile>=0.43",
+    # "peepdf>=0.4.1",
+    "python-magic>=0.4.13",
+    "pefile",
+]
+
+if sys.platform == "win32":
+    install_require.append("python-magic-bin>=0.4.14")
+
 setup(
     name="SFlock2",
     version=version,
@@ -47,14 +61,7 @@
     license="GPLv3",
     description="Sample staging and detonation utility",
     include_package_data=True,
-    install_requires=[
-        "click",
-        "cryptography>=2.1",
-        "olefile>=0.43",
-        # "peepdf>=0.4.1",
-        "python-magic>=0.4.13",
-        "pefile",
-    ],
+    install_requires=install_requires,
     extras_require={
         "dev": ["mock", "pytest"],
         "shellcode": ["unicorn>=2.0.0", "yara-python>=4.1.0"],

sflock/__init__.py

@@ -2,7 +2,7 @@
 # This file is part of SFlock - http://www.sflock.org/.
 # See the file 'docs/LICENSE.txt' for copying permission.
 
-from sflock.compat import magic
+import magic
 from sflock.exception import UnpackException
 from sflock.main import ident, unpack, supported, zipify
 from sflock.__version__ import __version__

sflock/abstracts.py

@@ -5,6 +5,7 @@
 
 import hashlib
 import io
+import magic
 import ntpath
 import olefile
 import os.path
@@ -13,7 +14,6 @@
 import subprocess
 import tempfile
 
-from sflock.compat import magic
 from sflock.config import iter_passwords
 from sflock.exception import UnpackException
 from sflock.misc import data_file, make_list