Version 0.5-beta.2 fixes issue with password policy enumeration and f…

…ixes issue with type checking

README.md

@@ -61,7 +61,7 @@ Another scenario where it comes handy is discussed in [this blog post](http://be
 
 ## Help message
 
-    keimpx 0.5-beta.1
+    keimpx 0.5-beta.2
     by Bernardo Damele A. G. <[email protected]>
         
     Usage: keimpx.py [options]

keimpx.py

@@ -33,7 +33,7 @@
 from __future__ import print_function
 
 __author__ = 'Bernardo Damele A. G. <[email protected]>'
-__version__ = '0.5-beta.1'
+__version__ = '0.5-beta.2'
 
 import binascii
 import os

lib/common.py

@@ -9,6 +9,7 @@
 from threading import Thread
 
 from six import string_types
+from six import integer_types
 from six.moves import input as input
 from six.moves.configparser import ConfigParser
 
@@ -143,13 +144,13 @@ def is_local_admin():
     if os.name in ('posix', 'mac'):
         _ = os.geteuid()
 
-        isAdmin = isinstance(_, (int, float, long)) and _ == 0
+        isAdmin = isinstance(_, (integer_types, float)) and _ == 0
     elif sys.platform.lower() == 'win32':
         import ctypes
 
         _ = ctypes.windll.shell32.IsUserAnAdmin()
 
-        isAdmin = isinstance(_, (int, float, long)) and _ == 1
+        isAdmin = isinstance(_, (integer_types, float)) and _ == 1
     else:
         errMsg = "keimpx is not able to check if you are running it "
         errMsg += "as an administrator account on this platform. "

lib/samrdump.py

@@ -339,10 +339,7 @@ def print_friendly(self):
             self.__pass_prop or "None"))
 
         for i, a in enumerate(self.__pass_prop):
-            if int(i) < 6:
-                print("[+] {0} {1}".format(PASSCOMPLEX[i], str(a)))
-            else:
-                break
+            print("[+] {0} {1}".format(PASSCOMPLEX[i], str(a)))
 
         print("\n[+] Minimum password age: {0}".format(self.__min_pass_age))
         print("[+] Reset Account Lockout Counter: {0}".format(
@@ -381,7 +378,7 @@ def d2b(a):
     tbin = []
     while a:
         tbin.append(a % 2)
-        a /= 2
+        a //= 2
 
     t2bin = tbin[::-1]
     if len(t2bin) != 8:

setup.py

@@ -39,7 +39,7 @@
 
 setup(
     name="keimpx",
-    version="0.5-beta.1",
+    version="0.5-beta.2",
     description="keimpx: check for the usefulness of credentials across a network over SMB",
     author="Bernardo Damele A. G.",
     author_email="[email protected]",