diff --git a/OpenCL/m04430_a0-pure.cl b/OpenCL/m21300_a0-pure.cl similarity index 98% rename from OpenCL/m04430_a0-pure.cl rename to OpenCL/m21300_a0-pure.cl index 8c25b929e..04c76d812 100644 --- a/OpenCL/m04430_a0-pure.cl +++ b/OpenCL/m21300_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 m04430_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m21300_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -146,7 +146,7 @@ KERNEL_FQ void m04430_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m04430_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m21300_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m04430_a1-pure.cl b/OpenCL/m21300_a1-pure.cl similarity index 98% rename from OpenCL/m04430_a1-pure.cl rename to OpenCL/m21300_a1-pure.cl index 5871f7d7e..9b231e6f2 100644 --- a/OpenCL/m04430_a1-pure.cl +++ b/OpenCL/m21300_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 m04430_mxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21300_mxx (KERN_ATTR_BASIC ()) { /** * modifier @@ -140,7 +140,7 @@ KERNEL_FQ void m04430_mxx (KERN_ATTR_BASIC ()) } } -KERNEL_FQ void m04430_sxx (KERN_ATTR_BASIC ()) +KERNEL_FQ void m21300_sxx (KERN_ATTR_BASIC ()) { /** * modifier diff --git a/OpenCL/m04430_a3-pure.cl b/OpenCL/m21300_a3-pure.cl similarity index 98% rename from OpenCL/m04430_a3-pure.cl rename to OpenCL/m21300_a3-pure.cl index 3f22a77a2..f659497c8 100644 --- a/OpenCL/m04430_a3-pure.cl +++ b/OpenCL/m21300_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 m04430_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21300_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -159,7 +159,7 @@ KERNEL_FQ void m04430_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m04430_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m21300_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/docs/readme.txt b/docs/readme.txt index d403bf936..9e36b73ce 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -70,7 +70,6 @@ NVIDIA GPUs require "NVIDIA Driver" (418.56 or later) and "CUDA Toolkit" (10.1 o - md5($salt.md5($pass)) - md5($salt.md5($salt.$pass)) - md5($salt.md5($pass.$salt)) -- md5($salt.sha1($salt.$pass)) - md5(md5($pass)) - md5(md5($pass).md5($salt)) - md5(strtoupper(md5($pass))) diff --git a/src/modules/module_04430.c b/src/modules/module_21300.c similarity index 99% rename from src/modules/module_04430.c rename to src/modules/module_21300.c index acb878d6d..6c4522dc2 100644 --- a/src/modules/module_04430.c +++ b/src/modules/module_21300.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($salt.sha1($salt.$pass))"; -static const u64 KERN_TYPE = 4430; +static const u64 KERN_TYPE = 21300; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_PRECOMPUTE_INIT | OPTI_TYPE_EARLY_SKIP diff --git a/tools/test_modules/m04430.pm b/tools/test_modules/m21300.pm similarity index 100% rename from tools/test_modules/m04430.pm rename to tools/test_modules/m21300.pm