Add PBKDF1-SHA1 / m32900

Satisfy https://github.com/hashcat/hashcat/issues/4089

OpenCL/m32900_a0-pure.cl

@@ -0,0 +1,203 @@
+/**
+ * Author......: See docs/credits.txt
+ * License.....: MIT
+ */
+
+//#define NEW_SIMD_CODE
+
+#ifdef KERNEL_STATIC
+#include M2S(INCLUDE_PATH/inc_vendor.h)
+#include M2S(INCLUDE_PATH/inc_types.h)
+#include M2S(INCLUDE_PATH/inc_platform.cl)
+#include M2S(INCLUDE_PATH/inc_common.cl)
+#include M2S(INCLUDE_PATH/inc_rp.h)
+#include M2S(INCLUDE_PATH/inc_rp.cl)
+#include M2S(INCLUDE_PATH/inc_scalar.cl)
+#include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
+#endif
+
+KERNEL_FQ void m32900_mxx (KERN_ATTR_RULES ())
+{
+  /**
+   * modifier
+   */
+
+  const u64 lid = get_local_id (0);
+  const u64 gid = get_global_id (0);
+
+  if (gid >= GID_CNT) return;
+
+  /**
+   * base
+   */
+
+  COPY_PW (pws[gid]);
+
+  const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len;
+
+  u32 s[64] = { 0 };
+
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  {
+    s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]);
+  }
+
+  const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter;
+
+  u32 buf[5];
+
+  sha1_ctx_t ctx1;
+  sha1_init (&ctx1);
+
+  /**
+   * loop
+   */
+
+  for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++)
+  {
+    pw_t tmp = PASTE_PW;
+
+    tmp.pw_len = apply_rules (rules_buf[il_pos].cmds, tmp.i, tmp.pw_len);
+
+    sha1_ctx_t ctx0 = ctx1;
+
+    sha1_update_swap (&ctx0, tmp.i, tmp.pw_len);
+
+    sha1_update (&ctx0, s, salt_len);
+
+    sha1_final (&ctx0);
+
+    buf[0] = ctx0.h[0];
+    buf[1] = ctx0.h[1];
+    buf[2] = ctx0.h[2];
+    buf[3] = ctx0.h[3];
+    buf[4] = ctx0.h[4];
+
+    for (int i = 0; i < salt_iter; i++)
+    {
+      sha1_ctx_t ctx = ctx1;
+      
+      ctx.w0[0] = (buf[0]);
+      ctx.w0[1] = (buf[1]);
+      ctx.w0[2] = (buf[2]);
+      ctx.w0[3] = (buf[3]);
+      ctx.w1[0] = (buf[4]);
+
+      ctx.len = 20;
+
+      sha1_final (&ctx);
+
+      buf[0] = ctx.h[0];
+      buf[1] = ctx.h[1];
+      buf[2] = ctx.h[2];
+      buf[3] = ctx.h[3];
+      buf[4] = ctx.h[4];
+    }
+
+    const u32 r0 = buf[DGST_R0];
+    const u32 r1 = buf[DGST_R1];
+    const u32 r2 = buf[DGST_R2];
+    const u32 r3 = buf[DGST_R3];
+
+    COMPARE_M_SCALAR (r0, r1, r2, r3);
+  }
+}
+
+KERNEL_FQ void m32900_sxx (KERN_ATTR_RULES ())
+{
+  /**
+   * modifier
+   */
+
+  const u64 lid = get_local_id (0);
+  const u64 gid = get_global_id (0);
+
+  if (gid >= GID_CNT) return;
+
+  /**
+   * digest
+   */
+
+  const u32 search[4] =
+  {
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0],
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1],
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2],
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3]
+  };
+
+  /**
+   * base
+   */
+
+  COPY_PW (pws[gid]);
+
+  const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len;
+
+  u32 s[64] = { 0 };
+
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  {
+    s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]);
+  }
+
+  const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter;
+
+  u32 buf[5];
+
+  sha1_ctx_t ctx1;
+  sha1_init (&ctx1);
+
+  /**
+   * loop
+   */
+
+  for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++)
+  {
+    pw_t tmp = PASTE_PW;
+
+    tmp.pw_len = apply_rules (rules_buf[il_pos].cmds, tmp.i, tmp.pw_len);
+
+    sha1_ctx_t ctx0 = ctx1;
+
+    sha1_update_swap (&ctx0, tmp.i, tmp.pw_len);
+
+    sha1_update (&ctx0, s, salt_len);
+
+    sha1_final (&ctx0);
+
+    buf[0] = ctx0.h[0];
+    buf[1] = ctx0.h[1];
+    buf[2] = ctx0.h[2];
+    buf[3] = ctx0.h[3];
+    buf[4] = ctx0.h[4];
+
+    for (int i = 0; i < salt_iter; i++)
+    {
+      sha1_ctx_t ctx = ctx1;
+      
+      ctx.w0[0] = (buf[0]);
+      ctx.w0[1] = (buf[1]);
+      ctx.w0[2] = (buf[2]);
+      ctx.w0[3] = (buf[3]);
+      ctx.w1[0] = (buf[4]);
+
+      ctx.len = 20;
+
+      sha1_final (&ctx);
+
+      buf[0] = ctx.h[0];
+      buf[1] = ctx.h[1];
+      buf[2] = ctx.h[2];
+      buf[3] = ctx.h[3];
+      buf[4] = ctx.h[4];
+    }
+
+    const u32 r0 = buf[DGST_R0];
+    const u32 r1 = buf[DGST_R1];
+    const u32 r2 = buf[DGST_R2];
+    const u32 r3 = buf[DGST_R3];
+
+    COMPARE_S_SCALAR (r0, r1, r2, r3);
+  }
+}

