Fix TypeError with python 3.11+ for mozilla2john #5431

openwall · Feb 2, 2024 · f55f420 · f55f420
1 parent 173b562
commit f55f420
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/run/mozilla2john.py b/run/mozilla2john.py
@@ -30,7 +30,7 @@ def process_file(filename):
 
     data = open(filename, "rb").read()
 
-    idx = data.find("global-salt")
+    idx = data.find(b"global-salt")
     if idx < 0:
         fail(filename)
         return
@@ -40,7 +40,7 @@ def process_file(filename):
         return
     global_salt = data[idx-20:][0:20]  # is the salt always 20 bytes?
 
-    idx = data.find("password-check")
+    idx = data.find(b"password-check")
     if idx < 0:
         fail(filename)
         return
@@ -55,7 +55,7 @@ def process_file(filename):
     version = 3  # fake (this should be improved)
     nnLen = 1  # fake
     oidLen = 11  # fake
-    oidData = "\x00" * oidLen  # fake
+    oidData = b"\x00" * oidLen  # fake
     sys.stdout.write("%s:$mozilla$*%s*%s*%s*" % (os.path.basename(filename), version, len(entry_salt), nnLen))
     sys.stdout.write(hexlify(entry_salt).decode("ascii"))
     sys.stdout.write("*%s*%s*%s*" % (oidLen, hexlify(oidData).decode("ascii"), len(verifier)))