From 16b4f745af9a79fa19ec41c923f862da3b2fe70c Mon Sep 17 00:00:00 2001
From: Gabriele Gristina <gabriele.gristina@gmail.com>
Date: Tue, 30 Jul 2019 15:23:04 +0200
Subject: [PATCH] switch hash-mode from 4420 to 21200

---
 OpenCL/{m04420_a0-pure.cl => m21200_a0-pure.cl} | 4 ++--
 OpenCL/{m04420_a1-pure.cl => m21200_a1-pure.cl} | 4 ++--
 OpenCL/{m04420_a3-pure.cl => m21200_a3-pure.cl} | 4 ++--
 docs/readme.txt                                 | 1 -
 src/modules/{module_04420.c => module_21200.c}  | 2 +-
 tools/test_modules/{m04420.pm => m21200.pm}     | 0
 6 files changed, 7 insertions(+), 8 deletions(-)
 rename OpenCL/{m04420_a0-pure.cl => m21200_a0-pure.cl} (99%)
 rename OpenCL/{m04420_a1-pure.cl => m21200_a1-pure.cl} (99%)
 rename OpenCL/{m04420_a3-pure.cl => m21200_a3-pure.cl} (99%)
 rename src/modules/{module_04420.c => module_21200.c} (99%)
 rename tools/test_modules/{m04420.pm => m21200.pm} (100%)

diff --git a/OpenCL/m04420_a0-pure.cl b/OpenCL/m21200_a0-pure.cl
similarity index 99%
rename from OpenCL/m04420_a0-pure.cl
rename to OpenCL/m21200_a0-pure.cl
index 6503d8781..2ebe15969 100644
--- a/OpenCL/m04420_a0-pure.cl
+++ b/OpenCL/m21200_a0-pure.cl
@@ -29,7 +29,7 @@
 #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf])
 #endif
 
-KERNEL_FQ void m04420_mxx (KERN_ATTR_RULES ())
+KERNEL_FQ void m21200_mxx (KERN_ATTR_RULES ())
 {
   /**
    * modifier
@@ -188,7 +188,7 @@ KERNEL_FQ void m04420_mxx (KERN_ATTR_RULES ())
   }
 }
 
-KERNEL_FQ void m04420_sxx (KERN_ATTR_RULES ())
+KERNEL_FQ void m21200_sxx (KERN_ATTR_RULES ())
 {
   /**
    * modifier
diff --git a/OpenCL/m04420_a1-pure.cl b/OpenCL/m21200_a1-pure.cl
similarity index 99%
rename from OpenCL/m04420_a1-pure.cl
rename to OpenCL/m21200_a1-pure.cl
index 05e845560..574cc528b 100644
--- a/OpenCL/m04420_a1-pure.cl
+++ b/OpenCL/m21200_a1-pure.cl
@@ -27,7 +27,7 @@
 #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf])
 #endif
 
-KERNEL_FQ void m04420_mxx (KERN_ATTR_BASIC ())
+KERNEL_FQ void m21200_mxx (KERN_ATTR_BASIC ())
 {
   /**
    * modifier
@@ -184,7 +184,7 @@ KERNEL_FQ void m04420_mxx (KERN_ATTR_BASIC ())
   }
 }
 
-KERNEL_FQ void m04420_sxx (KERN_ATTR_BASIC ())
+KERNEL_FQ void m21200_sxx (KERN_ATTR_BASIC ())
 {
   /**
    * modifier
diff --git a/OpenCL/m04420_a3-pure.cl b/OpenCL/m21200_a3-pure.cl
similarity index 99%
rename from OpenCL/m04420_a3-pure.cl
rename to OpenCL/m21200_a3-pure.cl
index 58c351b25..1b097b9af 100644
--- a/OpenCL/m04420_a3-pure.cl
+++ b/OpenCL/m21200_a3-pure.cl
@@ -27,7 +27,7 @@
 #define uint_to_hex_lower8(i) make_u32x (l_bin2asc[(i).s0], l_bin2asc[(i).s1], l_bin2asc[(i).s2], l_bin2asc[(i).s3], l_bin2asc[(i).s4], l_bin2asc[(i).s5], l_bin2asc[(i).s6], l_bin2asc[(i).s7], l_bin2asc[(i).s8], l_bin2asc[(i).s9], l_bin2asc[(i).sa], l_bin2asc[(i).sb], l_bin2asc[(i).sc], l_bin2asc[(i).sd], l_bin2asc[(i).se], l_bin2asc[(i).sf])
 #endif
 
-KERNEL_FQ void m04420_mxx (KERN_ATTR_VECTOR ())
+KERNEL_FQ void m21200_mxx (KERN_ATTR_VECTOR ())
 {
   /**
    * modifier
@@ -197,7 +197,7 @@ KERNEL_FQ void m04420_mxx (KERN_ATTR_VECTOR ())
   }
 }
 
-KERNEL_FQ void m04420_sxx (KERN_ATTR_VECTOR ())
+KERNEL_FQ void m21200_sxx (KERN_ATTR_VECTOR ())
 {
   /**
    * modifier
diff --git a/docs/readme.txt b/docs/readme.txt
index b4d01990c..9e36b73ce 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -74,7 +74,6 @@ NVIDIA GPUs require "NVIDIA Driver" (418.56 or later) and "CUDA Toolkit" (10.1 o
 - md5(md5($pass).md5($salt))
 - md5(strtoupper(md5($pass)))
 - md5(sha1($pass))
-- md5(sha1($salt).md5($pass))
 - sha1($pass.$salt)
 - sha1($salt.$pass)
 - sha1(utf16le($pass).$salt)
diff --git a/src/modules/module_04420.c b/src/modules/module_21200.c
similarity index 99%
rename from src/modules/module_04420.c
rename to src/modules/module_21200.c
index 6e736d05a..6c9ea1daf 100644
--- a/src/modules/module_04420.c
+++ b/src/modules/module_21200.c
@@ -18,7 +18,7 @@ static const u32   DGST_POS3      = 1;
 static const u32   DGST_SIZE      = DGST_SIZE_4_4;
 static const u32   HASH_CATEGORY  = HASH_CATEGORY_RAW_HASH_SALTED;
 static const char *HASH_NAME      = "md5(sha1($salt).md5($pass))";
-static const u64   KERN_TYPE      = 4420;
+static const u64   KERN_TYPE      = 21200;
 static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE
                                   | OPTI_TYPE_PRECOMPUTE_INIT
                                   | OPTI_TYPE_EARLY_SKIP
diff --git a/tools/test_modules/m04420.pm b/tools/test_modules/m21200.pm
similarity index 100%
rename from tools/test_modules/m04420.pm
rename to tools/test_modules/m21200.pm