diff --git a/OpenCL/m31900-pure.cl b/OpenCL/m31900-pure.cl
new file mode 100644
index 000000000..24ffb1232
--- /dev/null
+++ b/OpenCL/m31900-pure.cl
@@ -0,0 +1,451 @@
+/**
+ * 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_sha512.cl)
+#include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
+#endif
+
+#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
+#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
+
+typedef struct pbkdf2_sha512_tmp
+{
+  u64 ipad[8];
+  u64 opad[8];
+
+  u64 dgst[32];
+  u64 out[32];
+
+} pbkdf2_sha512_tmp_t;
+
+typedef struct pbkdf2_sha512_aes_cbc
+{
+  u32 salt_buf[64];
+  u32 iv_buf[4];
+  u32 iv_len;
+  u32 ct_buf[4];
+  u32 ct_len;
+
+} pbkdf2_sha512_aes_cbc_t;
+
+DECLSPEC void hmac_sha512_run_V (PRIVATE_AS u32x *w0, PRIVATE_AS u32x *w1, PRIVATE_AS u32x *w2, PRIVATE_AS u32x *w3, PRIVATE_AS u32x *w4, PRIVATE_AS u32x *w5, PRIVATE_AS u32x *w6, PRIVATE_AS u32x *w7, PRIVATE_AS u64x *ipad, PRIVATE_AS u64x *opad, PRIVATE_AS u64x *digest)
+{
+  digest[0] = ipad[0];
+  digest[1] = ipad[1];
+  digest[2] = ipad[2];
+  digest[3] = ipad[3];
+  digest[4] = ipad[4];
+  digest[5] = ipad[5];
+  digest[6] = ipad[6];
+  digest[7] = ipad[7];
+
+  sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest);
+
+  w0[0] = h32_from_64 (digest[0]);
+  w0[1] = l32_from_64 (digest[0]);
+  w0[2] = h32_from_64 (digest[1]);
+  w0[3] = l32_from_64 (digest[1]);
+  w1[0] = h32_from_64 (digest[2]);
+  w1[1] = l32_from_64 (digest[2]);
+  w1[2] = h32_from_64 (digest[3]);
+  w1[3] = l32_from_64 (digest[3]);
+  w2[0] = h32_from_64 (digest[4]);
+  w2[1] = l32_from_64 (digest[4]);
+  w2[2] = h32_from_64 (digest[5]);
+  w2[3] = l32_from_64 (digest[5]);
+  w3[0] = h32_from_64 (digest[6]);
+  w3[1] = l32_from_64 (digest[6]);
+  w3[2] = h32_from_64 (digest[7]);
+  w3[3] = l32_from_64 (digest[7]);
+  w4[0] = 0x80000000;
+  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] = (128 + 64) * 8;
+
+  digest[0] = opad[0];
+  digest[1] = opad[1];
+  digest[2] = opad[2];
+  digest[3] = opad[3];
+  digest[4] = opad[4];
+  digest[5] = opad[5];
+  digest[6] = opad[6];
+  digest[7] = opad[7];
+
+  sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest);
+}
+
+KERNEL_FQ void m31900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_aes_cbc_t))
+{
+  /**
+   * base
+   */
+
+  const u64 gid = get_global_id (0);
+
+  if (gid >= GID_CNT) return;
+
+  sha512_hmac_ctx_t sha512_hmac_ctx;
+
+  sha512_hmac_init_global_swap (&sha512_hmac_ctx, pws[gid].i, pws[gid].pw_len);
+
+  tmps[gid].ipad[0] = sha512_hmac_ctx.ipad.h[0];
+  tmps[gid].ipad[1] = sha512_hmac_ctx.ipad.h[1];
+  tmps[gid].ipad[2] = sha512_hmac_ctx.ipad.h[2];
+  tmps[gid].ipad[3] = sha512_hmac_ctx.ipad.h[3];
+  tmps[gid].ipad[4] = sha512_hmac_ctx.ipad.h[4];
+  tmps[gid].ipad[5] = sha512_hmac_ctx.ipad.h[5];
+  tmps[gid].ipad[6] = sha512_hmac_ctx.ipad.h[6];
+  tmps[gid].ipad[7] = sha512_hmac_ctx.ipad.h[7];
+
+  tmps[gid].opad[0] = sha512_hmac_ctx.opad.h[0];
+  tmps[gid].opad[1] = sha512_hmac_ctx.opad.h[1];
+  tmps[gid].opad[2] = sha512_hmac_ctx.opad.h[2];
+  tmps[gid].opad[3] = sha512_hmac_ctx.opad.h[3];
+  tmps[gid].opad[4] = sha512_hmac_ctx.opad.h[4];
+  tmps[gid].opad[5] = sha512_hmac_ctx.opad.h[5];
+  tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6];
+  tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7];
+
+  sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len);
+
+  for (u32 i = 0, j = 1; i < 8; i += 8, j += 1)
+  {
+    sha512_hmac_ctx_t sha512_hmac_ctx2 = sha512_hmac_ctx;
+
+    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] = j;
+    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] = 0;
+
+    sha512_hmac_update_128 (&sha512_hmac_ctx2, w0, w1, w2, w3, w4, w5, w6, w7, 4);
+
+    sha512_hmac_final (&sha512_hmac_ctx2);
+
+    tmps[gid].dgst[i + 0] = sha512_hmac_ctx2.opad.h[0];
+    tmps[gid].dgst[i + 1] = sha512_hmac_ctx2.opad.h[1];
+    tmps[gid].dgst[i + 2] = sha512_hmac_ctx2.opad.h[2];
+    tmps[gid].dgst[i + 3] = sha512_hmac_ctx2.opad.h[3];
+    tmps[gid].dgst[i + 4] = sha512_hmac_ctx2.opad.h[4];
+    tmps[gid].dgst[i + 5] = sha512_hmac_ctx2.opad.h[5];
+    tmps[gid].dgst[i + 6] = sha512_hmac_ctx2.opad.h[6];
+    tmps[gid].dgst[i + 7] = sha512_hmac_ctx2.opad.h[7];
+
+    tmps[gid].out[i + 0] = tmps[gid].dgst[i + 0];
+    tmps[gid].out[i + 1] = tmps[gid].dgst[i + 1];
+    tmps[gid].out[i + 2] = tmps[gid].dgst[i + 2];
+    tmps[gid].out[i + 3] = tmps[gid].dgst[i + 3];
+    tmps[gid].out[i + 4] = tmps[gid].dgst[i + 4];
+    tmps[gid].out[i + 5] = tmps[gid].dgst[i + 5];
+    tmps[gid].out[i + 6] = tmps[gid].dgst[i + 6];
+    tmps[gid].out[i + 7] = tmps[gid].dgst[i + 7];
+  }
+}
+
+KERNEL_FQ void m31900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_aes_cbc_t))
+{
+  const u64 gid = get_global_id (0);
+
+  if ((gid * VECT_SIZE) >= GID_CNT) return;
+
+  u64x ipad[8];
+  u64x opad[8];
+
+  ipad[0] = pack64v (tmps, ipad, gid, 0);
+  ipad[1] = pack64v (tmps, ipad, gid, 1);
+  ipad[2] = pack64v (tmps, ipad, gid, 2);
+  ipad[3] = pack64v (tmps, ipad, gid, 3);
+  ipad[4] = pack64v (tmps, ipad, gid, 4);
+  ipad[5] = pack64v (tmps, ipad, gid, 5);
+  ipad[6] = pack64v (tmps, ipad, gid, 6);
+  ipad[7] = pack64v (tmps, ipad, gid, 7);
+
+  opad[0] = pack64v (tmps, opad, gid, 0);
+  opad[1] = pack64v (tmps, opad, gid, 1);
+  opad[2] = pack64v (tmps, opad, gid, 2);
+  opad[3] = pack64v (tmps, opad, gid, 3);
+  opad[4] = pack64v (tmps, opad, gid, 4);
+  opad[5] = pack64v (tmps, opad, gid, 5);
+  opad[6] = pack64v (tmps, opad, gid, 6);
+  opad[7] = pack64v (tmps, opad, gid, 7);
+
+  for (u32 i = 0; i < 8; i += 8)
+  {
+    u64x dgst[8];
+    u64x out[8];
+
+    dgst[0] = pack64v (tmps, dgst, gid, i + 0);
+    dgst[1] = pack64v (tmps, dgst, gid, i + 1);
+    dgst[2] = pack64v (tmps, dgst, gid, i + 2);
+    dgst[3] = pack64v (tmps, dgst, gid, i + 3);
+    dgst[4] = pack64v (tmps, dgst, gid, i + 4);
+    dgst[5] = pack64v (tmps, dgst, gid, i + 5);
+    dgst[6] = pack64v (tmps, dgst, gid, i + 6);
+    dgst[7] = pack64v (tmps, dgst, gid, i + 7);
+
+    out[0] = pack64v (tmps, out, gid, i + 0);
+    out[1] = pack64v (tmps, out, gid, i + 1);
+    out[2] = pack64v (tmps, out, gid, i + 2);
+    out[3] = pack64v (tmps, out, gid, i + 3);
+    out[4] = pack64v (tmps, out, gid, i + 4);
+    out[5] = pack64v (tmps, out, gid, i + 5);
+    out[6] = pack64v (tmps, out, gid, i + 6);
+    out[7] = pack64v (tmps, out, gid, i + 7);
+
+    for (u32 j = 0; j < LOOP_CNT; j++)
+    {
+      u32x w0[4];
+      u32x w1[4];
+      u32x w2[4];
+      u32x w3[4];
+      u32x w4[4];
+      u32x w5[4];
+      u32x w6[4];
+      u32x w7[4];
+
+      w0[0] = h32_from_64 (dgst[0]);
+      w0[1] = l32_from_64 (dgst[0]);
+      w0[2] = h32_from_64 (dgst[1]);
+      w0[3] = l32_from_64 (dgst[1]);
+      w1[0] = h32_from_64 (dgst[2]);
+      w1[1] = l32_from_64 (dgst[2]);
+      w1[2] = h32_from_64 (dgst[3]);
+      w1[3] = l32_from_64 (dgst[3]);
+      w2[0] = h32_from_64 (dgst[4]);
+      w2[1] = l32_from_64 (dgst[4]);
+      w2[2] = h32_from_64 (dgst[5]);
+      w2[3] = l32_from_64 (dgst[5]);
+      w3[0] = h32_from_64 (dgst[6]);
+      w3[1] = l32_from_64 (dgst[6]);
+      w3[2] = h32_from_64 (dgst[7]);
+      w3[3] = l32_from_64 (dgst[7]);
+      w4[0] = 0x80000000;
+      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] = (128 + 64) * 8;
+
+      hmac_sha512_run_V (w0, w1, w2, w3, w4, w5, w6, w7, ipad, opad, dgst);
+
+      out[0] ^= dgst[0];
+      out[1] ^= dgst[1];
+      out[2] ^= dgst[2];
+      out[3] ^= dgst[3];
+      out[4] ^= dgst[4];
+      out[5] ^= dgst[5];
+      out[6] ^= dgst[6];
+      out[7] ^= dgst[7];
+    }
+
+    unpack64v (tmps, dgst, gid, i + 0, dgst[0]);
+    unpack64v (tmps, dgst, gid, i + 1, dgst[1]);
+    unpack64v (tmps, dgst, gid, i + 2, dgst[2]);
+    unpack64v (tmps, dgst, gid, i + 3, dgst[3]);
+    unpack64v (tmps, dgst, gid, i + 4, dgst[4]);
+    unpack64v (tmps, dgst, gid, i + 5, dgst[5]);
+    unpack64v (tmps, dgst, gid, i + 6, dgst[6]);
+    unpack64v (tmps, dgst, gid, i + 7, dgst[7]);
+
+    unpack64v (tmps, out, gid, i + 0, out[0]);
+    unpack64v (tmps, out, gid, i + 1, out[1]);
+    unpack64v (tmps, out, gid, i + 2, out[2]);
+    unpack64v (tmps, out, gid, i + 3, out[3]);
+    unpack64v (tmps, out, gid, i + 4, out[4]);
+    unpack64v (tmps, out, gid, i + 5, out[5]);
+    unpack64v (tmps, out, gid, i + 6, out[6]);
+    unpack64v (tmps, out, gid, i + 7, out[7]);
+  }
+}
+
+KERNEL_FQ void m31900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_aes_cbc_t))
+{
+  const u64 gid = get_global_id (0);
+  const u64 lid = get_local_id (0);
+  const u64 lsz = get_local_size (0);
+
+  /**
+   * aes shared
+   */
+
+  #ifdef REAL_SHM
+
+  LOCAL_VK u32 s_td0[256];
+  LOCAL_VK u32 s_td1[256];
+  LOCAL_VK u32 s_td2[256];
+  LOCAL_VK u32 s_td3[256];
+  LOCAL_VK u32 s_td4[256];
+
+  LOCAL_VK u32 s_te0[256];
+  LOCAL_VK u32 s_te1[256];
+  LOCAL_VK u32 s_te2[256];
+  LOCAL_VK u32 s_te3[256];
+  LOCAL_VK u32 s_te4[256];
+
+  for (u32 i = lid; i < 256; i += lsz)
+  {
+    s_td0[i] = td0[i];
+    s_td1[i] = td1[i];
+    s_td2[i] = td2[i];
+    s_td3[i] = td3[i];
+    s_td4[i] = td4[i];
+
+    s_te0[i] = te0[i];
+    s_te1[i] = te1[i];
+    s_te2[i] = te2[i];
+    s_te3[i] = te3[i];
+    s_te4[i] = te4[i];
+  }
+
+  SYNC_THREADS ();
+
+  #else
+
+  CONSTANT_AS u32a *s_td0 = td0;
+  CONSTANT_AS u32a *s_td1 = td1;
+  CONSTANT_AS u32a *s_td2 = td2;
+  CONSTANT_AS u32a *s_td3 = td3;
+  CONSTANT_AS u32a *s_td4 = td4;
+
+  CONSTANT_AS u32a *s_te0 = te0;
+  CONSTANT_AS u32a *s_te1 = te1;
+  CONSTANT_AS u32a *s_te2 = te2;
+  CONSTANT_AS u32a *s_te3 = te3;
+  CONSTANT_AS u32a *s_te4 = te4;
+
+  #endif
+
+  if (gid >= GID_CNT) return;
+
+  // keys
+
+  u32 ukey[8];
+
+  ukey[0] = h32_from_64_S (tmps[gid].out[0]);
+  ukey[1] = l32_from_64_S (tmps[gid].out[0]);
+  ukey[2] = h32_from_64_S (tmps[gid].out[1]);
+  ukey[3] = l32_from_64_S (tmps[gid].out[1]);
+  ukey[4] = h32_from_64_S (tmps[gid].out[2]);
+  ukey[5] = l32_from_64_S (tmps[gid].out[2]);
+  ukey[6] = h32_from_64_S (tmps[gid].out[3]);
+  ukey[7] = l32_from_64_S (tmps[gid].out[3]);
+
+  u32 ks[60];
+
+  AES256_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3);
+
+  // iv
+
+  u32 iv_buf[4];
+
+  iv_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0];
+  iv_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1];
+  iv_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2];
+  iv_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3];
+
+  // ct
+
+  u32 ct_buf[4];
+
+  ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0];
+  ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1];
+  ct_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2];
+  ct_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3];
+
+  // decrypt first block
+
+  u32 pt_buf[4] = { 0 };
+
+  AES256_decrypt (ks, ct_buf, pt_buf, s_td0, s_td1, s_td2, s_td3, s_td4);
+
+  pt_buf[0] ^= iv_buf[0];
+  pt_buf[1] ^= iv_buf[1];
+  pt_buf[2] ^= iv_buf[2];
+  pt_buf[3] ^= iv_buf[3];
+
+  const int correct = is_valid_printable_32 (pt_buf[0])
+                    + is_valid_printable_32 (pt_buf[1])
+                    + is_valid_printable_32 (pt_buf[2])
+                    + is_valid_printable_32 (pt_buf[3]);
+
+  if (correct != 4) return;
+
+  const u32 r0 = ct_buf[0];
+  const u32 r1 = ct_buf[1];
+  const u32 r2 = ct_buf[2];
+  const u32 r3 = ct_buf[3];
+
+  #define il_pos 0
+
+  #ifdef KERNEL_STATIC
+  #include COMPARE_M
+  #endif
+}
diff --git a/docs/changes.txt b/docs/changes.txt
index e838fab01..12f18e604 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -20,6 +20,7 @@
 - Added hash-mode: GPG (AES-128/AES-256 (SHA-1($pass)))
 - Added hash-mode: GPG (AES-128/AES-256 (SHA-256($pass)))
 - Added hash-mode: GPG (AES-128/AES-256 (SHA-512($pass)))
