some bugfixes

crack_hash.py

@@ -61,6 +61,10 @@ class HashType(enum.Enum):
     CRYPT_SHA512 = 1800
     CRYPT_APACHE = 1600
 
+    # python
+    PYTHON_PBKDF2_SHA256 = 20300
+    PYTHON_PBKDF2_SHA512 = 20200
+
     # Windows
     LM   = 3000
     NTLM = 1000
@@ -109,6 +113,10 @@ class Hash:
                 self.type.append(HashType.WORDPRESS)
             elif crypt_type == "S":
                 self.type.append(HashType.DRUPAL7)
+            elif crypt_type == "pbkdf2-sha256":
+                self.type.append(HashType.PYTHON_PBKDF2_SHA256)
+            elif crypt_type == "pbkdf2-sha512":
+                self.type.append(HashType.PYTHON_PBKDF2_SHA512)
         else:
             if ":" in raw_hash:
                 parts = raw_hash.split(":")

fileserver.py

@@ -201,6 +201,7 @@ if __name__ == "__main__":
         print("Reverse Shell URL: http://%s/shell.sh" % ipAddress)
     elif sys.argv[1] == "dump":
         fileServer.dumpRequest("/exfiltrate")
+        fileServer.dumpRequest("/")
         print("Exfiltrate data using: http://%s/exfiltrate" % ipAddress)
     elif sys.argv[1] == "proxy":
         url = "https://google.com" if len(sys.argv) < 3 else sys.argv[2]

subdomainFuzz.sh

@@ -8,7 +8,7 @@ fi
 DOMAIN=$1
 PROTOCOL="http"
 
-if [[ $DOMAIN = "https://*" ]]; then
+if [[ $DOMAIN = https://* ]]; then
    PROTOCOL="https"
 fi
 

util.py

@@ -210,7 +210,7 @@ if __name__ == "__main__":
             if os.path.isfile(uri):
                 data = open(uri,"r").read()
             else:
-                res = requests.get(uri)
+                res = requests.get(uri, verify=False)
                 if res.status_code != 200:
                     print("%s returned: %d %s" % (uri, res.status_code, res.reason))
                     exit()