Renumber -m 31500 to -m 31700

OpenCL/m31700_a0-pure.cl

@@ -38,7 +38,7 @@ typedef struct md5_double_salt
 
 } md5_double_salt_t;
 
-KERNEL_FQ void m31500_mxx (KERN_ATTR_ESALT (md5_double_salt_t))
+KERNEL_FQ void m31700_mxx (KERN_ATTR_ESALT (md5_double_salt_t))
 {
   /**
    * modifier
@@ -180,7 +180,7 @@ KERNEL_FQ void m31500_mxx (KERN_ATTR_ESALT (md5_double_salt_t))
   }
 }
 
-KERNEL_FQ void m31500_sxx (KERN_ATTR_ESALT (md5_double_salt_t))
+KERNEL_FQ void m31700_sxx (KERN_ATTR_ESALT (md5_double_salt_t))
 {
   /**
    * modifier

OpenCL/m31700_a1-pure.cl

@@ -36,7 +36,7 @@ typedef struct md5_double_salt
 
 } md5_double_salt_t;
 
-KERNEL_FQ void m31500_mxx (KERN_ATTR_ESALT (md5_double_salt_t))
+KERNEL_FQ void m31700_mxx (KERN_ATTR_ESALT (md5_double_salt_t))
 {
   /**
    * modifier
@@ -176,7 +176,7 @@ KERNEL_FQ void m31500_mxx (KERN_ATTR_ESALT (md5_double_salt_t))
   }
 }
 
-KERNEL_FQ void m31500_sxx (KERN_ATTR_ESALT (md5_double_salt_t))
+KERNEL_FQ void m31700_sxx (KERN_ATTR_ESALT (md5_double_salt_t))
 {
   /**
    * modifier

OpenCL/m31700_a3-pure.cl

@@ -36,7 +36,7 @@ typedef struct md5_double_salt
 
 } md5_double_salt_t;
 
-KERNEL_FQ void m31500_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
+KERNEL_FQ void m31700_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
 {
   /**
    * modifier
@@ -189,7 +189,7 @@ KERNEL_FQ void m31500_mxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
   }
 }
 
-KERNEL_FQ void m31500_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
+KERNEL_FQ void m31700_sxx (KERN_ATTR_VECTOR_ESALT (md5_double_salt_t))
 {
   /**
    * modifier

docs/changes.txt

@@ -26,6 +26,7 @@
 - Added hash-mode: HMAC-RIPEMD160 (key = $pass)
 - Added hash-mode: HMAC-RIPEMD160 (key = $salt)
 - Added hash-mode: md5(md5($salt).md5(md5($pass)))
+- Added hash-mode: md5(md5(md5($pass).$salt1).$salt2)
 
 ##
 ## Performance

docs/readme.txt

@@ -89,6 +89,7 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or
 - md5(md5($pass))
 - md5(md5($pass).md5($salt))
 - md5(md5(md5($pass)))
+- md5(md5(md5($pass).$salt1).$salt2)
 - md5(sha1($pass))
 - md5(sha1($pass).$salt)
 - md5(sha1($pass).md5($pass).sha1($pass))

src/modules/module_31700.c

@@ -18,8 +18,8 @@ static const u32   DGST_POS2      = 2;
 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(md5(md5(password).salt1).salt2)";
+static const char *HASH_NAME      = "md5(md5(md5($pass).$salt1).$salt2)";
-static const u64   KERN_TYPE      = 31500;
+static const u64   KERN_TYPE      = 31700;
 static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE;
 static const u64   OPTS_TYPE      = OPTS_TYPE_STOCK_MODULE
                                   | OPTS_TYPE_PT_GENERATE_LE