+- Added hash-mode: MetaMask Mobile Wallet
 - Added hash-mode: MetaMask Wallet (short hash, plaintext check)
 - Added hash-mode: SecureCRT MasterPassphrase v2
 - Added hash-mode: Veeam VB
@@ -62,6 +63,7 @@
 - Scrypt: Increase buffer sizes in module for hash mode 8900 to allow longer scrypt digests
 - Unicode: Update UTF-8 to UTF-16 conversion to match RFC 3629
 - User Options: Added error message when mixing --username and --show to warn users of exponential delay
+- MetaMask: update extraction tool to support MetaMask Mobile wallets
 
 * changes v6.2.5 -> v6.2.6
 
diff --git a/src/modules/module_31900.c b/src/modules/module_31900.c
new file mode 100644
index 000000000..96c6840be
--- /dev/null
+++ b/src/modules/module_31900.c
@@ -0,0 +1,356 @@
+/**
+ * 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"
+
+static const u32   ATTACK_EXEC    = ATTACK_EXEC_OUTSIDE_KERNEL;
+static const u32   DGST_POS0      = 0;
+static const u32   DGST_POS1      = 1;
+static const u32   DGST_POS2      = 2;
+static const u32   DGST_POS3      = 3;
+static const u32   DGST_SIZE      = DGST_SIZE_4_4;
+static const u32   HASH_CATEGORY  = HASH_CATEGORY_CRYPTOCURRENCY_WALLET;
+static const char *HASH_NAME      = "MetaMask Mobile Wallet";
+static const u64   KERN_TYPE      = 31900;
+static const u32   OPTI_TYPE      = OPTI_TYPE_ZERO_BYTE
+                                  | OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
+static const u64   OPTS_TYPE      = OPTS_TYPE_STOCK_MODULE
+                                  | OPTS_TYPE_PT_GENERATE_LE;
+static const u32   SALT_TYPE      = SALT_TYPE_EMBEDDED;
+static const char *ST_PASS        = "hashcat1";
+static const char *ST_HASH        = "$metamaskMobile$MjU1NTA5MTU2ODY5MjY4OQ==$3cccb51c401e54abc82987fd9310a8d3$WQhIECN0blOaV31RC3lKfQ==";
+
+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;         }
+
+typedef struct pbkdf2_sha512_tmp
+{
+  u64 ipad[8];
+  u64 opad[8];
+
+  u64 dgst[32];
+  u64 out[32];
+
+} pbkdf2_sha512_tmp_t;
+
+typedef struct pbkdf2_sha512_aes_cbc
+{
+  u32 salt_buf[64];
+  u32 iv_buf[4];
+  u32 iv_len;
+  u32 ct_buf[4];
+  u32 ct_len;
+
+} pbkdf2_sha512_aes_cbc_t;
+
+static const char *SIGNATURE_METAMASK_WALLET = "$metamaskMobile$";
+
+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 (pbkdf2_sha512_aes_cbc_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 (pbkdf2_sha512_tmp_t);
+
+  return tmp_size;
+}
+
+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;
+}
+
+u32 module_pw_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)
+{
+  // this overrides the reductions of PW_MAX in case optimized kernel is selected
+  // IOW, even in optimized kernel mode it support length 256
+
+  const u32 pw_max = PW_MAX;
+
+  return pw_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)
+{
+  u32 *digest = (u32 *) digest_buf;
+
+  pbkdf2_sha512_aes_cbc_t *metamask = (pbkdf2_sha512_aes_cbc_t *) esalt_buf;
+
+  #define CT_MAX_LEN_BASE64 ((3136 * 8) / 6) + 3
+
+  hc_token_t token;
+
+  token.token_cnt  = 4;
+
+  token.signatures_cnt    = 1;
+  token.signatures_buf[0] = SIGNATURE_METAMASK_WALLET;
+
+  token.len[0]     = strlen (SIGNATURE_METAMASK_WALLET);
+  token.attr[0]    = TOKEN_ATTR_FIXED_LENGTH
+                   | TOKEN_ATTR_VERIFY_SIGNATURE;
+
+  token.sep[1]     = '$';
+  token.len_min[1] = 24;
+  token.len_max[1] = 24;
+  token.attr[1]    = TOKEN_ATTR_VERIFY_LENGTH
+                   | TOKEN_ATTR_VERIFY_BASE64A;
+
+  token.sep[2]     = '$';
+  token.len_min[2] = 32;
+  token.len_max[2] = 32;
+  token.attr[2]    = TOKEN_ATTR_VERIFY_LENGTH
+                   | TOKEN_ATTR_VERIFY_HEX;
+
+  token.sep[3]     = '$';
+  token.len_min[3] = 24;
+  token.len_max[3] = 24;
+  token.attr[3]    = TOKEN_ATTR_VERIFY_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);
+
+  size_t tmp_len = 0;
+
+  // iter
+
+  salt->salt_iter = 5000 - 1;
+
+  // salt
+
+  const u8 *salt_pos = token.buf[1];
+  const int salt_len = token.len[1];
+
+  memcpy ((u8 *) metamask->salt_buf, salt_pos, salt_len);
+
+  salt->salt_len = salt_len;
+
+  memcpy ((u8 *) salt->salt_buf, metamask->salt_buf, salt->salt_len);
+
+  // iv
+
+  const u8 *iv_pos = token.buf[2];
+  const int iv_len = token.len[2] / 2;
+
+  metamask->iv_buf[0] = hex_to_u32 (iv_pos +  0);
+  metamask->iv_buf[1] = hex_to_u32 (iv_pos +  8);
+  metamask->iv_buf[2] = hex_to_u32 (iv_pos + 16);
+  metamask->iv_buf[3] = hex_to_u32 (iv_pos + 24);
+
+  metamask->iv_buf[0] = byte_swap_32 (metamask->iv_buf[0]);
+  metamask->iv_buf[1] = byte_swap_32 (metamask->iv_buf[1]);
+  metamask->iv_buf[2] = byte_swap_32 (metamask->iv_buf[2]);
+  metamask->iv_buf[3] = byte_swap_32 (metamask->iv_buf[3]);
+
+  metamask->iv_len = iv_len;
+
+  // ciphertext
+
+  const u8 *ct_pos = token.buf[3];
+  const int ct_len = token.len[3];
+
+  u8 tmp_buf[24+1];
+
+  memset (tmp_buf, 0, sizeof (tmp_buf));
+
+  tmp_len = base64_decode (base64_to_int, ct_pos, ct_len, tmp_buf);
+
+  if (tmp_len != 16) return (PARSER_CT_LENGTH);
+
+  memcpy ((u8 *) metamask->ct_buf, tmp_buf, tmp_len);
+
+  metamask->ct_buf[0] = byte_swap_32 (metamask->ct_buf[0]);
+  metamask->ct_buf[1] = byte_swap_32 (metamask->ct_buf[1]);
+  metamask->ct_buf[2] = byte_swap_32 (metamask->ct_buf[2]);
+  metamask->ct_buf[3] = byte_swap_32 (metamask->ct_buf[3]);
+
+  metamask->ct_len = tmp_len / 4;
+
+  // digest
+
+  digest[0] = metamask->ct_buf[0];
+  digest[1] = metamask->ct_buf[1];
+  digest[2] = metamask->ct_buf[2];
+  digest[3] = metamask->ct_buf[3];
+
+  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;
+
+  pbkdf2_sha512_aes_cbc_t *metamask = (pbkdf2_sha512_aes_cbc_t *) esalt_buf;
+
+  // salt
+
+  u8 *salt_buf = (u8 *) salt->salt_buf;
+
+  // iv
+
+  u8 iv_buf[32+1];
+
+  memset (iv_buf, 0, sizeof (iv_buf));
+
+  u32_to_hex (byte_swap_32 (metamask->iv_buf[0]), iv_buf +  0);
+  u32_to_hex (byte_swap_32 (metamask->iv_buf[1]), iv_buf +  8);
+  u32_to_hex (byte_swap_32 (metamask->iv_buf[2]), iv_buf + 16);
+  u32_to_hex (byte_swap_32 (metamask->iv_buf[3]), iv_buf + 24);
+
+  // ct
+
+  u32 tmp_buf[4];
+
+  tmp_buf[0] = byte_swap_32 (digest[0]);
+  tmp_buf[1] = byte_swap_32 (digest[1]);
+  tmp_buf[2] = byte_swap_32 (digest[2]);
+  tmp_buf[3] = byte_swap_32 (digest[3]);
+
+  u8 ct_buf[24+1];
+
+  memset (ct_buf, 0, sizeof (ct_buf));
+
+  base64_encode (int_to_base64, (const u8 *) tmp_buf, (const int) metamask->ct_len * 4, ct_buf);
+
+  u8 *out_buf = (u8 *) line_buf;
+
+  int out_len = snprintf ((char *) out_buf, line_size, "%s%s$%s$%s",
+    SIGNATURE_METAMASK_WALLET,
+    salt_buf,
+    iv_buf,
+    ct_buf);
+
+  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_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_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;
+  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_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_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_pw_max;
+  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_DEFAULT;
+  module_ctx->module_warmup_disable           = MODULE_DEFAULT;
+}
diff --git a/tools/2hashcat_tests/metamask2hashcat.android.json b/tools/2hashcat_tests/metamask2hashcat.android.json
new file mode 100644
index 000000000..443668f83
--- /dev/null
+++ b/tools/2hashcat_tests/metamask2hashcat.android.json
@@ -0,0 +1 @@
+{"collectibles":"{\"favorites\":{}}","engine":"{\"backgroundState\":{\"AccountTrackerController\":{\"accounts\":{\"0x66F9C09118B1C726BC24811a611baf60af42070A\":{\"balance\":\"0x0\"}},\"_U\":0,\"_V\":0,\"_W\":null,\"_X\":null},\"AddressBookController\":{\"addressBook\":{}},\"AssetsContractController\":{},\"CollectiblesController\":{\"allCollectibleContracts\":{},\"allCollectibles\":{},\"ignoredCollectibles\":[],\"collectibleContracts\":[],\"collectibles\":[]},\"CurrencyRateController\":{\"conversionDate\":1650127160.54,\"conversionRate\":3025.29,\"nativeCurrency\":\"ETH\",\"currentCurrency\":\"usd\",\"pendingCurrentCurrency\":null,\"pendingNativeCurrency\":null,\"usdConversionRate\":3025.29},\"KeyringController\":{\"keyrings\":[],\"vault\":\"{\\\"cipher\\\":\\\"pzGHRQw3aj//zSjUNAA83WC1EttUHvm4eNNd7YpdoA+bLsU1FXecXYckE3KGWcBIHIdQjdPp2OEgUms0D4XmoWFoAKVnuEUiokWMHy0jpI9z6QTpkSET7xaUY1ZAEWxas1HDBjUBFMhTsuOPiXD1k69tQkxTEe8bHcFFhFsEKfh743b0YypfFbTcOC5HdiuzwEkrtO+nhwBeHBzjzVyGgjQVlqFQiWzbg7JdVPvozbnB5KaongYSEn19o4EbxWiIx7RQWsQ88LR79fWS/nzT0udjxjj9Auu58lGAyvpYTHZzt6n1yapQVXRoHAV44h1AH30f8LY+c2yDKRcPtgc8qqTZXDWzwm4UeFf1BiwUXA6qjN9dFDa0F9Gvl8ugL9HbboGQHQcgQtIKbQnjQSmYucR7kUrZVn/i5jShNglt5lMb4WO28wBaMebBl0tIPPw8xa16tZ3C1Z7RmJrdr3HXDTrwSm5ybqkcngeIOLQwqIOT0WGkSAg6BAce/0oeAp1kgaZWj5BNqnGAsTzaHK1VggFbbQjoX/CQG65vEZBGQXsmdJSfd3m+sTAO113QCpiovvOQFAwcn5eQXQgIv57k2UCrE+SuQcahfd0cZ9GerjI=\\\",\\\"iv\\\":\\\"8fc2c478acc10f6428355312fce293de\\\",\\\"salt\\\":\\\"QW4ie0WH8XP7ust40yy7pg==\\\",\\\"lib\\\":\\\"original\\\"}\"},\"PersonalMessageManager\":{\"unapprovedMessages\":{},\"unapprovedMessagesCount\":0},\"NetworkController\":{\"network\":\"loading\",\"isCustomNetwork\":false,\"provider\":{\"type\":\"mainnet\",\"chainId\":\"1\"},\"properties\":{}},\"PreferencesController\":{\"featureFlags\":{},\"frequentRpcList\":[],\"identities\":{\"0x66F9C09118B1C726BC24811a611baf60af42070A\":{\"address\":\"0x66F9C09118B1C726BC24811a611baf60af42070A\",\"name\":\"Account 1\",\"importTime\":1650114145762}},\"ipfsGateway\":\"https://cloudflare-ipfs.com/ipfs/\",\"lostIdentities\":{},\"selectedAddress\":\"0x66F9C09118B1C726BC24811a611baf60af42070A\",\"useStaticTokenList\":true,\"useCollectibleDetection\":false,\"openSeaEnabled\":false,\"_U\":0,\"_V\":0,\"_W\":null,\"_X\":null},\"TokenBalancesController\":{\"contractBalances\":{}},\"TokenRatesController\":{\"contractExchangeRates\":{}},\"TokensController\":{\"allTokens\":{},\"allIgnoredTokens\":{},\"ignoredTokens\":[],\"suggestedAssets\":[],\"tokens\":[]},\"TransactionController\":{\"methodData\":{},\"transactions\":[],\"internalTransactions\":[],\"swapsTransactions\":{}},\"TypedMessageManager\":{\"unapprovedMessages\":{},\"unapprovedMessagesCount\":0},\"GasFeeController\":{\"gasFeeEstimates\":{},\"estimatedGasFeeTimeBounds\":{},\"gasEstimateType\":\"none\"},\"TokenDetectionController\":{},\"CollectibleDetectionController\":{},\"TokenListController\":{\"tokensChainsCache\":{}},\"SwapsController\":{\"quotes\":{},\"quoteValues\":{},\"fetchParams\":{\"slippage\":0,\"sourceToken\":\"\",\"sourceAmount\":0,\"destinationToken\":\"\",\"walletAddress\":\"\"},\"fetchParamsMetaData\":{\"sourceTokenInfo\":{\"decimals\":0,\"address\":\"\",\"symbol\":\"\"},\"destinationTokenInfo\":{\"decimals\":0,\"address\":\"\",\"symbol\":\"\"}},\"topAggSavings\":null,\"approvalTransaction\":null,\"quotesLastFetched\":0,\"error\":{\"key\":null,\"description\":null},\"topAggId\":null,\"isInPolling\":false,\"pollingCyclesLeft\":3,\"quoteRefreshSeconds\":null,\"usedGasEstimate\":null,\"usedCustomGas\":null},\"PhishingController\":{}}}","privacy":"{\"privacyMode\":true,\"thirdPartyApiMode\":true,\"approvedHosts\":{}}","bookmarks":"[]","recents":"[]","browser":"{\"activeTab\":null,\"history\":[],\"whitelist\":[],\"tabs\":[]}","modals":"{\"networkModalVisible\":false,\"accountsModalVisible\":false,\"collectibleContractModalVisible\":false,\"receiveModalVisible\":false,\"dappTransactionModalVisible\":false,\"approveModalVisible\":false}","settings":"{\"searchEngine\":\"DuckDuckGo\",\"primaryCurrency\":\"ETH\",\"useBlockieIcon\":true,\"hideZeroBalanceTokens\":false,\"lockTime\":30000}","alert":"{\"isVisible\":false,\"autodismiss\":null,\"content\":null,\"data\":null}","transaction":"{\"selectedAsset\":{},\"transaction\":{}}","user":"{\"loadingMsg\":\"Deleting current wallet\",\"loadingSet\":false,\"backUpSeedphraseVisible\":false,\"protectWalletModalVisible\":false,\"gasEducationCarouselSeen\":false,\"nftDetectionDismissed\":false,\"appTheme\":\"os\",\"passwordSet\":true,\"seedphraseBackedUp\":true,\"userLoggedIn\":true}","wizard":"{\"step\":0}","notification":"{\"notifications\":[]}","swaps":"{\"1\":{\"isLive\":true},\"isLive\":true,\"hasOnboarded\":false}","fiatOrders":"{\"selectedCountry\":\"US\",\"orders\":[]}","infuraAvailability":"{\"isBlocked\":false}","navigation":"{\"currentRoute\":\"WalletView\"}","networkOnboarded":"{\"networkOnboardedState\":[],\"networkState\":{\"showNetworkOnboarding\":false,\"nativeToken\":\"\",\"networkType\":\"\",\"networkUrl\":\"\"},\"switchedNetwork\":{\"networkUrl\":\"\",\"networkStatus\":false}}","_persist":"{\"version\":10,\"rehydrated\":true}"}
diff --git a/tools/2hashcat_tests/metamask2hashcat.ios.json b/tools/2hashcat_tests/metamask2hashcat.ios.json
new file mode 100644
index 000000000..9b90c972d
--- /dev/null
+++ b/tools/2hashcat_tests/metamask2hashcat.ios.json
@@ -0,0 +1 @@
+{"collectibles":"{\"favorites\":{}}","engine":"{\"backgroundState\":{\"AccountTrackerController\":{\"accounts\":{\"0x66F9C09118B1C726BC24811a611baf60af42070A\":{\"balance\":\"0x0\"}},\"_U\":0,\"_V\":0,\"_W\":null,\"_X\":null},\"AddressBookController\":{\"addressBook\":{}},\"AssetsContractController\":{},\"CollectiblesController\":{\"allCollectibleContracts\":{},\"allCollectibles\":{},\"ignoredCollectibles\":[],\"collectibleContracts\":[],\"collectibles\":[]},\"CurrencyRateController\":{\"conversionDate\":1649988414.582,\"conversionRate\":3019.01,\"nativeCurrency\":\"ETH\",\"currentCurrency\":\"usd\",\"pendingCurrentCurrency\":null,\"pendingNativeCurrency\":null,\"usdConversionRate\":3019.01},\"KeyringController\":{\"vault\":\"{\\\"cipher\\\":\\\"oyvzsghbruyPSrkcEv0B+qfkODclFQNIPWuvWHSgIMr26dcVDcsj+sBjzMrJ0mWP0jZQ1xhKt1bAp3v8+rLPauI8OsJ/1uoImqAcBRBu1ORUHmwk2kYIiYLC+qgqvf6OHZGmhF3OAT4Fpt4TSZIP5kVI12DHLNO0yLZDkBliXhQSmuhmY8CCpE13IaTrBWipe/E5lblr5zQWvgfz6lBzrxzE87eY4bAGJ5bh4P/5Nxc=\\\",\\\"iv\\\":\\\"9ec290a383a4c4cf5fcae9137455dc72\\\",\\\"salt\\\":\\\"ywv4d3UyjBtjVQ0gip0Swg==\\\",\\\"lib\\\":\\\"original\\\"}\"},\"PersonalMessageManager\":{\"unapprovedMessages\":{},\"unapprovedMessagesCount\":0},\"NetworkController\":{\"network\":\"1\",\"isCustomNetwork\":false,\"provider\":{\"type\":\"mainnet\",\"chainId\":\"1\"},\"properties\":{\"isEIP1559Compatible\":true}},\"PreferencesController\":{\"featureFlags\":{},\"frequentRpcList\":[],\"identities\":{\"0x66F9C09118B1C726BC24811a611baf60af42070A\":{\"address\":\"0x66F9C09118B1C726BC24811a611baf60af42070A\",\"name\":\"Account 1\",\"importTime\":1649815458524}},\"ipfsGateway\":\"https://cloudflare-ipfs.com/ipfs/\",\"lostIdentities\":{},\"selectedAddress\":\"0x66F9C09118B1C726BC24811a611baf60af42070A\",\"useStaticTokenList\":true,\"useCollectibleDetection\":false,\"openSeaEnabled\":false,\"_U\":0,\"_V\":0,\"_W\":null,\"_X\":null},\"TokenBalancesController\":{\"contractBalances\":{}},\"TokenRatesController\":{\"contractExchangeRates\":{}},\"TokensController\":{\"allTokens\":{},\"allIgnoredTokens\":{},\"ignoredTokens\":[],\"suggestedAssets\":[],\"tokens\":[]},\"TransactionController\":{\"methodData\":{},\"transactions\":[{\"blockNumber\":\"10717310\",\"id\":\"5edf6880-e552-11ea-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1598195253000,\"transaction\":{\"data\":\"0x\",\"from\":\"0x9aa65464b4cfbe3dc2bdb3df412aee2b3de86687\",\"gas\":\"0x5208\",\"gasPrice\":\"0x156ba09800\",\"gasUsed\":\"0x5208\",\"nonce\":\"0x3593\",\"to\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"value\":\"0x5b471c5b794400\"},\"transactionHash\":\"0x1331372b3750105d06a4d6e89a17cbd148b71a7c521f96ba3099c46457e5caef\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false},{\"blockNumber\":\"10717318\",\"id\":\"a6fe8b00-e552-11ea-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1598195374000,\"transaction\":{\"data\":\"0xa9059cbb000000000000000000000000da511c376ad5dbcc5e7ffccc5fb9396f91271f1d0000000000000000000000000000000000000000000000056bc75e2d63100000\",\"from\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"gas\":\"0x1036b\",\"gasPrice\":\"0x1ac688c51f\",\"gasUsed\":\"0x9d97\",\"nonce\":\"0x0\",\"to\":\"0xbe9375c6a420d2eeb258962efb95551a5b722803\",\"value\":\"0x0\"},\"transactionHash\":\"0xa75468b70d963d11dcfbe96213c1511e37c3e3aeb6fd676bc6ac51868626d302\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":true},{\"blockNumber\":\"10717322\",\"id\":\"c39ac300-e552-11ea-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1598195422000,\"transaction\":{\"data\":\"0x\",\"from\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"gas\":\"0x5208\",\"gasPrice\":\"0x165a0bc000\",\"gasUsed\":\"0x5208\",\"nonce\":\"0x1\",\"to\":\"0x36f403aa625e7122c1455c23624abf7378b5c80b\",\"value\":\"0x43a204cc0afbb7\"},\"transactionHash\":\"0xf0b86dfd64fbd28f446ac185c3cae4a7228aecad5fa77ac0551d5d9d7a768b6f\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false},{\"blockNumber\":\"14305381\",\"id\":\"e8d97e80-99de-11ec-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1646194321000,\"transaction\":{\"data\":\"0x\",\"from\":\"0xeb2629a2734e272bcc07bda959863f316f4bd4cf\",\"gas\":\"0x5208\",\"gasPrice\":\"0xa23f6685e\",\"gasUsed\":\"0x5208\",\"nonce\":\"0x49b32a\",\"to\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"value\":\"0x8d500fae96000\"},\"transactionHash\":\"0x106f49a9205a3c1d636b5d47766c948b54cd18180d4fe956520c5395c4393daa\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false},{\"blockNumber\":\"14305384\",\"id\":\"f858c780-99de-11ec-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1646194347000,\"transaction\":{\"data\":\"0x\",\"from\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"gas\":\"0x5208\",\"gasPrice\":\"0x1382de8600\",\"gasUsed\":\"0x5208\",\"nonce\":\"0x2\",\"to\":\"0x108b48bae093cea505fdd725c7bef561abda3f1b\",\"value\":\"0x294799d093000\"},\"transactionHash\":\"0xa26fa2604f27eecd2fb89e843ad034950b3aa2e5615b32138ea52930dbbc484b\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false},{\"blockNumber\":\"14305392\",\"id\":\"68674d80-99df-11ec-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1646194535000,\"transaction\":{\"data\":\"0x\",\"from\":\"0xb5d85cbf7cb3ee0d56b3bb207d5fc4b82f43f511\",\"gas\":\"0x5208\",\"gasPrice\":\"0xc6d980a03\",\"gasUsed\":\"0x5208\",\"nonce\":\"0x5d6a22\",\"to\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"value\":\"0x81f1ad9f4e000\"},\"transactionHash\":\"0xc98bfc1edbd1b36734466915ceccacb22b8024ed76a6911225df209bc737698e\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false},{\"blockNumber\":\"14305393\",\"id\":\"77e69680-99df-11ec-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1646194561000,\"transaction\":{\"data\":\"0x\",\"from\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"gas\":\"0x5208\",\"gasPrice\":\"0x156d6a5b80\",\"gasUsed\":\"0x5208\",\"nonce\":\"0x3\",\"to\":\"0x63889c748ec8d558b90f8bf93d9540851f01e74c\",\"value\":\"0x141635d530400\"},\"transactionHash\":\"0xcb35054a37268a871ca74e827fa6c7333de3a62102718acafc37cf7d99987312\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false},{\"blockNumber\":\"14305487\",\"id\":\"c21d4701-99e2-11ec-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1646195974000,\"transaction\":{\"data\":\"0xa9059cbb0000000000000000000000006d0c7d96c2cb4105a25301df2a1d102cc71cf8ae00000000000000000000000000000000000000000002bacd5bc40aa9c6800000\",\"from\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"gas\":\"0xcab7\",\"gasPrice\":\"0xdd2f15172\",\"gasUsed\":\"0xb7f7\",\"nonce\":\"0x4\",\"to\":\"0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce\",\"value\":\"0x0\"},\"transactionHash\":\"0x33c2a4c9f47072600ad15c6e48e8d2685046b96b6e1152871ef63de279cb1eb5\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":true},{\"blockNumber\":\"14305487\",\"id\":\"c21d4700-99e2-11ec-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1646195974000,\"transaction\":{\"data\":\"0x\",\"from\":\"0x6d0c7d96c2cb4105a25301df2a1d102cc71cf8ae\",\"gas\":\"0x5208\",\"gasPrice\":\"0xdd2f15172\",\"gasUsed\":\"0x5208\",\"nonce\":\"0xb\",\"to\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"value\":\"0xaf25434c52c7e\"},\"transactionHash\":\"0x3b7d33cd9878b2aa9dd9c4b025bffc49211c0a4b10a65c24e07a4e5c5bef103f\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false},{\"blockNumber\":\"14370492\",\"id\":\"62d5e880-a1d3-11ec-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1647068981000,\"transaction\":{\"data\":\"0x\",\"from\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"gas\":\"0x5208\",\"gasPrice\":\"0x296352580\",\"gasUsed\":\"0x5208\",\"nonce\":\"0x5\",\"to\":\"0x012e97041ed39dba037307055a8180327fee15b6\",\"value\":\"0x2f01750aed80\"},\"transactionHash\":\"0xd68054922a1053f4bcc340d548677eaa28efd0ceccf548e3c1b5f123f02eb8e5\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false},{\"blockNumber\":\"14410592\",\"id\":\"9aa1cc00-a6bc-11ec-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1647608952000,\"transaction\":{\"data\":\"0x\",\"from\":\"0x4976a4a02f38326660d17bf34b431dc6e2eb2327\",\"gas\":\"0x32918\",\"gasPrice\":\"0xa0168e5cf\",\"gasUsed\":\"0x5208\",\"nonce\":\"0x10532c\",\"to\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"value\":\"0x17bc0cc54afb000\"},\"transactionHash\":\"0x4c6171d65d38c54c53c5a649f4fadb21670af9d383c2fdeceaa5487c1554624a\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false},{\"blockNumber\":\"14410593\",\"id\":\"a1c8da00-a6bc-11ec-b269-29db90905b87\",\"networkID\":\"1\",\"chainId\":\"1\",\"time\":1647608964000,\"transaction\":{\"data\":\"0x\",\"from\":\"0x66f9c09118b1c726bc24811a611baf60af42070a\",\"gas\":\"0x5208\",\"gasPrice\":\"0x3bff249faa4\",\"gasUsed\":\"0x5208\",\"nonce\":\"0x6\",\"to\":\"0xe067e61d1adaff1c56ec89a31697102622be2a93\",\"value\":\"0x482731101752e0\"},\"transactionHash\":\"0xafd3a07905262628e5311ba4222e86adbff5dacde459aff74da7a78618b0104f\",\"verifiedOnBlockchain\":true,\"status\":\"confirmed\",\"toSmartContract\":false}],\"internalTransactions\":[],\"swapsTransactions\":{}},\"TypedMessageManager\":{\"unapprovedMessages\":{},\"unapprovedMessagesCount\":0},\"GasFeeController\":{\"gasFeeEstimates\":{},\"estimatedGasFeeTimeBounds\":{},\"gasEstimateType\":\"none\"},\"TokenDetectionController\":{},\"CollectibleDetectionController\":{},\"TokenListController\":{\"tokensChainsCache\":{}},\"SwapsController\":{\"quotes\":{},\"quoteValues\":{},\"fetchParams\":{\"slippage\":0,\"sourceToken\":\"\",\"sourceAmount\":0,\"destinationToken\":\"\",\"walletAddress\":\"\"},\"fetchParamsMetaData\":{\"sourceTokenInfo\":{\"decimals\":0,\"address\":\"\",\"symbol\":\"\"},\"destinationTokenInfo\":{\"decimals\":0,\"address\":\"\",\"symbol\":\"\"}},\"topAggSavings\":null,\"approvalTransaction\":null,\"quotesLastFetched\":0,\"error\":{\"key\":null,\"description\":null},\"topAggId\":null,\"isInPolling\":false,\"pollingCyclesLeft\":3,\"quoteRefreshSeconds\":null,\"usedGasEstimate\":null,\"usedCustomGas\":null},\"PhishingController\":{}}}","privacy":"{\"approvedHosts\":{},\"privacyMode\":true,\"thirdPartyApiMode\":true}","bookmarks":"[]","recents":"[]","browser":"{\"history\":[],\"whitelist\":[],\"tabs\":[],\"activeTab\":null}","modals":"{\"networkModalVisible\":false,\"accountsModalVisible\":false,\"collectibleContractModalVisible\":false,\"receiveModalVisible\":false,\"dappTransactionModalVisible\":false,\"approveModalVisible\":false}","settings":"{\"searchEngine\":\"DuckDuckGo\",\"primaryCurrency\":\"ETH\",\"lockTime\":30000,\"useBlockieIcon\":true,\"hideZeroBalanceTokens\":false}","alert":"{\"isVisible\":false,\"autodismiss\":null,\"content\":null,\"data\":null}","transaction":"{\"selectedAsset\":{},\"transaction\":{}}","user":"{\"loadingMsg\":\"\",\"loadingSet\":false,\"passwordSet\":true,\"seedphraseBackedUp\":true,\"backUpSeedphraseVisible\":false,\"protectWalletModalVisible\":false,\"gasEducationCarouselSeen\":false,\"nftDetectionDismissed\":false,\"userLoggedIn\":true,\"appTheme\":\"os\"}","wizard":"{\"step\":3}","notification":"{\"notifications\":[]}","swaps":"{\"1\":{\"isLive\":true},\"isLive\":true,\"hasOnboarded\":false}","fiatOrders":"{\"orders\":[],\"selectedCountry\":\"US\"}","infuraAvailability":"{\"isBlocked\":false}","navigation":"{\"currentRoute\":\"WalletView\"}","networkOnboarded":"{\"networkOnboardedState\":[],\"networkState\":{\"showNetworkOnboarding\":false,\"nativeToken\":\"\",\"networkType\":\"\",\"networkUrl\":\"\"},\"switchedNetwork\":{\"networkUrl\":\"\",\"networkStatus\":false}}","_persist":"{\"version\":10,\"rehydrated\":true}"}
diff --git a/tools/metamask2hashcat.py b/tools/metamask2hashcat.py
index cc631b444..fe2f0e006 100755
--- a/tools/metamask2hashcat.py
+++ b/tools/metamask2hashcat.py
@@ -2,12 +2,14 @@
 # -*- coding: utf-8 -*-
 
 # Author: Gabriele 'matrix' Gristina
-# Version: 1.0
+# Version: 2.0
 # Date: Thu 12 Aug 2021 06:44:14 PM CEST
 # License: MIT
 
 # Extract metamask vault from browser and save to file, then you can use this tool
 # reference: https://metamask.zendesk.com/hc/en-us/articles/360018766351-How-to-use-the-Vault-Decryptor-with-the-MetaMask-Vault-Data
+# From version 2.0 works also for Metamask Mobile
+# reference: https://github.com/3rdIteration/btcrecover/pull/346
 
 import json
 import argparse
@@ -19,21 +21,58 @@ def metamask_parser(file, shortdata):
 
     j = json.load(f)
 
-    if 'salt' not in j or 'iv' not in j or 'data' not in j:
-      print("! Invalid vault format ...")
-      parser.print_help()
-      exit(1)
+    isMobile = False
+
+    if 'engine' not in j:
+      if 'salt' not in j or 'iv' not in j or 'data' not in j:
+        print("! Invalid vault format ...")
+        parser.print_help()
+        exit(1)
+    else:
+      f.close()
+      wallet_data = open(file, "rb").read().decode("utf-8","ignore").replace("\\","")
+
+      # taken from https://github.com/3rdIteration/btcrecover/blob/master/btcrecover/btcrpass.py#L3096-L3103
+      walletStartText = "vault"
+      wallet_data_start = wallet_data.lower().find(walletStartText)
+      wallet_data_trimmed = wallet_data[wallet_data_start:]
+      wallet_data_start = wallet_data_trimmed.find("cipher")
+      wallet_data_trimmed = wallet_data_trimmed[wallet_data_start - 2:]
+      wallet_data_end = wallet_data_trimmed.find("}")
+      wallet_data = wallet_data_trimmed[:wallet_data_end + 1]
+      wallet_json = json.loads(wallet_data)
+
+      j = json.loads(wallet_data)
+
+      if 'lib' in j and 'original' in j['lib']:
+        isMobile = True
+      else:
+        print("! Invalid vault format ...")
+        parser.print_help()
+        exit(1)
 
-    if((len(j['data']) > 3000) or shortdata):
-      data_bin = base64.b64decode(j['data'])
-      # TODO limit data to 16 bytes, we only check the first block of data, so we don't need more data.
-      #  The use of smaller buffers should speedup the attack.
-      #  Still the pbkdf 10k iter will be taking the most time by far probably.
-      j['data'] = base64.b64encode(data_bin[0:64]).decode("ascii")
+    if isMobile is False:
+
+      if((len(j['data']) > 3000) or shortdata):
+        data_bin = base64.b64decode(j['data'])
+        # TODO limit data to 16 bytes, we only check the first block of data, so we don't need more data.
+        #  The use of smaller buffers should speedup the attack.
+        #  Still the pbkdf 10k iter will be taking the most time by far probably.
+        j['data'] = base64.b64encode(data_bin[0:64]).decode("ascii")
+
+        print('$metamask-short$' + j['salt'] + '$' + j['iv'] + '$' + j['data'])
+      else:
+        print('$metamask$' + j['salt'] + '$' + j['iv'] + '$' + j['data'])
 
-      print('$metamask-short$' + j['salt'] + '$' + j['iv'] + '$' + j['data'])
     else:
-      print('$metamask$' + j['salt'] + '$' + j['iv'] + '$' + j['data'])
+
+      # extract only first 16 bytes of ciphertext
+
+      cipher_bin = base64.b64decode(j['cipher'])
+      j['cipher'] = base64.b64encode(cipher_bin[:16]).decode("ascii")
+
+      print('$metamaskMobile$' + j['salt'] + '$' + j['iv'] + '$' + j['cipher'])
+
   except ValueError as e:
     parser.print_help()
     exit(1)
@@ -52,4 +91,3 @@ if __name__ == "__main__":
   else:
       parser.print_help()
       exit(1)
-
diff --git a/tools/test_modules/m31900.pm b/tools/test_modules/m31900.pm
new file mode 100644
index 000000000..c3dbf5c91
--- /dev/null
+++ b/tools/test_modules/m31900.pm
@@ -0,0 +1,91 @@
+#!/usr/bin/env perl
+
+##
+## Author......: See docs/credits.txt
+## License.....: MIT
+##
+
+use strict;
+use warnings;
+
+use Crypt::PBKDF2;
+use Crypt::CBC;
+use MIME::Base64 qw (decode_base64 encode_base64);
+
+sub module_constraints { [[8, 256], [16, 16], [-1, -1], [-1, -1], [-1, -1]] }
+
+sub module_generate_hash
+{
+  my $word = shift;
+  my $salt = shift;
+  my $iv   = shift // random_hex_string (32);
+  my $ct   = shift;
+
+  my $kdf = Crypt::PBKDF2->new
+  (
+    hasher     => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 512),
+    iterations => 5000,
+    output_len => 32
+  );
+
+  my $salt_b64 = encode_base64 ($salt, "");
+
+  my $key = $kdf->PBKDF2 ($salt_b64, $word);
+
+  my $iv_bin = pack ("H*", $iv);
+
+  my $cipher = Crypt::CBC->new ({
+    key         => $key,
+    cipher      => "Crypt::Rijndael",
+    iv          => $iv_bin,
+    literal_key => 1,
+    header      => "none",
+    keysize     => 32,
+    padding     => "none"
+  });
+
+  my $pt = "[{\"type\":\"HD Key Tree\",\"data\":{\"mnemonic\":\"ocean hidden kidney famous rich season gloom husband spring convince attitude boy\",\"numberOfAccounts\":1,\"hdPath\":\"m/44'/60'/0'/0\"}}]";
+
+  my $ct1 = substr ($cipher->encrypt ($pt), 0, 16);
+
+  my $hash = sprintf ('$metamaskMobile$%s$%s$%s', $salt_b64, $iv, encode_base64 ($ct1, ""));
+
+  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 substr ($hash, 0, 16) eq '$metamaskMobile$';
+
+  my (undef, $signature, $salt, $iv, $ct) = split '\$', $hash;
+
+  return unless defined $signature;
+  return unless defined $salt;
+  return unless defined $iv;
+  return unless defined $ct;
+
+  my $salt_b64 = decode_base64 ($salt);
+  my $iv_bin   = pack ("H*", $iv);
+  my $ct_bin   = decode_base64 ($ct);
+
+  return unless length $salt_b64 == 16;
+  return unless length $iv_bin   == 16;
+  return unless length $ct_bin   == 16;
+
+  my $word_packed = pack_if_HEX_notation ($word);
+
+  my $new_hash = module_generate_hash ($word_packed, $salt_b64, $iv, unpack ("H*", $ct_bin));
+
+  return ($new_hash, $word);
+}
+
+1;