From e818b56cf340aef468308d090f15c2172cd3335f Mon Sep 17 00:00:00 2001 From: Cablethief Date: Fri, 28 May 2021 14:45:41 +0200 Subject: [PATCH] Change module number to match future grouping --- ...m05510_a0-optimized.cl => m27000_a0-optimized.cl} | 12 ++++++------ OpenCL/{m05510_a0-pure.cl => m27000_a0-pure.cl} | 4 ++-- OpenCL/{m05510_a3-pure.cl => m27000_a3-pure.cl} | 4 ++-- ...m05610_a0-optimized.cl => m27100_a0-optimized.cl} | 12 ++++++------ OpenCL/{m05610_a0-pure.cl => m27100_a0-pure.cl} | 4 ++-- OpenCL/{m05610_a3-pure.cl => m27100_a3-pure.cl} | 4 ++-- src/modules/{module_05510.c => module_27000.c} | 2 +- src/modules/{module_05610.c => module_27100.c} | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) rename OpenCL/{m05510_a0-optimized.cl => m27000_a0-optimized.cl} (98%) rename OpenCL/{m05510_a0-pure.cl => m27000_a0-pure.cl} (99%) rename OpenCL/{m05510_a3-pure.cl => m27000_a3-pure.cl} (99%) rename OpenCL/{m05610_a0-optimized.cl => m27100_a0-optimized.cl} (97%) rename OpenCL/{m05610_a0-pure.cl => m27100_a0-pure.cl} (96%) rename OpenCL/{m05610_a3-pure.cl => m27100_a3-pure.cl} (97%) rename src/modules/{module_05510.c => module_27000.c} (99%) rename src/modules/{module_05610.c => module_27100.c} (99%) diff --git a/OpenCL/m05510_a0-optimized.cl b/OpenCL/m27000_a0-optimized.cl similarity index 98% rename from OpenCL/m05510_a0-optimized.cl rename to OpenCL/m27000_a0-optimized.cl index c82c816bc..77d86e001 100644 --- a/OpenCL/m05510_a0-optimized.cl +++ b/OpenCL/m27000_a0-optimized.cl @@ -502,7 +502,7 @@ DECLSPEC void transform_netntlmv1_key (const u32x w0, const u32x w1, u32x *out) | ((k[7] & 0xff) << 24); } -KERNEL_FQ void m05510_m04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m27000_m04 (KERN_ATTR_RULES ()) { /** * modifier @@ -624,15 +624,15 @@ KERNEL_FQ void m05510_m04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m05510_m08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m27000_m08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m05510_m16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m27000_m16 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m05510_s04 (KERN_ATTR_RULES ()) +KERNEL_FQ void m27000_s04 (KERN_ATTR_RULES ()) { /** * modifier @@ -770,10 +770,10 @@ KERNEL_FQ void m05510_s04 (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m05510_s08 (KERN_ATTR_RULES ()) +KERNEL_FQ void m27000_s08 (KERN_ATTR_RULES ()) { } -KERNEL_FQ void m05510_s16 (KERN_ATTR_RULES ()) +KERNEL_FQ void m27000_s16 (KERN_ATTR_RULES ()) { } diff --git a/OpenCL/m05510_a0-pure.cl b/OpenCL/m27000_a0-pure.cl similarity index 99% rename from OpenCL/m05510_a0-pure.cl rename to OpenCL/m27000_a0-pure.cl index 366988aaa..0cc4580c0 100644 --- a/OpenCL/m05510_a0-pure.cl +++ b/OpenCL/m27000_a0-pure.cl @@ -502,7 +502,7 @@ DECLSPEC void transform_netntlmv1_key (const u32 w0, const u32 w1, u32 *out) | ((k[7] & 0xff) << 24); } -KERNEL_FQ void m05510_mxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m27000_mxx (KERN_ATTR_RULES ()) { /** * modifier @@ -622,7 +622,7 @@ KERNEL_FQ void m05510_mxx (KERN_ATTR_RULES ()) } } -KERNEL_FQ void m05510_sxx (KERN_ATTR_RULES ()) +KERNEL_FQ void m27000_sxx (KERN_ATTR_RULES ()) { /** * modifier diff --git a/OpenCL/m05510_a3-pure.cl b/OpenCL/m27000_a3-pure.cl similarity index 99% rename from OpenCL/m05510_a3-pure.cl rename to OpenCL/m27000_a3-pure.cl index 9cb5d9730..3984f4ab9 100644 --- a/OpenCL/m05510_a3-pure.cl +++ b/OpenCL/m27000_a3-pure.cl @@ -500,7 +500,7 @@ DECLSPEC void transform_netntlmv1_key (const u32x w0, const u32x w1, u32x *out) | ((k[7] & 0xff) << 24); } -KERNEL_FQ void m05510_mxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m27000_mxx (KERN_ATTR_VECTOR ()) { /** * modifier @@ -644,7 +644,7 @@ KERNEL_FQ void m05510_mxx (KERN_ATTR_VECTOR ()) } } -KERNEL_FQ void m05510_sxx (KERN_ATTR_VECTOR ()) +KERNEL_FQ void m27000_sxx (KERN_ATTR_VECTOR ()) { /** * modifier diff --git a/OpenCL/m05610_a0-optimized.cl b/OpenCL/m27100_a0-optimized.cl similarity index 97% rename from OpenCL/m05610_a0-optimized.cl rename to OpenCL/m27100_a0-optimized.cl index 8260b9159..e00a93607 100644 --- a/OpenCL/m05610_a0-optimized.cl +++ b/OpenCL/m27100_a0-optimized.cl @@ -114,7 +114,7 @@ DECLSPEC void hmac_md5_run (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, md5_transform_vector (w0, w1, w2, w3, digest); } -KERNEL_FQ void m05610_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m27100_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) { /** * modifier @@ -347,15 +347,15 @@ KERNEL_FQ void m05610_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) } } -KERNEL_FQ void m05610_m08 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m27100_m08 (KERN_ATTR_RULES_ESALT (netntlm_t)) { } -KERNEL_FQ void m05610_m16 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m27100_m16 (KERN_ATTR_RULES_ESALT (netntlm_t)) { } -KERNEL_FQ void m05610_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m27100_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) { /** * modifier @@ -601,10 +601,10 @@ KERNEL_FQ void m05610_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) } } -KERNEL_FQ void m05610_s08 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m27100_s08 (KERN_ATTR_RULES_ESALT (netntlm_t)) { } -KERNEL_FQ void m05610_s16 (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m27100_s16 (KERN_ATTR_RULES_ESALT (netntlm_t)) { } diff --git a/OpenCL/m05610_a0-pure.cl b/OpenCL/m27100_a0-pure.cl similarity index 96% rename from OpenCL/m05610_a0-pure.cl rename to OpenCL/m27100_a0-pure.cl index 69feb2c3e..99f8b6a6f 100644 --- a/OpenCL/m05610_a0-pure.cl +++ b/OpenCL/m27100_a0-pure.cl @@ -29,7 +29,7 @@ typedef struct netntlm } netntlm_t; -KERNEL_FQ void m05610_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m27100_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) { /** * modifier @@ -115,7 +115,7 @@ KERNEL_FQ void m05610_mxx (KERN_ATTR_RULES_ESALT (netntlm_t)) } } -KERNEL_FQ void m05610_sxx (KERN_ATTR_RULES_ESALT (netntlm_t)) +KERNEL_FQ void m27100_sxx (KERN_ATTR_RULES_ESALT (netntlm_t)) { /** * modifier diff --git a/OpenCL/m05610_a3-pure.cl b/OpenCL/m27100_a3-pure.cl similarity index 97% rename from OpenCL/m05610_a3-pure.cl rename to OpenCL/m27100_a3-pure.cl index 5599674d9..e7b75e51b 100644 --- a/OpenCL/m05610_a3-pure.cl +++ b/OpenCL/m27100_a3-pure.cl @@ -27,7 +27,7 @@ typedef struct netntlm } netntlm_t; -KERNEL_FQ void m05610_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) +KERNEL_FQ void m27100_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) { /** * modifier @@ -137,7 +137,7 @@ KERNEL_FQ void m05610_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) } } -KERNEL_FQ void m05610_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) +KERNEL_FQ void m27100_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) { /** * modifier diff --git a/src/modules/module_05510.c b/src/modules/module_27000.c similarity index 99% rename from src/modules/module_05510.c rename to src/modules/module_27000.c index 5692b7daf..69b0732db 100644 --- a/src/modules/module_05510.c +++ b/src/modules/module_27000.c @@ -20,7 +20,7 @@ static const u32 DGST_POS3 = 3; static const u32 DGST_SIZE = DGST_SIZE_4_4; static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL; static const char *HASH_NAME = "NetNTLMv1 / NetNTLMv1+ESS (NT)"; -static const u64 KERN_TYPE = 5510; +static const u64 KERN_TYPE = 27000; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_PT_ADD80 diff --git a/src/modules/module_05610.c b/src/modules/module_27100.c similarity index 99% rename from src/modules/module_05610.c rename to src/modules/module_27100.c index 5d1eeb585..769113315 100644 --- a/src/modules/module_05610.c +++ b/src/modules/module_27100.c @@ -20,7 +20,7 @@ static const u32 DGST_POS3 = 1; static const u32 DGST_SIZE = DGST_SIZE_4_4; static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL; static const char *HASH_NAME = "NetNTLMv2 (NT)"; -static const u64 KERN_TYPE = 5610; +static const u64 KERN_TYPE = 27100; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_PT_ADD80