From 15b90c953e00938514daf08bc2d096670dc0151c Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 27 Jul 2021 05:14:09 +0200 Subject: [PATCH 1/2] Added hash-mode: SNMPv3 HMAC-SHA512-384 --- OpenCL/m27000-pure.cl | 493 +++++++++++++++++++++++++++++++++++ docs/changes.txt | 1 + docs/readme.txt | 1 + include/types.h | 1 + src/modules/module_27000.c | 389 +++++++++++++++++++++++++++ tools/test_modules/m27000.pm | 84 ++++++ 6 files changed, 969 insertions(+) create mode 100644 OpenCL/m27000-pure.cl create mode 100644 src/modules/module_27000.c create mode 100644 tools/test_modules/m27000.pm diff --git a/OpenCL/m27000-pure.cl b/OpenCL/m27000-pure.cl new file mode 100644 index 000000000..c6a543ebb --- /dev/null +++ b/OpenCL/m27000-pure.cl @@ -0,0 +1,493 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +//#define NEW_SIMD_CODE + +#ifdef KERNEL_STATIC +#include "inc_vendor.h" +#include "inc_types.h" +#include "inc_platform.cl" +#include "inc_common.cl" +#include "inc_simd.cl" +#include "inc_hash_sha512.cl" +#endif + +#define COMPARE_S "inc_comp_single.cl" +#define COMPARE_M "inc_comp_multi.cl" + +#define SNMPV3_SALT_MAX 1500 +#define SNMPV3_ENGINEID_MAX 34 +#define SNMPV3_MSG_AUTH_PARAMS_MAX 48 +#define SNMPV3_ROUNDS 1048576 +#define SNMPV3_MAX_PW_LENGTH 128 + +#define SNMPV3_TMP_ELEMS 8192 // 8192 = (256 (max pw length) * SNMPV3_MAX_PW_LENGTH) / sizeof (u32) +#define SNMPV3_HASH_ELEMS 8 + +#define SNMPV3_MAX_SALT_ELEMS 512 // 512 * 4 = 2048 > 1500, also has to be multiple of SNMPV3_MAX_PW_LENGTH +#define SNMPV3_MAX_ENGINE_ELEMS 32 // 32 * 4 = 128 > 34, also has to be multiple of SNMPV3_MAX_PW_LENGTH +#define SNMPV3_MAX_PNUM_ELEMS 4 // 4 * 4 = 16 > 9 + +typedef struct hmac_sha512_tmp +{ + u32 tmp[SNMPV3_TMP_ELEMS]; + u64 h[SNMPV3_HASH_ELEMS]; + +} hmac_sha512_tmp_t; + +typedef struct snmpv3 +{ + u32 salt_buf[SNMPV3_MAX_SALT_ELEMS]; + u32 salt_len; + + u32 engineID_buf[SNMPV3_MAX_ENGINE_ELEMS]; + u32 engineID_len; + + u32 packet_number[SNMPV3_MAX_PNUM_ELEMS]; + +} snmpv3_t; + +KERNEL_FQ void m27000_init (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) +{ + /** + * modifier + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + /** + * base + */ + + const u32 pw_len = pws[gid].pw_len; + + u32 w[128] = { 0 }; + + for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1) + { + w[idx] = pws[gid].i[idx]; + } + + u8 *src_ptr = (u8 *) w; + + // password 128 times, also swapped + + u32 dst_buf[32]; + + u8 *dst_ptr = (u8 *) dst_buf; + + int tmp_idx = 0; + + for (int i = 0; i < 128; i++) + { + for (u32 j = 0; j < pw_len; j++) + { + const int dst_idx = tmp_idx & 127; + + dst_ptr[dst_idx] = src_ptr[j]; + + // write to global memory every time 64 byte are written into cache + + if (dst_idx == 127) + { + const int tmp_idx4 = (tmp_idx - 127) / 4; + + tmps[gid].tmp[tmp_idx4 + 0] = hc_swap32_S (dst_buf[ 0]); + tmps[gid].tmp[tmp_idx4 + 1] = hc_swap32_S (dst_buf[ 1]); + tmps[gid].tmp[tmp_idx4 + 2] = hc_swap32_S (dst_buf[ 2]); + tmps[gid].tmp[tmp_idx4 + 3] = hc_swap32_S (dst_buf[ 3]); + tmps[gid].tmp[tmp_idx4 + 4] = hc_swap32_S (dst_buf[ 4]); + tmps[gid].tmp[tmp_idx4 + 5] = hc_swap32_S (dst_buf[ 5]); + tmps[gid].tmp[tmp_idx4 + 6] = hc_swap32_S (dst_buf[ 6]); + tmps[gid].tmp[tmp_idx4 + 7] = hc_swap32_S (dst_buf[ 7]); + tmps[gid].tmp[tmp_idx4 + 8] = hc_swap32_S (dst_buf[ 8]); + tmps[gid].tmp[tmp_idx4 + 9] = hc_swap32_S (dst_buf[ 9]); + tmps[gid].tmp[tmp_idx4 + 10] = hc_swap32_S (dst_buf[10]); + tmps[gid].tmp[tmp_idx4 + 11] = hc_swap32_S (dst_buf[11]); + tmps[gid].tmp[tmp_idx4 + 12] = hc_swap32_S (dst_buf[12]); + tmps[gid].tmp[tmp_idx4 + 13] = hc_swap32_S (dst_buf[13]); + tmps[gid].tmp[tmp_idx4 + 14] = hc_swap32_S (dst_buf[14]); + tmps[gid].tmp[tmp_idx4 + 15] = hc_swap32_S (dst_buf[15]); + tmps[gid].tmp[tmp_idx4 + 16] = hc_swap32_S (dst_buf[16]); + tmps[gid].tmp[tmp_idx4 + 17] = hc_swap32_S (dst_buf[17]); + tmps[gid].tmp[tmp_idx4 + 18] = hc_swap32_S (dst_buf[18]); + tmps[gid].tmp[tmp_idx4 + 19] = hc_swap32_S (dst_buf[19]); + tmps[gid].tmp[tmp_idx4 + 20] = hc_swap32_S (dst_buf[20]); + tmps[gid].tmp[tmp_idx4 + 21] = hc_swap32_S (dst_buf[21]); + tmps[gid].tmp[tmp_idx4 + 22] = hc_swap32_S (dst_buf[22]); + tmps[gid].tmp[tmp_idx4 + 23] = hc_swap32_S (dst_buf[23]); + tmps[gid].tmp[tmp_idx4 + 24] = hc_swap32_S (dst_buf[24]); + tmps[gid].tmp[tmp_idx4 + 25] = hc_swap32_S (dst_buf[25]); + tmps[gid].tmp[tmp_idx4 + 26] = hc_swap32_S (dst_buf[26]); + tmps[gid].tmp[tmp_idx4 + 27] = hc_swap32_S (dst_buf[27]); + tmps[gid].tmp[tmp_idx4 + 28] = hc_swap32_S (dst_buf[28]); + tmps[gid].tmp[tmp_idx4 + 29] = hc_swap32_S (dst_buf[29]); + tmps[gid].tmp[tmp_idx4 + 30] = hc_swap32_S (dst_buf[30]); + tmps[gid].tmp[tmp_idx4 + 31] = hc_swap32_S (dst_buf[31]); + } + + tmp_idx++; + } + } + + // hash + + tmps[gid].h[0] = SHA512M_A; + tmps[gid].h[1] = SHA512M_B; + tmps[gid].h[2] = SHA512M_C; + tmps[gid].h[3] = SHA512M_D; + tmps[gid].h[4] = SHA512M_E; + tmps[gid].h[5] = SHA512M_F; + tmps[gid].h[6] = SHA512M_G; + tmps[gid].h[7] = SHA512M_H; +} + +KERNEL_FQ void m27000_loop (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + u64 h[8]; + + h[0] = tmps[gid].h[0]; + h[1] = tmps[gid].h[1]; + h[2] = tmps[gid].h[2]; + h[3] = tmps[gid].h[3]; + h[4] = tmps[gid].h[4]; + h[5] = tmps[gid].h[5]; + h[6] = tmps[gid].h[6]; + h[7] = tmps[gid].h[7]; + + const u32 pw_len = pws[gid].pw_len; + + const int pw_len128 = pw_len * 128; + + #define SNMPV3_TMP_ELEMS_OPT 8192 // 8192 = (128 max pw length * 64) / sizeof (u32) + // for pw length > 128 we use global memory reads + + if (pw_len < 128) + { + u32 tmp[SNMPV3_TMP_ELEMS_OPT]; + + for (int i = 0; i < pw_len128 / 4; i++) + { + tmp[i] = tmps[gid].tmp[i]; + } + + for (u32 i = 0, j = loop_pos; i < loop_cnt; i += 128, j += 128) + { + const int idx = (j % pw_len128) / 4; // the optimization trick is to be able to do this + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + u32 w4[4]; + u32 w5[4]; + u32 w6[4]; + u32 w7[4]; + + w0[0] = tmp[idx + 0]; + w0[1] = tmp[idx + 1]; + w0[2] = tmp[idx + 2]; + w0[3] = tmp[idx + 3]; + w1[0] = tmp[idx + 4]; + w1[1] = tmp[idx + 5]; + w1[2] = tmp[idx + 6]; + w1[3] = tmp[idx + 7]; + w2[0] = tmp[idx + 8]; + w2[1] = tmp[idx + 9]; + w2[2] = tmp[idx + 10]; + w2[3] = tmp[idx + 11]; + w3[0] = tmp[idx + 12]; + w3[1] = tmp[idx + 13]; + w3[2] = tmp[idx + 14]; + w3[3] = tmp[idx + 15]; + w4[0] = tmp[idx + 16]; + w4[1] = tmp[idx + 17]; + w4[2] = tmp[idx + 18]; + w4[3] = tmp[idx + 19]; + w5[0] = tmp[idx + 20]; + w5[1] = tmp[idx + 21]; + w5[2] = tmp[idx + 22]; + w5[3] = tmp[idx + 23]; + w6[0] = tmp[idx + 24]; + w6[1] = tmp[idx + 25]; + w6[2] = tmp[idx + 26]; + w6[3] = tmp[idx + 27]; + w7[0] = tmp[idx + 28]; + w7[1] = tmp[idx + 29]; + w7[2] = tmp[idx + 30]; + w7[3] = tmp[idx + 31]; + + sha512_transform (w0, w1, w2, w3, w4, w5, w6, w7, h); + } + } + else + { + for (u32 i = 0, j = loop_pos; i < loop_cnt; i += 128, j += 128) + { + const int idx = (j % pw_len128) / 4; // the optimization trick is to be able to do this + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + u32 w4[4]; + u32 w5[4]; + u32 w6[4]; + u32 w7[4]; + + w0[0] = tmps[gid].tmp[idx + 0]; + w0[1] = tmps[gid].tmp[idx + 1]; + w0[2] = tmps[gid].tmp[idx + 2]; + w0[3] = tmps[gid].tmp[idx + 3]; + w1[0] = tmps[gid].tmp[idx + 4]; + w1[1] = tmps[gid].tmp[idx + 5]; + w1[2] = tmps[gid].tmp[idx + 6]; + w1[3] = tmps[gid].tmp[idx + 7]; + w2[0] = tmps[gid].tmp[idx + 8]; + w2[1] = tmps[gid].tmp[idx + 9]; + w2[2] = tmps[gid].tmp[idx + 10]; + w2[3] = tmps[gid].tmp[idx + 11]; + w3[0] = tmps[gid].tmp[idx + 12]; + w3[1] = tmps[gid].tmp[idx + 13]; + w3[2] = tmps[gid].tmp[idx + 14]; + w3[3] = tmps[gid].tmp[idx + 15]; + w4[0] = tmps[gid].tmp[idx + 16]; + w4[1] = tmps[gid].tmp[idx + 17]; + w4[2] = tmps[gid].tmp[idx + 18]; + w4[3] = tmps[gid].tmp[idx + 19]; + w5[0] = tmps[gid].tmp[idx + 20]; + w5[1] = tmps[gid].tmp[idx + 21]; + w5[2] = tmps[gid].tmp[idx + 22]; + w5[3] = tmps[gid].tmp[idx + 23]; + w6[0] = tmps[gid].tmp[idx + 24]; + w6[1] = tmps[gid].tmp[idx + 25]; + w6[2] = tmps[gid].tmp[idx + 26]; + w6[3] = tmps[gid].tmp[idx + 27]; + w7[0] = tmps[gid].tmp[idx + 28]; + w7[1] = tmps[gid].tmp[idx + 29]; + w7[2] = tmps[gid].tmp[idx + 30]; + w7[3] = tmps[gid].tmp[idx + 31]; + + sha512_transform (w0, w1, w2, w3, w4, w5, w6, w7, h); + } + } + + tmps[gid].h[0] = h[0]; + tmps[gid].h[1] = h[1]; + tmps[gid].h[2] = h[2]; + tmps[gid].h[3] = h[3]; + tmps[gid].h[4] = h[4]; + tmps[gid].h[5] = h[5]; + tmps[gid].h[6] = h[6]; + tmps[gid].h[7] = h[7]; +} + +KERNEL_FQ void m27000_comp (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) +{ + /** + * modifier + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + u32 w4[4]; + u32 w5[4]; + u32 w6[4]; + u32 w7[4]; + + w0[0] = 0x80000000; + w0[1] = 0; + w0[2] = 0; + w0[3] = 0; + w1[0] = 0; + w1[1] = 0; + w1[2] = 0; + w1[3] = 0; + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + w4[0] = 0; + w4[1] = 0; + w4[2] = 0; + w4[3] = 0; + w5[0] = 0; + w5[1] = 0; + w5[2] = 0; + w5[3] = 0; + w6[0] = 0; + w6[1] = 0; + w6[2] = 0; + w6[3] = 0; + w7[0] = 0; + w7[1] = 0; + w7[2] = 0; + w7[3] = 1048576 * 8; + + u64 h[8]; + + h[0] = tmps[gid].h[0]; + h[1] = tmps[gid].h[1]; + h[2] = tmps[gid].h[2]; + h[3] = tmps[gid].h[3]; + h[4] = tmps[gid].h[4]; + h[5] = tmps[gid].h[5]; + h[6] = tmps[gid].h[6]; + h[7] = tmps[gid].h[7]; + + sha512_transform (w0, w1, w2, w3, w4, w5, w6, w7, h); + + sha512_ctx_t ctx; + + sha512_init (&ctx); + + u32 w[32]; + + w[ 0] = h32_from_64_S (h[0]); + w[ 1] = l32_from_64_S (h[0]); + w[ 2] = h32_from_64_S (h[1]); + w[ 3] = l32_from_64_S (h[1]); + w[ 4] = h32_from_64_S (h[2]); + w[ 5] = l32_from_64_S (h[2]); + w[ 6] = h32_from_64_S (h[3]); + w[ 7] = l32_from_64_S (h[3]); + w[ 8] = h32_from_64_S (h[4]); + w[ 9] = l32_from_64_S (h[4]); + w[10] = h32_from_64_S (h[5]); + w[11] = l32_from_64_S (h[5]); + w[12] = h32_from_64_S (h[6]); + w[13] = l32_from_64_S (h[6]); + w[14] = h32_from_64_S (h[7]); + w[15] = l32_from_64_S (h[7]); + w[16] = 0; + w[17] = 0; + w[18] = 0; + w[19] = 0; + w[20] = 0; + w[21] = 0; + w[22] = 0; + w[23] = 0; + w[24] = 0; + w[25] = 0; + w[26] = 0; + w[27] = 0; + w[28] = 0; + w[29] = 0; + w[30] = 0; + w[31] = 0; + + sha512_update (&ctx, w, 64); + + sha512_update_global_swap (&ctx, esalt_bufs[DIGESTS_OFFSET].engineID_buf, esalt_bufs[DIGESTS_OFFSET].engineID_len); + + w[ 0] = h32_from_64_S (h[0]); + w[ 1] = l32_from_64_S (h[0]); + w[ 2] = h32_from_64_S (h[1]); + w[ 3] = l32_from_64_S (h[1]); + w[ 4] = h32_from_64_S (h[2]); + w[ 5] = l32_from_64_S (h[2]); + w[ 6] = h32_from_64_S (h[3]); + w[ 7] = l32_from_64_S (h[3]); + w[ 8] = h32_from_64_S (h[4]); + w[ 9] = l32_from_64_S (h[4]); + w[10] = h32_from_64_S (h[5]); + w[11] = l32_from_64_S (h[5]); + w[12] = h32_from_64_S (h[6]); + w[13] = l32_from_64_S (h[6]); + w[14] = h32_from_64_S (h[7]); + w[15] = l32_from_64_S (h[7]); + w[16] = 0; + w[17] = 0; + w[18] = 0; + w[19] = 0; + w[20] = 0; + w[21] = 0; + w[22] = 0; + w[23] = 0; + w[24] = 0; + w[25] = 0; + w[26] = 0; + w[27] = 0; + w[28] = 0; + w[29] = 0; + w[30] = 0; + w[31] = 0; + + sha512_update (&ctx, w, 64); + + sha512_final (&ctx); + + w[ 0] = h32_from_64_S (ctx.h[0]); + w[ 1] = l32_from_64_S (ctx.h[0]); + w[ 2] = h32_from_64_S (ctx.h[1]); + w[ 3] = l32_from_64_S (ctx.h[1]); + w[ 4] = h32_from_64_S (ctx.h[2]); + w[ 5] = l32_from_64_S (ctx.h[2]); + w[ 6] = h32_from_64_S (ctx.h[3]); + w[ 7] = l32_from_64_S (ctx.h[3]); + w[ 8] = h32_from_64_S (ctx.h[4]); + w[ 9] = l32_from_64_S (ctx.h[4]); + w[10] = h32_from_64_S (ctx.h[5]); + w[11] = l32_from_64_S (ctx.h[5]); + w[12] = h32_from_64_S (ctx.h[6]); + w[13] = l32_from_64_S (ctx.h[6]); + w[14] = h32_from_64_S (ctx.h[7]); + w[15] = l32_from_64_S (ctx.h[7]); + w[16] = 0; + w[17] = 0; + w[18] = 0; + w[19] = 0; + w[20] = 0; + w[21] = 0; + w[22] = 0; + w[23] = 0; + w[24] = 0; + w[25] = 0; + w[26] = 0; + w[27] = 0; + w[28] = 0; + w[29] = 0; + w[30] = 0; + w[31] = 0; + + sha512_hmac_ctx_t hmac_ctx; + + sha512_hmac_init (&hmac_ctx, w, 64); + + sha512_hmac_update_global_swap (&hmac_ctx, esalt_bufs[DIGESTS_OFFSET].salt_buf, esalt_bufs[DIGESTS_OFFSET].salt_len); + + sha512_hmac_final (&hmac_ctx); + + const u32 r0 = l32_from_64 (hmac_ctx.opad.h[1]); + const u32 r1 = h32_from_64 (hmac_ctx.opad.h[1]); + const u32 r2 = l32_from_64 (hmac_ctx.opad.h[0]); + const u32 r3 = h32_from_64 (hmac_ctx.opad.h[0]); + + #define il_pos 0 + + #ifdef KERNEL_STATIC + #include COMPARE_M + #endif +} diff --git a/docs/changes.txt b/docs/changes.txt index cc14c475e..8479ec55e 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -42,6 +42,7 @@ - Added hash-mode: SNMPv3 HMAC-SHA1-96 - Added hash-mode: SNMPv3 HMAC-MD5-96 +- Added hash-mode: SNMPv3 HMAC-SHA512-384 * changes v6.2.2 -> v6.2.3 diff --git a/docs/readme.txt b/docs/readme.txt index cff519531..6f3f45fd5 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -157,6 +157,7 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or - IKE-PSK SHA1 - SNMPv3 HMAC-MD5-96 - SNMPv3 HMAC-SHA1-96 +- SNMPv3 HMAC-SHA512-384 - WPA-EAPOL-PBKDF2 - WPA-EAPOL-PMK - WPA-PBKDF2-PMKID+EAPOL diff --git a/include/types.h b/include/types.h index 19743ad6e..005c65007 100644 --- a/include/types.h +++ b/include/types.h @@ -463,6 +463,7 @@ typedef enum dgst_size DGST_SIZE_4_32 = (32 * sizeof (u32)), // 128 !!! DGST_SIZE_4_64 = (64 * sizeof (u32)), // 256 DGST_SIZE_8_2 = (2 * sizeof (u64)), // 16 !!! + DGST_SIZE_8_6 = (6 * sizeof (u64)), // 48 !!! DGST_SIZE_8_8 = (8 * sizeof (u64)), // 64 !!! DGST_SIZE_8_16 = (16 * sizeof (u64)), // 128 !!! DGST_SIZE_8_25 = (25 * sizeof (u64)) // 200 diff --git a/src/modules/module_27000.c b/src/modules/module_27000.c new file mode 100644 index 000000000..806f7d5a5 --- /dev/null +++ b/src/modules/module_27000.c @@ -0,0 +1,389 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#include "common.h" +#include "types.h" +#include "modules.h" +#include "bitops.h" +#include "convert.h" +#include "shared.h" +#include "memory.h" +#include "emu_inc_hash_sha1.h" + +static const u32 ATTACK_EXEC = ATTACK_EXEC_OUTSIDE_KERNEL; +static const u32 DGST_POS0 = 2; +static const u32 DGST_POS1 = 3; +static const u32 DGST_POS2 = 0; +static const u32 DGST_POS3 = 1; +static const u32 DGST_SIZE = DGST_SIZE_8_6; +static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL; +static const char *HASH_NAME = "SNMPv3 HMAC-SHA512-384"; +static const u64 KERN_TYPE = 27000; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64; +static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_BE; +static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED; +static const char *ST_PASS = "hashcat1"; +static const char *ST_HASH = "$SNMPv3$6$45889431$3081b702010330110204367c80d4020300ffe30401010201030460305e041180001f88808106d566db57fd600000000002011002020118040e6d61747269785f5348412d35313204300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400303d041180001f88808106d566db57fd60000000000400a22602046ea3546f0201000201003018301606082b06010201010200060a2b06010401bf0803020a$80001f88808106d566db57fd6000000000$9e4681768d5dee9e2d0ca7380dfa19f0a0f805c550142b889af548f5506c2c3587df980707600b58d97ed1beaa9feaf9"; + +u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ATTACK_EXEC; } +u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS0; } +u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS1; } +u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS2; } +u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS3; } +u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_SIZE; } +u32 module_hash_category (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_CATEGORY; } +const char *module_hash_name (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_NAME; } +u64 module_kern_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return KERN_TYPE; } +u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTI_TYPE; } +u64 module_opts_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTS_TYPE; } +u32 module_salt_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return SALT_TYPE; } +const char *module_st_hash (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_HASH; } +const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS; } + +static const char *SIGNATURE_SNMPV3 = "$SNMPv3$6$"; + +#define SNMPV3_SALT_MAX 1500 +#define SNMPV3_ENGINEID_MAX 34 +#define SNMPV3_MSG_AUTH_PARAMS_LEN 48 +#define SNMPV3_ROUNDS 1048576 +#define SNMPV3_MAX_PW_LENGTH 128 + +#define SNMPV3_TMP_ELEMS 8192 // 8192 = (256 (max pw length) * SNMPV3_MAX_PW_LENGTH) / sizeof (u32) +#define SNMPV3_HASH_ELEMS 8 + +#define SNMPV3_MAX_SALT_ELEMS 512 // 512 * 4 = 2048 > 1500, also has to be multiple of SNMPV3_MAX_PW_LENGTH +#define SNMPV3_MAX_ENGINE_ELEMS 32 // 32 * 4 = 128 > 34, also has to be multiple of SNMPV3_MAX_PW_LENGTH +#define SNMPV3_MAX_PNUM_ELEMS 4 // 4 * 4 = 16 > 9 + +typedef struct hmac_sha512_tmp +{ + u32 tmp[SNMPV3_TMP_ELEMS]; + u64 h[SNMPV3_HASH_ELEMS]; + +} hmac_sha512_tmp_t; + +typedef struct snmpv3 +{ + u32 salt_buf[SNMPV3_MAX_SALT_ELEMS]; + u32 salt_len; + + u32 engineID_buf[SNMPV3_MAX_ENGINE_ELEMS]; + u32 engineID_len; + + u32 packet_number[SNMPV3_MAX_PNUM_ELEMS]; + +} snmpv3_t; + +u32 module_pw_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) +{ + const u32 pw_min = 8; + + return pw_min; +} + +bool module_unstable_warning (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, MAYBE_UNUSED const hc_device_param_t *device_param) +{ + if (device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE) + { + // self-test failed + if ((device_param->opencl_device_vendor_id == VENDOR_ID_AMD) && (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)) + { + return true; + } + } + + return false; +} + +char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED const hc_device_param_t *device_param) +{ + char *jit_build_options = NULL; + + // Extra treatment for Apple systems + if (device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE) + { + return jit_build_options; + } + + // HIP + if (device_param->opencl_device_vendor_id == VENDOR_ID_AMD_USE_HIP) + { + hc_asprintf (&jit_build_options, "-D _unroll"); + } + + // ROCM + if ((device_param->opencl_device_vendor_id == VENDOR_ID_AMD) && (device_param->has_vperm == true)) + { + hc_asprintf (&jit_build_options, "-D _unroll"); + } + + return jit_build_options; +} + +u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) +{ + const u64 esalt_size = (const u64) sizeof (snmpv3_t); + + return esalt_size; +} + +u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) +{ + const u64 tmp_size = (const u64) sizeof (hmac_sha512_tmp_t); + + return tmp_size; +} + +u32 module_kernel_loops_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) +{ + // we need to fix iteration count to guarantee the loop count is a multiple of SNMPV3_MAX_PW_LENGTH + // 2k calls to sha512_transform typically is enough to overtime pcie bottleneck + + const u32 kernel_loops_min = 2048 * SNMPV3_MAX_PW_LENGTH; + + return kernel_loops_min; +} + +u32 module_kernel_loops_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) +{ + const u32 kernel_loops_max = 2048 * SNMPV3_MAX_PW_LENGTH; + + return kernel_loops_max; +} + +int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len) +{ + u64 *digest = (u64 *) digest_buf; + + snmpv3_t *snmpv3 = (snmpv3_t *) esalt_buf; + + token_t token; + + token.token_cnt = 5; + token.signatures_cnt = 1; + token.signatures_buf[0] = SIGNATURE_SNMPV3; + + token.len[0] = 10; + token.attr[0] = TOKEN_ATTR_FIXED_LENGTH + | TOKEN_ATTR_VERIFY_SIGNATURE; + + // packet number + token.len_min[1] = 1; + token.len_max[1] = 8; + token.sep[1] = '$'; + token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_DIGIT; + // salt + token.len_min[2] = SNMPV3_MSG_AUTH_PARAMS_LEN * 2; + token.len_max[2] = SNMPV3_SALT_MAX * 2; + token.sep[2] = '$'; + token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + // engineid + token.len_min[3] = 26; + token.len_max[3] = SNMPV3_ENGINEID_MAX; + token.sep[3] = '$'; + token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + // digest + token.len[4] = SNMPV3_MSG_AUTH_PARAMS_LEN * 2; + token.sep[4] = '$'; + token.attr[4] = TOKEN_ATTR_FIXED_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token); + + if (rc_tokenizer != PARSER_OK) return (rc_tokenizer); + + // packet number + + const u8 *packet_number_pos = token.buf[1]; + const int packet_number_len = token.len[1]; + + memset (snmpv3->packet_number, 0, sizeof (snmpv3->packet_number)); + + strncpy ((char *) snmpv3->packet_number, (char *) packet_number_pos, packet_number_len); + + // salt + + const u8 *salt_pos = token.buf[2]; + const int salt_len = token.len[2]; + + u8 *salt_ptr = (u8 *) snmpv3->salt_buf; + + snmpv3->salt_len = hex_decode (salt_pos, salt_len, salt_ptr); + + salt->salt_iter = SNMPV3_ROUNDS; + + // handle unique salts detection + + sha1_ctx_t sha1_ctx; + + sha1_init (&sha1_ctx); + sha1_update (&sha1_ctx, snmpv3->salt_buf, snmpv3->salt_len); + sha1_final (&sha1_ctx); + + // store sha1(snmpv3->salt_buf) in salt_buf + + salt->salt_len = 20; + + memcpy (salt->salt_buf, sha1_ctx.h, salt->salt_len); + + // engineid + + const u8 *engineID_pos = token.buf[3]; + const int engineID_len = token.len[3]; + + memset (snmpv3->engineID_buf, 0, sizeof (snmpv3->engineID_buf)); + + u8 *engineID_ptr = (u8 *) snmpv3->engineID_buf; + + hex_decode (engineID_pos, engineID_len, engineID_ptr); + + // force len to 17, zero padding + snmpv3->engineID_len = SNMPV3_ENGINEID_MAX / 2; + + // digest + + const u8 *hash_pos = token.buf[4]; + + digest[0] = hex_to_u64 (hash_pos + 0); + digest[1] = hex_to_u64 (hash_pos + 16); + digest[2] = hex_to_u64 (hash_pos + 32); + digest[3] = hex_to_u64 (hash_pos + 48); + digest[4] = hex_to_u64 (hash_pos + 64); + digest[5] = hex_to_u64 (hash_pos + 80); + + digest[0] = byte_swap_64 (digest[0]); + digest[1] = byte_swap_64 (digest[1]); + digest[2] = byte_swap_64 (digest[2]); + digest[3] = byte_swap_64 (digest[3]); + digest[4] = byte_swap_64 (digest[4]); + digest[5] = byte_swap_64 (digest[5]); + + return (PARSER_OK); +} + +int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size) +{ + const u64 *digest = (const u64 *) digest_buf; + + snmpv3_t *snmpv3 = (snmpv3_t *) esalt_buf; + + u8 *out_buf = (u8 *) line_buf; + + int out_len = snprintf (line_buf, line_size, "%s%s$", SIGNATURE_SNMPV3, (char *) snmpv3->packet_number); + + out_len += hex_encode ((u8 *) snmpv3->salt_buf, snmpv3->salt_len, out_buf + out_len); + + out_buf[out_len] = '$'; + + out_len++; + + out_len += hex_encode ((u8 *) snmpv3->engineID_buf, snmpv3->engineID_len, out_buf + out_len); + + out_buf[out_len] = '$'; + + out_len++; + + u64 digest_tmp[6]; + + digest_tmp[0] = byte_swap_64 (digest[0]); + digest_tmp[1] = byte_swap_64 (digest[1]); + digest_tmp[2] = byte_swap_64 (digest[2]); + digest_tmp[3] = byte_swap_64 (digest[3]); + digest_tmp[4] = byte_swap_64 (digest[4]); + digest_tmp[5] = byte_swap_64 (digest[5]); + + u64_to_hex (digest_tmp[0], out_buf + out_len); out_len += 16; + u64_to_hex (digest_tmp[1], out_buf + out_len); out_len += 16; + u64_to_hex (digest_tmp[2], out_buf + out_len); out_len += 16; + u64_to_hex (digest_tmp[3], out_buf + out_len); out_len += 16; + u64_to_hex (digest_tmp[4], out_buf + out_len); out_len += 16; + u64_to_hex (digest_tmp[5], out_buf + out_len); out_len += 16; + + out_buf[out_len] = 0; + + return out_len; +} + +void module_init (module_ctx_t *module_ctx) +{ + module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT; + module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT; + + module_ctx->module_attack_exec = module_attack_exec; + module_ctx->module_benchmark_esalt = MODULE_DEFAULT; + module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT; + module_ctx->module_benchmark_mask = MODULE_DEFAULT; + module_ctx->module_benchmark_salt = MODULE_DEFAULT; + module_ctx->module_build_plain_postprocess = MODULE_DEFAULT; + module_ctx->module_deep_comp_kernel = MODULE_DEFAULT; + module_ctx->module_dgst_pos0 = module_dgst_pos0; + module_ctx->module_dgst_pos1 = module_dgst_pos1; + module_ctx->module_dgst_pos2 = module_dgst_pos2; + module_ctx->module_dgst_pos3 = module_dgst_pos3; + module_ctx->module_dgst_size = module_dgst_size; + module_ctx->module_dictstat_disable = MODULE_DEFAULT; + module_ctx->module_esalt_size = module_esalt_size; + module_ctx->module_extra_buffer_size = MODULE_DEFAULT; + module_ctx->module_extra_tmp_size = MODULE_DEFAULT; + module_ctx->module_forced_outfile_format = MODULE_DEFAULT; + module_ctx->module_hash_binary_count = MODULE_DEFAULT; + module_ctx->module_hash_binary_parse = MODULE_DEFAULT; + module_ctx->module_hash_binary_save = MODULE_DEFAULT; + module_ctx->module_hash_decode_potfile = MODULE_DEFAULT; + module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; + module_ctx->module_hash_decode = module_hash_decode; + module_ctx->module_hash_encode_status = MODULE_DEFAULT; + module_ctx->module_hash_encode_potfile = MODULE_DEFAULT; + module_ctx->module_hash_encode = module_hash_encode; + module_ctx->module_hash_init_selftest = MODULE_DEFAULT; + module_ctx->module_hash_mode = MODULE_DEFAULT; + module_ctx->module_hash_category = module_hash_category; + module_ctx->module_hash_name = module_hash_name; + module_ctx->module_hashes_count_min = MODULE_DEFAULT; + module_ctx->module_hashes_count_max = MODULE_DEFAULT; + module_ctx->module_hlfmt_disable = MODULE_DEFAULT; + module_ctx->module_hook_extra_param_size = MODULE_DEFAULT; + module_ctx->module_hook_extra_param_init = MODULE_DEFAULT; + module_ctx->module_hook_extra_param_term = MODULE_DEFAULT; + module_ctx->module_hook12 = MODULE_DEFAULT; + module_ctx->module_hook23 = MODULE_DEFAULT; + module_ctx->module_hook_salt_size = MODULE_DEFAULT; + module_ctx->module_hook_size = MODULE_DEFAULT; + module_ctx->module_jit_build_options = module_jit_build_options; + module_ctx->module_jit_cache_disable = MODULE_DEFAULT; + module_ctx->module_kernel_accel_max = MODULE_DEFAULT; + module_ctx->module_kernel_accel_min = MODULE_DEFAULT; + module_ctx->module_kernel_loops_max = module_kernel_loops_max; + module_ctx->module_kernel_loops_min = module_kernel_loops_min; + module_ctx->module_kernel_threads_max = MODULE_DEFAULT; + module_ctx->module_kernel_threads_min = MODULE_DEFAULT; + module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; + module_ctx->module_opti_type = module_opti_type; + module_ctx->module_opts_type = module_opts_type; + module_ctx->module_outfile_check_disable = MODULE_DEFAULT; + module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT; + module_ctx->module_potfile_custom_check = MODULE_DEFAULT; + module_ctx->module_potfile_disable = MODULE_DEFAULT; + module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT; + module_ctx->module_pwdump_column = MODULE_DEFAULT; + module_ctx->module_pw_max = MODULE_DEFAULT; + module_ctx->module_pw_min = module_pw_min; + module_ctx->module_salt_max = MODULE_DEFAULT; + module_ctx->module_salt_min = MODULE_DEFAULT; + module_ctx->module_salt_type = module_salt_type; + module_ctx->module_separator = MODULE_DEFAULT; + module_ctx->module_st_hash = module_st_hash; + module_ctx->module_st_pass = module_st_pass; + module_ctx->module_tmp_size = module_tmp_size; + module_ctx->module_unstable_warning = module_unstable_warning; + module_ctx->module_warmup_disable = MODULE_DEFAULT; +} diff --git a/tools/test_modules/m27000.pm b/tools/test_modules/m27000.pm new file mode 100644 index 000000000..a2cec5372 --- /dev/null +++ b/tools/test_modules/m27000.pm @@ -0,0 +1,84 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Digest::SHA qw (sha512 sha512_hex hmac_sha512_hex); + +sub module_constraints { [[8, 256], [96, 3000], [-1, -1], [-1, -1], [-1, -1]] } + +sub module_generate_hash +{ + my $word = shift; + my $salt = shift; + my $pkt_num = shift // int(rand(100000000)); + my $engineID = shift // random_hex_string(26, 34); + + # padding engineID: fill with zero + + my $pad_len = 34 - length ($engineID); + + $engineID = join '', $engineID, "0" x $pad_len; + + # make salt even if needed + + if (length($salt) %2 == 1) + { + $salt = $salt . "8"; + } + + my $string1 = $word x 1048576; + + $string1 = substr ($string1, 0, 1048576); + + my $sha512_digest1 = sha512_hex ($string1); + + my $buf = join '', $sha512_digest1, $engineID, $sha512_digest1; + + my $sha512_digest2 = sha512(pack("H*", $buf)); + + my $digest = hmac_sha512_hex (pack("H*", $salt), $sha512_digest2); + + $digest = substr ($digest, 0, 96); + + my $hash = "\$SNMPv3\$6\$" . $pkt_num . "\$" . $salt . "\$" . $engineID . "\$" . $digest; + + return $hash; +} + +sub module_verify_hash +{ + my $line = shift; + + my $idx = index ($line, ':'); + + return unless $idx >= 0; + + my $hash = substr ($line, 0, $idx); + my $word = substr ($line, $idx + 1); + + return unless length ($word) gt 0; + return unless substr ($hash, 0, 10) eq '$SNMPv3$6$'; + + my (undef, $signature, $version, $pkt_num, $salt, $engineID, $digest) = split '\$', $hash; + + return unless defined $signature; + return unless defined $version; + return unless defined $pkt_num; + return unless defined $salt; + return unless defined $engineID; + return unless defined $digest; + + my $word_packed = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word_packed, $salt, $pkt_num, $engineID); + + return ($new_hash, $word); +} + +1; From 81b54c3689c204496a0f97ca368b540bd2842b3f Mon Sep 17 00:00:00 2001 From: Gabriele Gristina Date: Tue, 3 Aug 2021 21:42:42 +0200 Subject: [PATCH 2/2] rename to 27300, reduced the amount of memory allocated in gpu for SNMPv3 HMAC-SHA512-384 --- OpenCL/{m27000-pure.cl => m27300-pure.cl} | 16 +++++++++------- docs/changes.txt | 1 - docs/readme.txt | 1 - src/modules/{module_27000.c => module_27300.c} | 3 ++- tools/test_modules/{m27000.pm => m27300.pm} | 0 5 files changed, 11 insertions(+), 10 deletions(-) rename OpenCL/{m27000-pure.cl => m27300-pure.cl} (95%) rename src/modules/{module_27000.c => module_27300.c} (99%) rename tools/test_modules/{m27000.pm => m27300.pm} (100%) diff --git a/OpenCL/m27000-pure.cl b/OpenCL/m27300-pure.cl similarity index 95% rename from OpenCL/m27000-pure.cl rename to OpenCL/m27300-pure.cl index c6a543ebb..308c46483 100644 --- a/OpenCL/m27000-pure.cl +++ b/OpenCL/m27300-pure.cl @@ -30,6 +30,11 @@ #define SNMPV3_MAX_ENGINE_ELEMS 32 // 32 * 4 = 128 > 34, also has to be multiple of SNMPV3_MAX_PW_LENGTH #define SNMPV3_MAX_PNUM_ELEMS 4 // 4 * 4 = 16 > 9 +#define SNMPV3_MAX_PW_LENGTH_OPT 32 +#define SNMPV3_TMP_ELEMS_OPT ((SNMPV3_MAX_PW_LENGTH_OPT * SNMPV3_MAX_PW_LENGTH) / 4) + // (32 * 128) / 4 = 1024 + // for pw length > 32 we use global memory reads + typedef struct hmac_sha512_tmp { u32 tmp[SNMPV3_TMP_ELEMS]; @@ -49,7 +54,7 @@ typedef struct snmpv3 } snmpv3_t; -KERNEL_FQ void m27000_init (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) +KERNEL_FQ void m27300_init (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) { /** * modifier @@ -146,7 +151,7 @@ KERNEL_FQ void m27000_init (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) tmps[gid].h[7] = SHA512M_H; } -KERNEL_FQ void m27000_loop (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) +KERNEL_FQ void m27300_loop (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) { /** * base @@ -171,10 +176,7 @@ KERNEL_FQ void m27000_loop (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) const int pw_len128 = pw_len * 128; - #define SNMPV3_TMP_ELEMS_OPT 8192 // 8192 = (128 max pw length * 64) / sizeof (u32) - // for pw length > 128 we use global memory reads - - if (pw_len < 128) + if (pw_len <= SNMPV3_MAX_PW_LENGTH_OPT) { u32 tmp[SNMPV3_TMP_ELEMS_OPT]; @@ -294,7 +296,7 @@ KERNEL_FQ void m27000_loop (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) tmps[gid].h[7] = h[7]; } -KERNEL_FQ void m27000_comp (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) +KERNEL_FQ void m27300_comp (KERN_ATTR_TMPS_ESALT (hmac_sha512_tmp_t, snmpv3_t)) { /** * modifier diff --git a/docs/changes.txt b/docs/changes.txt index 8479ec55e..cc14c475e 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -42,7 +42,6 @@ - Added hash-mode: SNMPv3 HMAC-SHA1-96 - Added hash-mode: SNMPv3 HMAC-MD5-96 -- Added hash-mode: SNMPv3 HMAC-SHA512-384 * changes v6.2.2 -> v6.2.3 diff --git a/docs/readme.txt b/docs/readme.txt index 6f3f45fd5..cff519531 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -157,7 +157,6 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or - IKE-PSK SHA1 - SNMPv3 HMAC-MD5-96 - SNMPv3 HMAC-SHA1-96 -- SNMPv3 HMAC-SHA512-384 - WPA-EAPOL-PBKDF2 - WPA-EAPOL-PMK - WPA-PBKDF2-PMKID+EAPOL diff --git a/src/modules/module_27000.c b/src/modules/module_27300.c similarity index 99% rename from src/modules/module_27000.c rename to src/modules/module_27300.c index 806f7d5a5..0143292ac 100644 --- a/src/modules/module_27000.c +++ b/src/modules/module_27300.c @@ -20,7 +20,7 @@ static const u32 DGST_POS3 = 1; static const u32 DGST_SIZE = DGST_SIZE_8_6; static const u32 HASH_CATEGORY = HASH_CATEGORY_NETWORK_PROTOCOL; static const char *HASH_NAME = "SNMPv3 HMAC-SHA512-384"; -static const u64 KERN_TYPE = 27000; +static const u64 KERN_TYPE = 27300; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_USES_BITS_64; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_BE; @@ -333,6 +333,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_esalt_size = module_esalt_size; module_ctx->module_extra_buffer_size = MODULE_DEFAULT; module_ctx->module_extra_tmp_size = MODULE_DEFAULT; +// module_ctx->module_extra_tuningdb_block = MODULE_DEFAULT; module_ctx->module_forced_outfile_format = MODULE_DEFAULT; module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; diff --git a/tools/test_modules/m27000.pm b/tools/test_modules/m27300.pm similarity index 100% rename from tools/test_modules/m27000.pm rename to tools/test_modules/m27300.pm