diff --git a/src/modules/module_02811.c b/src/modules/module_02811.c
index c17c8f5b3..8768f723e 100644
--- a/src/modules/module_02811.c
+++ b/src/modules/module_02811.c
@@ -47,68 +47,18 @@ const char *module_st_pass        (MAYBE_UNUSED const hashconfig_t *hashconfig,
 
 static void md5_complete_no_limit (u32 digest[4], const u32 *plain, const u32 plain_len)
 {
-  digest[0] = MD5M_A;
-  digest[1] = MD5M_B;
-  digest[2] = MD5M_C;
-  digest[3] = MD5M_D;
+  // plain = u32 tmp_md5_buf[64] so this is compatible
 
-  int block_total_len = 16 * 4; // sizeof (block)
+  md5_ctx_t md5_ctx;
 
-  u8 *plain_ptr = (u8 *) plain;
+  md5_init (&md5_ctx);
+  md5_update (&md5_ctx, plain, plain_len);
+  md5_final (&md5_ctx);
 
-  // init
-
-  int remaining_len = (int) plain_len;
-
-  // loop
-
-  u32 loop = 1;
-
-  while (loop)
-  {
-    loop = (remaining_len > 55);
-
-    int cur_len  = MIN (block_total_len, remaining_len);
-    int copy_len = MAX (cur_len, 0);  // should never be negative of course
-
-    // initialize the block
-
-    u32 block[16] = { 0 };
-
-    // copy the bytes from the plain pointer (plain_ptr)
-
-    memcpy (block, plain, (size_t) copy_len);
-
-    /*
-     * final block
-     */
-
-    // set 0x80 if needed
-
-    if (cur_len >= 0)
-    {
-      if (copy_len < block_total_len)
-      {
-        u8 *block_ptr = (u8 *) block;
-
-        block_ptr[copy_len] = 0x80;
-      }
-    }
-
-    // set block[14] set to total_len
-
-    if (! loop) block[14] = plain_len * 8;
-
-    /*
-     * md5 ()
-     */
-
-    md5_transform (block + 0, block + 4, block + 8, block + 12, digest);
-
-    remaining_len -= block_total_len;
-
-    plain_ptr += 64;
-  }
+  digest[0] = md5_ctx.h[0];
+  digest[1] = md5_ctx.h[1];
+  digest[2] = md5_ctx.h[2];
+  digest[3] = md5_ctx.h[3];
 }
 
 static void precompute_salt_md5 (const u32 *salt_buf, const u32 salt_len, u8 *salt_pc)
diff --git a/src/modules/module_03910.c b/src/modules/module_03910.c
index 4a776d842..673f0f12b 100644
--- a/src/modules/module_03910.c
+++ b/src/modules/module_03910.c
@@ -49,68 +49,18 @@ const char *module_st_pass        (MAYBE_UNUSED const hashconfig_t *hashconfig,
 
 static void md5_complete_no_limit (u32 digest[4], const u32 *plain, const u32 plain_len)
 {
-  digest[0] = MD5M_A;
-  digest[1] = MD5M_B;
-  digest[2] = MD5M_C;
-  digest[3] = MD5M_D;
+  // plain = u32 tmp_md5_buf[64] so this is compatible
 
-  int block_total_len = 16 * 4; // sizeof (block)
+  md5_ctx_t md5_ctx;
 
-  u8 *plain_ptr = (u8 *) plain;
+  md5_init (&md5_ctx);
+  md5_update (&md5_ctx, plain, plain_len);
+  md5_final (&md5_ctx);
 
-  // init
-
-  int remaining_len = (int) plain_len;
-
-  // loop
-
-  u32 loop = 1;
-
-  while (loop)
-  {
-    loop = (remaining_len > 55);
-
-    int cur_len  = MIN (block_total_len, remaining_len);
-    int copy_len = MAX (cur_len, 0);  // should never be negative of course
-
-    // initialize the block
-
-    u32 block[16] = { 0 };
-
-    // copy the bytes from the plain pointer (plain_ptr)
-
-    memcpy (block, plain, (size_t) copy_len);
-
-    /*
-     * final block
-     */
-
-    // set 0x80 if needed
-
-    if (cur_len >= 0)
-    {
-      if (copy_len < block_total_len)
-      {
-        u8 *block_ptr = (u8 *) block;
-
-        block_ptr[copy_len] = 0x80;
-      }
-    }
-
-    // set block[14] set to total_len
-
-    if (! loop) block[14] = plain_len * 8;
-
-    /*
-     * md5 ()
-     */
-
-    md5_transform (block + 0, block + 4, block + 8, block + 12, digest);
-
-    remaining_len -= block_total_len;
-
-    plain_ptr += 64;
-  }
+  digest[0] = md5_ctx.h[0];
+  digest[1] = md5_ctx.h[1];
+  digest[2] = md5_ctx.h[2];
+  digest[3] = md5_ctx.h[3];
 }
 
 static void precompute_salt_md5 (const u32 *salt_buf, const u32 salt_len, u8 *salt_pc)
diff --git a/src/modules/module_10500.c b/src/modules/module_10500.c
index eaec08ec2..b60f3ee09 100644
--- a/src/modules/module_10500.c
+++ b/src/modules/module_10500.c
@@ -74,68 +74,18 @@ static const char *SIGNATURE_PDF = "$pdf$";
 
 static void md5_complete_no_limit (u32 digest[4], const u32 *plain, const u32 plain_len)
 {
-  digest[0] = MD5M_A;
-  digest[1] = MD5M_B;
-  digest[2] = MD5M_C;
-  digest[3] = MD5M_D;
+  // plain = u32 tmp_md5_buf[64] so this is compatible
 
-  int block_total_len = 16 * 4; // sizeof (block)
+  md5_ctx_t md5_ctx;
 
-  u8 *plain_ptr = (u8 *) plain;
+  md5_init (&md5_ctx);
+  md5_update (&md5_ctx, plain, plain_len);
+  md5_final (&md5_ctx);
 
-  // init
-
-  int remaining_len = (int) plain_len;
-
-  // loop
-
-  u32 loop = 1;
-
-  while (loop)
-  {
-    loop = (remaining_len > 55);
-
-    int cur_len  = MIN (block_total_len, remaining_len);
-    int copy_len = MAX (cur_len, 0);  // should never be negative of course
-
-    // initialize the block
-
-    u32 block[16] = { 0 };
-
-    // copy the bytes from the plain pointer (plain_ptr)
-
-    memcpy (block, plain, (size_t) copy_len);
-
-    /*
-     * final block
-     */
-
-    // set 0x80 if needed
-
-    if (cur_len >= 0)
-    {
-      if (copy_len < block_total_len)
-      {
-        u8 *block_ptr = (u8 *) block;
-
-        block_ptr[copy_len] = 0x80;
-      }
-    }
-
-    // set block[14] set to total_len
-
-    if (! loop) block[14] = plain_len * 8;
-
-    /*
-     * md5 ()
-     */
-
-    md5_transform (block + 0, block + 4, block + 8, block + 12, digest);
-
-    remaining_len -= block_total_len;
-
-    plain_ptr += 64;
-  }
+  digest[0] = md5_ctx.h[0];
+  digest[1] = md5_ctx.h[1];
+  digest[2] = md5_ctx.h[2];
+  digest[3] = md5_ctx.h[3];
 }
 
 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)
diff --git a/src/modules/module_11400.c b/src/modules/module_11400.c
index a5bb6234e..7caf846a0 100644
--- a/src/modules/module_11400.c
+++ b/src/modules/module_11400.c
@@ -57,68 +57,18 @@ static const char *SIGNATURE_SIP_AUTH = "$sip$";
 
 static void md5_complete_no_limit (u32 digest[4], const u32 *plain, const u32 plain_len)
 {
-  digest[0] = MD5M_A;
-  digest[1] = MD5M_B;
-  digest[2] = MD5M_C;
-  digest[3] = MD5M_D;
+  // plain = u32 tmp_md5_buf[64] so this is compatible
 
-  int block_total_len = 16 * 4; // sizeof (block)
+  md5_ctx_t md5_ctx;
 
-  u8 *plain_ptr = (u8 *) plain;
+  md5_init (&md5_ctx);
+  md5_update (&md5_ctx, plain, plain_len);
+  md5_final (&md5_ctx);
 
-  // init
-
-  int remaining_len = (int) plain_len;
-
-  // loop
-
-  u32 loop = 1;
-
-  while (loop)
-  {
-    loop = (remaining_len > 55);
-
-    int cur_len  = MIN (block_total_len, remaining_len);
-    int copy_len = MAX (cur_len, 0);  // should never be negative of course
-
-    // initialize the block
-
-    u32 block[16] = { 0 };
-
-    // copy the bytes from the plain pointer (plain_ptr)
-
-    memcpy (block, plain, (size_t) copy_len);
-
-    /*
-     * final block
-     */
-
-    // set 0x80 if needed
-
-    if (cur_len >= 0)
-    {
-      if (copy_len < block_total_len)
-      {
-        u8 *block_ptr = (u8 *) block;
-
-        block_ptr[copy_len] = 0x80;
-      }
-    }
-
-    // set block[14] set to total_len
-
-    if (! loop) block[14] = plain_len * 8;
-
-    /*
-     * md5 ()
-     */
-
-    md5_transform (block + 0, block + 4, block + 8, block + 12, digest);
-
-    remaining_len -= block_total_len;
-
-    plain_ptr += 64;
-  }
+  digest[0] = md5_ctx.h[0];
+  digest[1] = md5_ctx.h[1];
+  digest[2] = md5_ctx.h[2];
+  digest[3] = md5_ctx.h[3];
 }
 
 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)
@@ -310,7 +260,9 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
     hc_strncat (tmp_md5_ptr, pcsep, 1);
   }
 
-  u32 tmp_digest[4] = { 0 };
+  memset (tmp_md5_ptr + md5_len, 0, sizeof (tmp_md5_buf) - md5_len);
+
+  u32 tmp_digest[4];
 
   md5_complete_no_limit (tmp_digest, tmp_md5_buf, md5_len);