OpenCL/m32900_a1-pure.cl

@@ -0,0 +1,197 @@
+/**
+ * Author......: See docs/credits.txt
+ * License.....: MIT
+ */
+
+//#define NEW_SIMD_CODE
+
+#ifdef KERNEL_STATIC
+#include M2S(INCLUDE_PATH/inc_vendor.h)
+#include M2S(INCLUDE_PATH/inc_types.h)
+#include M2S(INCLUDE_PATH/inc_platform.cl)
+#include M2S(INCLUDE_PATH/inc_common.cl)
+#include M2S(INCLUDE_PATH/inc_scalar.cl)
+#include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
+#endif
+
+KERNEL_FQ void m32900_mxx (KERN_ATTR_BASIC ())
+{
+  /**
+   * modifier
+   */
+
+  const u64 lid = get_local_id (0);
+  const u64 gid = get_global_id (0);
+
+  if (gid >= GID_CNT) return;
+
+  /**
+   * base
+   */
+
+  const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len;
+
+  u32 s[64] = { 0 };
+
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  {
+    s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]);
+  }
+
+  const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter;
+
+  u32 buf[5];
+
+  sha1_ctx_t ctx1;
+  sha1_init (&ctx1);
+
+  sha1_ctx_t ctx0 = ctx1;
+
+  sha1_update_swap (&ctx0, pws[gid].i, pws[gid].pw_len);
+
+  /**
+   * loop
+   */
+
+  for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++)
+  {
+    sha1_ctx_t ctx2 = ctx0;
+
+    sha1_update_global_swap (&ctx2, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
+
+    sha1_update (&ctx2, s, salt_len);
+
+    sha1_final (&ctx2);
+
+    buf[0] = ctx2.h[0];
+    buf[1] = ctx2.h[1];
+    buf[2] = ctx2.h[2];
+    buf[3] = ctx2.h[3];
+    buf[4] = ctx2.h[4];
+
+    for (int i = 0; i < salt_iter; i++)
+    {
+      sha1_ctx_t ctx = ctx1;
+      
+      ctx.w0[0] = (buf[0]);
+      ctx.w0[1] = (buf[1]);
+      ctx.w0[2] = (buf[2]);
+      ctx.w0[3] = (buf[3]);
+      ctx.w1[0] = (buf[4]);
+
+      ctx.len = 20;
+
+      sha1_final (&ctx);
+
+      buf[0] = ctx.h[0];
+      buf[1] = ctx.h[1];
+      buf[2] = ctx.h[2];
+      buf[3] = ctx.h[3];
+      buf[4] = ctx.h[4];
+    }
+
+    const u32 r0 = buf[DGST_R0];
+    const u32 r1 = buf[DGST_R1];
+    const u32 r2 = buf[DGST_R2];
+    const u32 r3 = buf[DGST_R3];
+
+    COMPARE_M_SCALAR (r0, r1, r2, r3);
+  }
+}
+
+KERNEL_FQ void m32900_sxx (KERN_ATTR_BASIC ())
+{
+  /**
+   * modifier
+   */
+
+  const u64 lid = get_local_id (0);
+  const u64 gid = get_global_id (0);
+
+  if (gid >= GID_CNT) return;
+
+  /**
+   * digest
+   */
+
+  const u32 search[4] =
+  {
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0],
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1],
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2],
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3]
+  };
+
+  /**
+   * base
+   */
+
+  const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len;
+
+  u32 s[64] = { 0 };
+
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  {
+    s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]);
+  }
+
+  const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter;
+
+  u32 buf[5];
+
+  sha1_ctx_t ctx1;
+  sha1_init (&ctx1);
+
+  sha1_ctx_t ctx0 = ctx1;
+
+  sha1_update_swap (&ctx0, pws[gid].i, pws[gid].pw_len);
+
+  /**
+   * loop
+   */
+
+  for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++)
+  {
+    sha1_ctx_t ctx2 = ctx0;
+
+    sha1_update_global_swap (&ctx2, combs_buf[il_pos].i, combs_buf[il_pos].pw_len);
+
+    sha1_update (&ctx2, s, salt_len);
+
+    sha1_final (&ctx2);
+
+    buf[0] = ctx2.h[0];
+    buf[1] = ctx2.h[1];
+    buf[2] = ctx2.h[2];
+    buf[3] = ctx2.h[3];
+    buf[4] = ctx2.h[4];
+
+    for (int i = 0; i < salt_iter; i++)
+    {
+      sha1_ctx_t ctx = ctx1;
+      
+      ctx.w0[0] = (buf[0]);
+      ctx.w0[1] = (buf[1]);
+      ctx.w0[2] = (buf[2]);
+      ctx.w0[3] = (buf[3]);
+      ctx.w1[0] = (buf[4]);
+
+      ctx.len = 20;
+
+      sha1_final (&ctx);
+
+      buf[0] = ctx.h[0];
+      buf[1] = ctx.h[1];
+      buf[2] = ctx.h[2];
+      buf[3] = ctx.h[3];
+      buf[4] = ctx.h[4];
+    }
+
+    const u32 r0 = buf[DGST_R0];
+    const u32 r1 = buf[DGST_R1];
+    const u32 r2 = buf[DGST_R2];
+    const u32 r3 = buf[DGST_R3];
+
+    COMPARE_S_SCALAR (r0, r1, r2, r3);
+  }
+}

