diff --git a/OpenCL/m29910-pure.cl b/OpenCL/m29910-pure.cl
index b61461f7e..2d8c0954d 100644
--- a/OpenCL/m29910-pure.cl
+++ b/OpenCL/m29910-pure.cl
@@ -415,7 +415,7 @@ KERNEL_FQ void m29910_comp (KERN_ATTR_TMPS_ESALT (encdatavault_tmp_t, encdatavau
   pt[0] = ct[0] ^ ctr[0][1];
   pt[1] = ct[1] ^ ctr[0][2];
 
-  if ((pt[0] == 0xd2c3b4a1) && ((pt[1] & 0x00ffffff) == 0))
+  if ((pt[0] == 0xd2c3b4a1) && ((pt[1] & 0xffffff00) == 0))
   {
     if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0)
     {
diff --git a/OpenCL/m29920-pure.cl b/OpenCL/m29920-pure.cl
index d0a4e34fb..a44d6c6a1 100644
--- a/OpenCL/m29920-pure.cl
+++ b/OpenCL/m29920-pure.cl
@@ -485,7 +485,7 @@ KERNEL_FQ void m29920_comp (KERN_ATTR_TMPS_ESALT (encdatavault_tmp_t, encdatavau
   pt[0] = ct[0] ^ ctr[0][1];
   pt[1] = ct[1] ^ ctr[0][2];
 
-  if ((pt[0] == 0xd2c3b4a1) && ((pt[1] & 0x00ffffff) == 0))
+  if ((pt[0] == 0xd2c3b4a1) && ((pt[1] & 0xffffff00) == 0))
   {
     if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0)
     {
diff --git a/OpenCL/m29930-pure.cl b/OpenCL/m29930-pure.cl
index d4085e428..9a1f842d6 100644
--- a/OpenCL/m29930-pure.cl
+++ b/OpenCL/m29930-pure.cl
@@ -300,7 +300,7 @@ KERNEL_FQ void m29930_comp (KERN_ATTR_TMPS_ESALT (encdatavault_tmp_t, encdatavau
   pt[0] = ct[0] ^ ctr[0][1];
   pt[1] = ct[1] ^ ctr[0][2];
 
-  if ((pt[0] == 0xd2c3b4a1) && ((pt[1] & 0x00ffffff) == 0))
+  if ((pt[0] == 0xd2c3b4a1) && ((pt[1] & 0xffffff00) == 0))
   {
     if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0)
     {
diff --git a/OpenCL/m29940-pure.cl b/OpenCL/m29940-pure.cl
index 3ac5ee7d6..e93708b9b 100644
--- a/OpenCL/m29940-pure.cl
+++ b/OpenCL/m29940-pure.cl
@@ -370,7 +370,7 @@ KERNEL_FQ void m29940_comp (KERN_ATTR_TMPS_ESALT (encdatavault_tmp_t, encdatavau
   pt[0] = ct[0] ^ ctr[0][1];
   pt[1] = ct[1] ^ ctr[0][2];
 
-  if ((pt[0] == 0xd2c3b4a1) && ((pt[1] & 0x00ffffff) == 0))
+  if ((pt[0] == 0xd2c3b4a1) && ((pt[1] & 0xffffff00) == 0))
   {
     if (hc_atomic_inc (&hashes_shown[DIGESTS_OFFSET_HOST]) == 0)
     {
diff --git a/src/modules/module_29910.c b/src/modules/module_29910.c
index 2ef35810c..0960c3cb2 100644
--- a/src/modules/module_29910.c
+++ b/src/modules/module_29910.c
@@ -24,7 +24,7 @@ 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        = "hashcat";
-static const char *ST_HASH        = "$encdv-pbkdf2$1$1$2a634ff38de7bd65$da30f6488f23d250$32$8411766641676379804327452599148252868336714192465947587879023912$100000";
+static const char *ST_HASH        = "$encdv-pbkdf2$1$1$121f898edc51ffb2$14e6bf4e9256f9e4$32$1972489853882254644795101599063579097812661888813652597380052274$100000";
 
 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;       }
diff --git a/src/modules/module_29920.c b/src/modules/module_29920.c
index f38b6d99a..e73dc1268 100644
--- a/src/modules/module_29920.c
+++ b/src/modules/module_29920.c
@@ -24,7 +24,7 @@ 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        = "hashcat";
-static const char *ST_HASH        = "$encdv-pbkdf2$3$1$ce7801561a78723a$92d57beb35641626$32$4865411258241441439695058324389632216617876787029059122102544908$100000$0fcd759f2a0b8687a63bd70db4af46735199cacd2e67df549bfa643ac2610f23bcc533d693be54f3307d9fb14057d53eed528079a90c160bf9bde5cce8e0283539d97bb536029ebb8b641e18ecf8d1af44e3e161a47e263830eb0b3de53052c3f36a4e6f5068b14c7aabd449c63969948ac27adbd111762583ac779d53156e9b";
+static const char *ST_HASH        = "$encdv-pbkdf2$3$1$c232aba45699c80b$473d5dd2e0833ac7$32$4454716926322493581114042616371582782202532493983541577898367049$100000$9a030124cecc2fef5ca44f83ef6e4c7944f8d7c5234b9000c982e209a92bb5535f4c15be6e9914729eb8a9bf870bd0535a231fa1d443d27c1fc4f78b441a7aa765fa0a3d181c485f77f59334ec68f27e66f227eb4be3579464d907ed8cf8bacc817cceb4496587898e43ce41921f66114051c007e1a54b7215b220aed6e33064";
 
 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;       }
diff --git a/src/modules/module_29930.c b/src/modules/module_29930.c
index f5b491b21..f436d64f4 100644
--- a/src/modules/module_29930.c
+++ b/src/modules/module_29930.c
@@ -24,7 +24,7 @@ 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        = "hashcat";
-static const char *ST_HASH        = "$encdv$1$1$c3b2325acd041cc5$125027145bd58e4c";
+static const char *ST_HASH        = "$encdv$1$1$3a427b9ee5851118$4f52176bb9a1b3b6";
 
 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;       }
diff --git a/src/modules/module_29940.c b/src/modules/module_29940.c
index 59974a561..02d6ec047 100644
--- a/src/modules/module_29940.c
+++ b/src/modules/module_29940.c
@@ -24,7 +24,7 @@ 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        = "hashcat";
-static const char *ST_HASH        = "$encdv$3$1$57eb2fd014e80ab8$d9efd5b50d7d2c96$4d155873a6619957b8e30739d729e8a7b147573a839603fe5dcfdec186c0cb622ddda17ae077dbd77b8a7193e2e975c03f4ccb9052ffbcb6cf419aa9dcd2f7c917ffb4f243fae96cef2f96b804879e9e02b1fcaa4e1b0e765cb138fd0993cda006384a1e690d4058e107cfb7e214bf0217ea7b405af3924db4fa839efedbea59";
+static const char *ST_HASH        = "$encdv$3$1$91b9babb3820c527$1ff4cb6657adad34$d9067c4d059879dfee2edeb3999871973d422ff5fa868c51b025d07f644187889dc5509ec75d4a120184d619d10d02b138d64ba82f9d0936162c9e64d97771de3e74d6e52e5ab9b900c25fb446e14cbe3ef1fa34328a13f9473c669f22d7020bc036d9e99194c959e4c5ba885d6f9ff9ccc2299d67b26e68b850a02363fb2646";
 
 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;       }
diff --git a/tools/test_modules/m29910.pm b/tools/test_modules/m29910.pm
index e6603470c..4812871af 100644
--- a/tools/test_modules/m29910.pm
+++ b/tools/test_modules/m29910.pm
@@ -112,7 +112,7 @@ sub module_generate_hash
   }
   else
   {
-    $pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x00";
+    $pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x30";
   }
 
   my $ct_bin = xor_len (substr ($ctr, 4, 8), $pt_bin, 8);
diff --git a/tools/test_modules/m29920.pm b/tools/test_modules/m29920.pm
index 880e45df5..bf9c11afb 100644
--- a/tools/test_modules/m29920.pm
+++ b/tools/test_modules/m29920.pm
@@ -156,7 +156,7 @@ sub module_generate_hash
   }
   else
   {
-    $pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x00";
+    $pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x30";
   }
 
   my $ct_bin = xor_len (substr ($ctr, 4, 8), $pt_bin, 8);
diff --git a/tools/test_modules/m29930.pm b/tools/test_modules/m29930.pm
index 681fd603e..b1cf930aa 100644
--- a/tools/test_modules/m29930.pm
+++ b/tools/test_modules/m29930.pm
@@ -132,7 +132,7 @@ sub module_generate_hash
   }
   else
   {
-    $pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x00";
+    $pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x30";
   }
 
   my $ct_bin = xor_len (substr ($ctr, 4, 8), $pt_bin, 8);
diff --git a/tools/test_modules/m29940.pm b/tools/test_modules/m29940.pm
index 05fecc678..cde58441a 100644
--- a/tools/test_modules/m29940.pm
+++ b/tools/test_modules/m29940.pm
@@ -176,7 +176,7 @@ sub module_generate_hash
   }
   else
   {
-    $pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x00";
+    $pt_bin = "\xd2\xc3\xb4\xa1\x00\x00\x00\x30";
   }
 
   my $ct_bin = xor_len (substr ($ctr, 4, 8), $pt_bin, 8);