From dc51a1a976e87d18532fd0437a74db1acc85ada3 Mon Sep 17 00:00:00 2001 From: jsteube Date: Sat, 1 Apr 2023 09:00:55 +0000 Subject: [PATCH] Renumber -m 31500 to -m 31700 --- OpenCL/{m31500_a0-pure.cl => m31700_a0-pure.cl} | 4 ++-- OpenCL/{m31500_a1-pure.cl => m31700_a1-pure.cl} | 4 ++-- OpenCL/{m31500_a3-pure.cl => m31700_a3-pure.cl} | 4 ++-- docs/changes.txt | 1 + docs/readme.txt | 1 + src/modules/{module_31500.c => module_31700.c} | 4 ++-- tools/test_modules/{m31500.pm => m31700.pm} | 0 7 files changed, 10 insertions(+), 8 deletions(-) rename OpenCL/{m31500_a0-pure.cl => m31700_a0-pure.cl} (98%) rename OpenCL/{m31500_a1-pure.cl => m31700_a1-pure.cl} (98%) rename OpenCL/{m31500_a3-pure.cl => m31700_a3-pure.cl} (98%) rename src/modules/{module_31500.c => module_31700.c} (99%) rename tools/test_modules/{m31500.pm => m31700.pm} (100%) diff --git a/OpenCL/m31500_a0-pure.cl b/OpenCL/m31700_a0-pure.cl similarity index 98% rename from OpenCL/m31500_a0-pure.cl rename to OpenCL/m31700_a0-pure.cl index 635a02bd2..d34ff5e99 100644 --- a/OpenCL/m31500_a0-pure.cl +++ b/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 diff --git a/OpenCL/m31500_a1-pure.cl b/OpenCL/m31700_a1-pure.cl similarity index 98% rename from OpenCL/m31500_a1-pure.cl rename to OpenCL/m31700_a1-pure.cl index 54bcba989..3b07f7e55 100644 --- a/OpenCL/m31500_a1-pure.cl +++ b/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 diff --git a/OpenCL/m31500_a3-pure.cl b/OpenCL/m31700_a3-pure.cl similarity index 98% rename from OpenCL/m31500_a3-pure.cl rename to OpenCL/m31700_a3-pure.cl index d3a9d8810..18e0ee510 100644 --- a/OpenCL/m31500_a3-pure.cl +++ b/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 diff --git a/docs/changes.txt b/docs/changes.txt index 5ebcb6b9f..eea3766c8 100644 --- a/docs/changes.txt +++ b/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 diff --git a/docs/readme.txt b/docs/readme.txt index 5b0cb84ca..10c6407ac 100644 --- a/docs/readme.txt +++ b/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)) diff --git a/src/modules/module_31500.c b/src/modules/module_31700.c similarity index 99% rename from src/modules/module_31500.c rename to src/modules/module_31700.c index 6fa200dca..df52e64ab 100644 --- a/src/modules/module_31500.c +++ b/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 u64 KERN_TYPE = 31500; +static const char *HASH_NAME = "md5(md5(md5($pass).$salt1).$salt2)"; +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 diff --git a/tools/test_modules/m31500.pm b/tools/test_modules/m31700.pm similarity index 100% rename from tools/test_modules/m31500.pm rename to tools/test_modules/m31700.pm