OpenCL/m32900_a3-pure.cl

@@ -0,0 +1,223 @@
+/**
+ * Author......: See docs/credits.txt
+ * License.....: MIT
+ */
+
+#define NEW_SIMD_CODE
+
+#ifdef KERNEL_STATIC
+#include M2S(INCLUDE_PATH/inc_vendor.h)
+#include M2S(INCLUDE_PATH/inc_types.h)
+#include M2S(INCLUDE_PATH/inc_platform.cl)
+#include M2S(INCLUDE_PATH/inc_common.cl)
+#include M2S(INCLUDE_PATH/inc_simd.cl)
+#include M2S(INCLUDE_PATH/inc_hash_sha1.cl)
+#endif
+
+KERNEL_FQ void m32900_mxx (KERN_ATTR_VECTOR ())
+{
+  /**
+   * modifier
+   */
+
+  const u64 lid = get_local_id (0);
+  const u64 gid = get_global_id (0);
+
+  if (gid >= GID_CNT) return;
+
+  /**
+   * base
+   */
+
+  const u32 pw_len = pws[gid].pw_len;
+
+  u32x w[64] = { 0 };
+
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  {
+    w[idx] = pws[gid].i[idx];
+  }
+
+  const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len;
+
+  u32x s[64] = { 0 };
+
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  {
+    s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]);
+  }
+
+  const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter;
+
+  u32 buf[5];
+
+  sha1_ctx_t ctx1;
+  sha1_init (&ctx1);
+
+  /**
+   * loop
+   */
+
+  u32x w0l = w[0];
+
+  for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++)
+  {
+    const u32x w0r = words_buf_r[il_pos / VECT_SIZE];
+
+    const u32x w0 = w0l | w0r;
+
+    w[0] = w0;
+
+    sha1_ctx_t ctx0 = ctx1;
+
+    sha1_update (&ctx0, w, pw_len);
+
+    sha1_update (&ctx0, s, salt_len);
+
+    sha1_final (&ctx0);
+
+    buf[0] = ctx0.h[0];
+    buf[1] = ctx0.h[1];
+    buf[2] = ctx0.h[2];
+    buf[3] = ctx0.h[3];
+    buf[4] = ctx0.h[4];
+
+    for (int i = 0; i < salt_iter; i++)
+    {
+      sha1_ctx_t ctx = ctx1;
+      
+      ctx.w0[0] = (buf[0]);
+      ctx.w0[1] = (buf[1]);
+      ctx.w0[2] = (buf[2]);
+      ctx.w0[3] = (buf[3]);
+      ctx.w1[0] = (buf[4]);
+
+      ctx.len = 20;
+
+      sha1_final (&ctx);
+
+      buf[0] = ctx.h[0];
+      buf[1] = ctx.h[1];
+      buf[2] = ctx.h[2];
+      buf[3] = ctx.h[3];
+      buf[4] = ctx.h[4];
+    }
+
+    const u32 r0 = buf[DGST_R0];
+    const u32 r1 = buf[DGST_R1];
+    const u32 r2 = buf[DGST_R2];
+    const u32 r3 = buf[DGST_R3];
+
+    COMPARE_M_SIMD (r0, r1, r2, r3);
+  }
+}
+
+KERNEL_FQ void m32900_sxx (KERN_ATTR_VECTOR ())
+{
+  /**
+   * modifier
+   */
+
+  const u64 lid = get_local_id (0);
+  const u64 gid = get_global_id (0);
+
+  if (gid >= GID_CNT) return;
+
+  /**
+   * digest
+   */
+
+  const u32 search[4] =
+  {
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R0],
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R1],
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R2],
+    digests_buf[DIGESTS_OFFSET_HOST].digest_buf[DGST_R3]
+  };
+
+  /**
+   * base
+   */
+
+  const u32 pw_len = pws[gid].pw_len;
+
+  u32x w[64] = { 0 };
+
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  {
+    w[idx] = pws[gid].i[idx];
+  }
+
+  const u32 salt_len = salt_bufs[SALT_POS_HOST].salt_len;
+
+  u32x s[64] = { 0 };
+
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  {
+    s[idx] = hc_swap32_S (salt_bufs[SALT_POS_HOST].salt_buf[idx]);
+  }
+
+  const u32 salt_iter = salt_bufs[SALT_POS_HOST].salt_iter;
+
+  u32 buf[5];
+
+  sha1_ctx_t ctx1;
+  sha1_init (&ctx1);
+
+  /**
+   * loop
+   */
+
+  u32x w0l = w[0];
+
+  for (u32 il_pos = 0; il_pos < IL_CNT; il_pos++)
+  {
+    const u32x w0r = words_buf_r[il_pos / VECT_SIZE];
+
+    const u32x w0 = w0l | w0r;
+
+    w[0] = w0;
+
+    sha1_ctx_t ctx0 = ctx1;
+
+    sha1_update (&ctx0, w, pw_len);
+
+    sha1_update (&ctx0, s, salt_len);
+
+    sha1_final (&ctx0);
+
+    buf[0] = ctx0.h[0];
+    buf[1] = ctx0.h[1];
+    buf[2] = ctx0.h[2];
+    buf[3] = ctx0.h[3];
+    buf[4] = ctx0.h[4];
+
+    for (int i = 0; i < salt_iter; i++)
+    {
+      sha1_ctx_t ctx = ctx1;
+      
+      ctx.w0[0] = (buf[0]);
+      ctx.w0[1] = (buf[1]);
+      ctx.w0[2] = (buf[2]);
+      ctx.w0[3] = (buf[3]);
+      ctx.w1[0] = (buf[4]);
+
+      ctx.len = 20;
+
+      sha1_final (&ctx);
+
+      buf[0] = ctx.h[0];
+      buf[1] = ctx.h[1];
+      buf[2] = ctx.h[2];
+      buf[3] = ctx.h[3];
+      buf[4] = ctx.h[4];
+    }
+
+    const u32 r0 = buf[DGST_R0];
+    const u32 r1 = buf[DGST_R1];
+    const u32 r2 = buf[DGST_R2];
+    const u32 r3 = buf[DGST_R3];
+
+    COMPARE_S_SIMD (r0, r1, r2, r3);
+  }
+}

src/modules/module_32900.c

@@ -0,0 +1,249 @@
+/**
+ * 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"
+
+static const u32   ATTACK_EXEC    = ATTACK_EXEC_INSIDE_KERNEL;
+static const u32   DGST_POS0      = 3;
+static const u32   DGST_POS1      = 4;
+static const u32   DGST_POS2      = 2;
+static const u32   DGST_POS3      = 1;
+static const u32   DGST_SIZE      = DGST_SIZE_4_5;
+static const u32   HASH_CATEGORY  = HASH_CATEGORY_FRAMEWORK;
+static const char *HASH_NAME      = "PBKDF1-SHA1";
+static const u64   KERN_TYPE      = 32900;
+static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE
+                                  | OPTI_TYPE_APPENDED_SALT
+                                  | OPTI_TYPE_RAW_HASH;
+static const u64   OPTS_TYPE      = OPTS_TYPE_STOCK_MODULE
+                                  | OPTS_TYPE_PT_GENERATE_BE
+                                  | OPTS_TYPE_PT_ADD80
+                                  | OPTS_TYPE_PT_ADDBITS15;
+static const u32   SALT_TYPE      = SALT_TYPE_EMBEDDED;
+static const char *ST_PASS        = "hashcat";
+static const char *ST_HASH        = "PBKDF1:sha1:1000:cGVuZ3VpbmtlZXBlcg==:J4BrIhXDUHNQ9lPPrWKn4V7Of9Y=";
+
+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_PBKDF1 = "PBKDF1";
+
+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)
+{
+  u32 *digest = (u32 *) digest_buf;
+
+  hc_token_t token;
+
+  memset (&token, 0, sizeof (hc_token_t));
+
+  token.token_cnt  = 5;
+
+  token.signatures_cnt    = 1;
+  token.signatures_buf[0] = SIGNATURE_PBKDF1;
+
+  // Signature
+  token.sep[0]     = ':';
+  token.len[0]     = 6;
+  token.attr[0]    = TOKEN_ATTR_FIXED_LENGTH
+                   | TOKEN_ATTR_VERIFY_SIGNATURE;
+
+  // Primitive "sha1"
+  token.sep[1]     = ':';
+  token.len[1]     = 4;
+  token.attr[1]    = TOKEN_ATTR_FIXED_LENGTH;
+
+  // Iterations
+  token.sep[2]     = ':';
+  token.attr[2]    = TOKEN_ATTR_VERIFY_DIGIT;
+
+  // Salt
+  token.sep[3]     = ':';
+  token.len_min[3] = SALT_MIN;
+  token.len_max[3] = SALT_MAX;
+  token.attr[3]    = TOKEN_ATTR_VERIFY_LENGTH
+                   | TOKEN_ATTR_VERIFY_BASE64A;
+
+  // Hash
+  token.sep[4]     = ':';
+  token.len[4]     = 28;
+  token.attr[4]    = TOKEN_ATTR_FIXED_LENGTH
+                   | TOKEN_ATTR_VERIFY_BASE64A;
+
+  const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
+
+  if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
+
+  // iterations
+
+  const u8 *iter_pos = token.buf[2];
+
+  const int iter = strtol ((const char *) iter_pos, NULL, 10);
+
+  if (iter < 1) return (PARSER_SALT_ITERATION);
+
+  salt->salt_iter = iter - 1;
+
+  // base64 decode salt
+
+  const u8 *salt_pos = token.buf[3];
+  const int salt_len = token.len[3];
+
+  u8 *salt_buf_ptr = (u8 *) salt->salt_buf;
+
+  u8 tmp_buf[1000];
+
+  memset (tmp_buf, 0, sizeof (tmp_buf));
+
+  salt->salt_len = base64_decode (base64_to_int, salt_pos, salt_len, tmp_buf);
+
+  if (salt->salt_len > 255) return (PARSER_SALT_LENGTH);
+
+  memcpy (salt_buf_ptr, tmp_buf, salt_len);
+
+  // base64 decode hash
+
+  const u8 *hash_pos = token.buf[4];
+  const int hash_len = token.len[4];
+
+  memset (tmp_buf, 0, sizeof (tmp_buf));
+
+  base64_decode (base64_to_int, hash_pos, hash_len, tmp_buf);
+
+  memcpy (digest, tmp_buf, 20);
+
+  digest[0] = byte_swap_32 (digest[0]);
+  digest[1] = byte_swap_32 (digest[1]);
+  digest[2] = byte_swap_32 (digest[2]);
+  digest[3] = byte_swap_32 (digest[3]);
+  digest[4] = byte_swap_32 (digest[4]);
+
+  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 u32 *digest = (const u32 *) digest_buf;
+
+  // hash
+
+  u32 tmp[5];
+
+  tmp[0] = byte_swap_32 (digest[0]);
+  tmp[1] = byte_swap_32 (digest[1]);
+  tmp[2] = byte_swap_32 (digest[2]);
+  tmp[3] = byte_swap_32 (digest[3]);
+  tmp[4] = byte_swap_32 (digest[4]);
+
+  char tmp_buf[64] = { 0 };
+
+  base64_encode (int_to_base64, (const u8 *) tmp, 20, (u8 *) tmp_buf);
+
+  char salt_buf[500] = { 0 };
+
+  base64_encode (int_to_base64, (const u8 *) salt->salt_buf, salt->salt_len, (u8 *) salt_buf);
+
+  // output
+
+  const int line_len = snprintf (line_buf, line_size, "%s:sha1:%u:%s:%s", SIGNATURE_PBKDF1, salt->salt_iter + 1, (const char *) salt_buf, tmp_buf);
+
+  return line_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_charset        = 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_deprecated_notice        = 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_DEFAULT;
+  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;
+  module_ctx->module_hash_binary_save         = MODULE_DEFAULT;
+  module_ctx->module_hash_decode_postprocess  = 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_DEFAULT;
+  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_DEFAULT;
+  module_ctx->module_kernel_loops_min         = MODULE_DEFAULT;
+  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_DEFAULT;
+  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_DEFAULT;
+  module_ctx->module_unstable_warning         = MODULE_DEFAULT;
+  module_ctx->module_warmup_disable           = MODULE_DEFAULT;
+}

tools/test_modules/m32900.pm

@@ -0,0 +1,75 @@
+#!/usr/bin/env perl
+
+##
+## Author......: See docs/credits.txt
+## License.....: MIT
+##
+
+use strict;
+use warnings;
+
+use Digest::SHA qw (sha1);
+use MIME::Base64 qw (encode_base64);
+use MIME::Base64 qw (decode_base64);
+
+sub module_constraints { [[0, 256], [4, 100], [-1, -1], [-1, -1], [-1, -1]] }
+
+sub module_generate_hash
+{
+  my $word = shift;
+  my $salt = shift;
+  my $iter = shift // 1000;
+  my $verify_mode = shift // 0;
+
+  my $salt_decoded = "";
+
+  # Check if called through module_verify_hash
+  if ($verify_mode == 1)
+  {
+    $salt_decoded = decode_base64($salt);
+  }
+  else
+  {
+    $salt_decoded = $salt;
+  }
+
+  my $digest = $word . $salt_decoded;
+
+  for (my $i = 1 ; $i <= $iter ; $i++)
+  {
+    $digest = sha1 ($digest);
+  }
+
+  my $hash_buf = encode_base64 ($digest, "");
+
+  my $salt_buf = encode_base64 ($salt_decoded, "");
+  
+  my $hash = sprintf ("PBKDF1:sha1:%i:%s:%s", $iter, $salt_buf, $hash_buf);
+
+  return $hash;
+}
+
+sub module_verify_hash
+{
+  my $line = shift;
+  
+  my ($signature, $primitive, $iter, $salt, $hash, $word) = split (':', $line);
+
+  return unless defined $signature;
+  return unless defined $primitive;
+  return unless defined $iter;
+  return unless defined $salt;
+  return unless defined $hash;
+  return unless defined $word;
+
+  return unless ($signature eq 'PBKDF1');
+  return unless ($primitive eq 'sha1');
+
+  my $word_packed = pack_if_HEX_notation ($word);
+
+  my $new_hash = module_generate_hash ($word_packed, $salt, $iter, 1);
+
+  return ($new_hash, $word);
+}
+
+1;