diff --git a/OpenCL/m11900.cl b/OpenCL/m11900.cl
index d8e3bc614..8c52db1a0 100644
--- a/OpenCL/m11900.cl
+++ b/OpenCL/m11900.cl
@@ -11,167 +11,19 @@
 #include "inc_types.cl"
 #include "inc_common.cl"
 #include "inc_simd.cl"
+#include "inc_hash_md5.cl"
 
 #define COMPARE_S "inc_comp_single.cl"
 #define COMPARE_M "inc_comp_multi.cl"
 
-void md5_transform_S (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
-{
-  u32 a = digest[0];
-  u32 b = digest[1];
-  u32 c = digest[2];
-  u32 d = digest[3];
-
-  u32 w0_t = w0[0];
-  u32 w1_t = w0[1];
-  u32 w2_t = w0[2];
-  u32 w3_t = w0[3];
-  u32 w4_t = w1[0];
-  u32 w5_t = w1[1];
-  u32 w6_t = w1[2];
-  u32 w7_t = w1[3];
-  u32 w8_t = w2[0];
-  u32 w9_t = w2[1];
-  u32 wa_t = w2[2];
-  u32 wb_t = w2[3];
-  u32 wc_t = w3[0];
-  u32 wd_t = w3[1];
-  u32 we_t = w3[2];
-  u32 wf_t = w3[3];
-
-  MD5_STEP_S (MD5_Fo, a, b, c, d, w0_t, MD5C00, MD5S00);
-  MD5_STEP_S (MD5_Fo, d, a, b, c, w1_t, MD5C01, MD5S01);
-  MD5_STEP_S (MD5_Fo, c, d, a, b, w2_t, MD5C02, MD5S02);
-  MD5_STEP_S (MD5_Fo, b, c, d, a, w3_t, MD5C03, MD5S03);
-  MD5_STEP_S (MD5_Fo, a, b, c, d, w4_t, MD5C04, MD5S00);
-  MD5_STEP_S (MD5_Fo, d, a, b, c, w5_t, MD5C05, MD5S01);
-  MD5_STEP_S (MD5_Fo, c, d, a, b, w6_t, MD5C06, MD5S02);
-  MD5_STEP_S (MD5_Fo, b, c, d, a, w7_t, MD5C07, MD5S03);
-  MD5_STEP_S (MD5_Fo, a, b, c, d, w8_t, MD5C08, MD5S00);
-  MD5_STEP_S (MD5_Fo, d, a, b, c, w9_t, MD5C09, MD5S01);
-  MD5_STEP_S (MD5_Fo, c, d, a, b, wa_t, MD5C0a, MD5S02);
-  MD5_STEP_S (MD5_Fo, b, c, d, a, wb_t, MD5C0b, MD5S03);
-  MD5_STEP_S (MD5_Fo, a, b, c, d, wc_t, MD5C0c, MD5S00);
-  MD5_STEP_S (MD5_Fo, d, a, b, c, wd_t, MD5C0d, MD5S01);
-  MD5_STEP_S (MD5_Fo, c, d, a, b, we_t, MD5C0e, MD5S02);
-  MD5_STEP_S (MD5_Fo, b, c, d, a, wf_t, MD5C0f, MD5S03);
-
-  MD5_STEP_S (MD5_Go, a, b, c, d, w1_t, MD5C10, MD5S10);
-  MD5_STEP_S (MD5_Go, d, a, b, c, w6_t, MD5C11, MD5S11);
-  MD5_STEP_S (MD5_Go, c, d, a, b, wb_t, MD5C12, MD5S12);
-  MD5_STEP_S (MD5_Go, b, c, d, a, w0_t, MD5C13, MD5S13);
-  MD5_STEP_S (MD5_Go, a, b, c, d, w5_t, MD5C14, MD5S10);
-  MD5_STEP_S (MD5_Go, d, a, b, c, wa_t, MD5C15, MD5S11);
-  MD5_STEP_S (MD5_Go, c, d, a, b, wf_t, MD5C16, MD5S12);
-  MD5_STEP_S (MD5_Go, b, c, d, a, w4_t, MD5C17, MD5S13);
-  MD5_STEP_S (MD5_Go, a, b, c, d, w9_t, MD5C18, MD5S10);
-  MD5_STEP_S (MD5_Go, d, a, b, c, we_t, MD5C19, MD5S11);
-  MD5_STEP_S (MD5_Go, c, d, a, b, w3_t, MD5C1a, MD5S12);
-  MD5_STEP_S (MD5_Go, b, c, d, a, w8_t, MD5C1b, MD5S13);
-  MD5_STEP_S (MD5_Go, a, b, c, d, wd_t, MD5C1c, MD5S10);
-  MD5_STEP_S (MD5_Go, d, a, b, c, w2_t, MD5C1d, MD5S11);
-  MD5_STEP_S (MD5_Go, c, d, a, b, w7_t, MD5C1e, MD5S12);
-  MD5_STEP_S (MD5_Go, b, c, d, a, wc_t, MD5C1f, MD5S13);
-
-  MD5_STEP_S (MD5_H , a, b, c, d, w5_t, MD5C20, MD5S20);
-  MD5_STEP_S (MD5_H , d, a, b, c, w8_t, MD5C21, MD5S21);
-  MD5_STEP_S (MD5_H , c, d, a, b, wb_t, MD5C22, MD5S22);
-  MD5_STEP_S (MD5_H , b, c, d, a, we_t, MD5C23, MD5S23);
-  MD5_STEP_S (MD5_H , a, b, c, d, w1_t, MD5C24, MD5S20);
-  MD5_STEP_S (MD5_H , d, a, b, c, w4_t, MD5C25, MD5S21);
-  MD5_STEP_S (MD5_H , c, d, a, b, w7_t, MD5C26, MD5S22);
-  MD5_STEP_S (MD5_H , b, c, d, a, wa_t, MD5C27, MD5S23);
-  MD5_STEP_S (MD5_H , a, b, c, d, wd_t, MD5C28, MD5S20);
-  MD5_STEP_S (MD5_H , d, a, b, c, w0_t, MD5C29, MD5S21);
-  MD5_STEP_S (MD5_H , c, d, a, b, w3_t, MD5C2a, MD5S22);
-  MD5_STEP_S (MD5_H , b, c, d, a, w6_t, MD5C2b, MD5S23);
-  MD5_STEP_S (MD5_H , a, b, c, d, w9_t, MD5C2c, MD5S20);
-  MD5_STEP_S (MD5_H , d, a, b, c, wc_t, MD5C2d, MD5S21);
-  MD5_STEP_S (MD5_H , c, d, a, b, wf_t, MD5C2e, MD5S22);
-  MD5_STEP_S (MD5_H , b, c, d, a, w2_t, MD5C2f, MD5S23);
-
-  MD5_STEP_S (MD5_I , a, b, c, d, w0_t, MD5C30, MD5S30);
-  MD5_STEP_S (MD5_I , d, a, b, c, w7_t, MD5C31, MD5S31);
-  MD5_STEP_S (MD5_I , c, d, a, b, we_t, MD5C32, MD5S32);
-  MD5_STEP_S (MD5_I , b, c, d, a, w5_t, MD5C33, MD5S33);
-  MD5_STEP_S (MD5_I , a, b, c, d, wc_t, MD5C34, MD5S30);
-  MD5_STEP_S (MD5_I , d, a, b, c, w3_t, MD5C35, MD5S31);
-  MD5_STEP_S (MD5_I , c, d, a, b, wa_t, MD5C36, MD5S32);
-  MD5_STEP_S (MD5_I , b, c, d, a, w1_t, MD5C37, MD5S33);
-  MD5_STEP_S (MD5_I , a, b, c, d, w8_t, MD5C38, MD5S30);
-  MD5_STEP_S (MD5_I , d, a, b, c, wf_t, MD5C39, MD5S31);
-  MD5_STEP_S (MD5_I , c, d, a, b, w6_t, MD5C3a, MD5S32);
-  MD5_STEP_S (MD5_I , b, c, d, a, wd_t, MD5C3b, MD5S33);
-  MD5_STEP_S (MD5_I , a, b, c, d, w4_t, MD5C3c, MD5S30);
-  MD5_STEP_S (MD5_I , d, a, b, c, wb_t, MD5C3d, MD5S31);
-  MD5_STEP_S (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
-  MD5_STEP_S (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
-
-  digest[0] += a;
-  digest[1] += b;
-  digest[2] += c;
-  digest[3] += d;
-}
-
-void hmac_md5_pad_S (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[4], u32 opad[4])
-{
-  w0[0] = w0[0] ^ 0x36363636;
-  w0[1] = w0[1] ^ 0x36363636;
-  w0[2] = w0[2] ^ 0x36363636;
-  w0[3] = w0[3] ^ 0x36363636;
-  w1[0] = w1[0] ^ 0x36363636;
-  w1[1] = w1[1] ^ 0x36363636;
-  w1[2] = w1[2] ^ 0x36363636;
-  w1[3] = w1[3] ^ 0x36363636;
-  w2[0] = w2[0] ^ 0x36363636;
-  w2[1] = w2[1] ^ 0x36363636;
-  w2[2] = w2[2] ^ 0x36363636;
-  w2[3] = w2[3] ^ 0x36363636;
-  w3[0] = w3[0] ^ 0x36363636;
-  w3[1] = w3[1] ^ 0x36363636;
-  w3[2] = w3[2] ^ 0x36363636;
-  w3[3] = w3[3] ^ 0x36363636;
-
-  ipad[0] = MD5M_A;
-  ipad[1] = MD5M_B;
-  ipad[2] = MD5M_C;
-  ipad[3] = MD5M_D;
-
-  md5_transform_S (w0, w1, w2, w3, ipad);
-
-  w0[0] = w0[0] ^ 0x6a6a6a6a;
-  w0[1] = w0[1] ^ 0x6a6a6a6a;
-  w0[2] = w0[2] ^ 0x6a6a6a6a;
-  w0[3] = w0[3] ^ 0x6a6a6a6a;
-  w1[0] = w1[0] ^ 0x6a6a6a6a;
-  w1[1] = w1[1] ^ 0x6a6a6a6a;
-  w1[2] = w1[2] ^ 0x6a6a6a6a;
-  w1[3] = w1[3] ^ 0x6a6a6a6a;
-  w2[0] = w2[0] ^ 0x6a6a6a6a;
-  w2[1] = w2[1] ^ 0x6a6a6a6a;
-  w2[2] = w2[2] ^ 0x6a6a6a6a;
-  w2[3] = w2[3] ^ 0x6a6a6a6a;
-  w3[0] = w3[0] ^ 0x6a6a6a6a;
-  w3[1] = w3[1] ^ 0x6a6a6a6a;
-  w3[2] = w3[2] ^ 0x6a6a6a6a;
-  w3[3] = w3[3] ^ 0x6a6a6a6a;
-
-  opad[0] = MD5M_A;
-  opad[1] = MD5M_B;
-  opad[2] = MD5M_C;
-  opad[3] = MD5M_D;
-
-  md5_transform_S (w0, w1, w2, w3, opad);
-}
-
-void hmac_md5_run_S (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[4], u32 opad[4], u32 digest[4])
+void hmac_md5_run_V (u32x w0[4], u32x w1[4], u32x w2[4], u32x w3[4], u32x ipad[8], u32x opad[8], u32x digest[8])
 {
   digest[0] = ipad[0];
   digest[1] = ipad[1];
   digest[2] = ipad[2];
   digest[3] = ipad[3];
 
-  md5_transform_S (w0, w1, w2, w3, digest);
+  md5_transform_vector (w0, w1, w2, w3, digest);
 
   w0[0] = digest[0];
   w0[1] = digest[1];
@@ -195,193 +47,10 @@ void hmac_md5_run_S (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[4], u3
   digest[2] = opad[2];
   digest[3] = opad[3];
 
-  md5_transform_S (w0, w1, w2, w3, digest);
-}
-
-void md5_transform_V (const u32x w0[4], const u32x w1[4], const u32x w2[4], const u32x w3[4], u32x digest[4])
-{
-  u32x a = digest[0];
-  u32x b = digest[1];
-  u32x c = digest[2];
-  u32x d = digest[3];
-
-  u32x w0_t = w0[0];
-  u32x w1_t = w0[1];
-  u32x w2_t = w0[2];
-  u32x w3_t = w0[3];
-  u32x w4_t = w1[0];
-  u32x w5_t = w1[1];
-  u32x w6_t = w1[2];
-  u32x w7_t = w1[3];
-  u32x w8_t = w2[0];
-  u32x w9_t = w2[1];
-  u32x wa_t = w2[2];
-  u32x wb_t = w2[3];
-  u32x wc_t = w3[0];
-  u32x wd_t = w3[1];
-  u32x we_t = w3[2];
-  u32x wf_t = w3[3];
-
-  MD5_STEP (MD5_Fo, a, b, c, d, w0_t, MD5C00, MD5S00);
-  MD5_STEP (MD5_Fo, d, a, b, c, w1_t, MD5C01, MD5S01);
-  MD5_STEP (MD5_Fo, c, d, a, b, w2_t, MD5C02, MD5S02);
-  MD5_STEP (MD5_Fo, b, c, d, a, w3_t, MD5C03, MD5S03);
-  MD5_STEP (MD5_Fo, a, b, c, d, w4_t, MD5C04, MD5S00);
-  MD5_STEP (MD5_Fo, d, a, b, c, w5_t, MD5C05, MD5S01);
-  MD5_STEP (MD5_Fo, c, d, a, b, w6_t, MD5C06, MD5S02);
-  MD5_STEP (MD5_Fo, b, c, d, a, w7_t, MD5C07, MD5S03);
-  MD5_STEP (MD5_Fo, a, b, c, d, w8_t, MD5C08, MD5S00);
-  MD5_STEP (MD5_Fo, d, a, b, c, w9_t, MD5C09, MD5S01);
-  MD5_STEP (MD5_Fo, c, d, a, b, wa_t, MD5C0a, MD5S02);
-  MD5_STEP (MD5_Fo, b, c, d, a, wb_t, MD5C0b, MD5S03);
-  MD5_STEP (MD5_Fo, a, b, c, d, wc_t, MD5C0c, MD5S00);
-  MD5_STEP (MD5_Fo, d, a, b, c, wd_t, MD5C0d, MD5S01);
-  MD5_STEP (MD5_Fo, c, d, a, b, we_t, MD5C0e, MD5S02);
-  MD5_STEP (MD5_Fo, b, c, d, a, wf_t, MD5C0f, MD5S03);
-
-  MD5_STEP (MD5_Go, a, b, c, d, w1_t, MD5C10, MD5S10);
-  MD5_STEP (MD5_Go, d, a, b, c, w6_t, MD5C11, MD5S11);
-  MD5_STEP (MD5_Go, c, d, a, b, wb_t, MD5C12, MD5S12);
-  MD5_STEP (MD5_Go, b, c, d, a, w0_t, MD5C13, MD5S13);
-  MD5_STEP (MD5_Go, a, b, c, d, w5_t, MD5C14, MD5S10);
-  MD5_STEP (MD5_Go, d, a, b, c, wa_t, MD5C15, MD5S11);
-  MD5_STEP (MD5_Go, c, d, a, b, wf_t, MD5C16, MD5S12);
-  MD5_STEP (MD5_Go, b, c, d, a, w4_t, MD5C17, MD5S13);
-  MD5_STEP (MD5_Go, a, b, c, d, w9_t, MD5C18, MD5S10);
-  MD5_STEP (MD5_Go, d, a, b, c, we_t, MD5C19, MD5S11);
-  MD5_STEP (MD5_Go, c, d, a, b, w3_t, MD5C1a, MD5S12);
-  MD5_STEP (MD5_Go, b, c, d, a, w8_t, MD5C1b, MD5S13);
-  MD5_STEP (MD5_Go, a, b, c, d, wd_t, MD5C1c, MD5S10);
-  MD5_STEP (MD5_Go, d, a, b, c, w2_t, MD5C1d, MD5S11);
-  MD5_STEP (MD5_Go, c, d, a, b, w7_t, MD5C1e, MD5S12);
-  MD5_STEP (MD5_Go, b, c, d, a, wc_t, MD5C1f, MD5S13);
-
-  MD5_STEP (MD5_H , a, b, c, d, w5_t, MD5C20, MD5S20);
-  MD5_STEP (MD5_H , d, a, b, c, w8_t, MD5C21, MD5S21);
-  MD5_STEP (MD5_H , c, d, a, b, wb_t, MD5C22, MD5S22);
-  MD5_STEP (MD5_H , b, c, d, a, we_t, MD5C23, MD5S23);
-  MD5_STEP (MD5_H , a, b, c, d, w1_t, MD5C24, MD5S20);
-  MD5_STEP (MD5_H , d, a, b, c, w4_t, MD5C25, MD5S21);
-  MD5_STEP (MD5_H , c, d, a, b, w7_t, MD5C26, MD5S22);
-  MD5_STEP (MD5_H , b, c, d, a, wa_t, MD5C27, MD5S23);
-  MD5_STEP (MD5_H , a, b, c, d, wd_t, MD5C28, MD5S20);
-  MD5_STEP (MD5_H , d, a, b, c, w0_t, MD5C29, MD5S21);
-  MD5_STEP (MD5_H , c, d, a, b, w3_t, MD5C2a, MD5S22);
-  MD5_STEP (MD5_H , b, c, d, a, w6_t, MD5C2b, MD5S23);
-  MD5_STEP (MD5_H , a, b, c, d, w9_t, MD5C2c, MD5S20);
-  MD5_STEP (MD5_H , d, a, b, c, wc_t, MD5C2d, MD5S21);
-  MD5_STEP (MD5_H , c, d, a, b, wf_t, MD5C2e, MD5S22);
-  MD5_STEP (MD5_H , b, c, d, a, w2_t, MD5C2f, MD5S23);
-
-  MD5_STEP (MD5_I , a, b, c, d, w0_t, MD5C30, MD5S30);
-  MD5_STEP (MD5_I , d, a, b, c, w7_t, MD5C31, MD5S31);
-  MD5_STEP (MD5_I , c, d, a, b, we_t, MD5C32, MD5S32);
-  MD5_STEP (MD5_I , b, c, d, a, w5_t, MD5C33, MD5S33);
-  MD5_STEP (MD5_I , a, b, c, d, wc_t, MD5C34, MD5S30);
-  MD5_STEP (MD5_I , d, a, b, c, w3_t, MD5C35, MD5S31);
-  MD5_STEP (MD5_I , c, d, a, b, wa_t, MD5C36, MD5S32);
-  MD5_STEP (MD5_I , b, c, d, a, w1_t, MD5C37, MD5S33);
-  MD5_STEP (MD5_I , a, b, c, d, w8_t, MD5C38, MD5S30);
-  MD5_STEP (MD5_I , d, a, b, c, wf_t, MD5C39, MD5S31);
-  MD5_STEP (MD5_I , c, d, a, b, w6_t, MD5C3a, MD5S32);
-  MD5_STEP (MD5_I , b, c, d, a, wd_t, MD5C3b, MD5S33);
-  MD5_STEP (MD5_I , a, b, c, d, w4_t, MD5C3c, MD5S30);
-  MD5_STEP (MD5_I , d, a, b, c, wb_t, MD5C3d, MD5S31);
-  MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
-  MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
-
-  digest[0] += a;
-  digest[1] += b;
-  digest[2] += c;
-  digest[3] += d;
-}
-
-void hmac_md5_pad_V (u32x w0[4], u32x w1[4], u32x w2[4], u32x w3[4], u32x ipad[4], u32x opad[4])
-{
-  w0[0] = w0[0] ^ 0x36363636;
-  w0[1] = w0[1] ^ 0x36363636;
-  w0[2] = w0[2] ^ 0x36363636;
-  w0[3] = w0[3] ^ 0x36363636;
-  w1[0] = w1[0] ^ 0x36363636;
-  w1[1] = w1[1] ^ 0x36363636;
-  w1[2] = w1[2] ^ 0x36363636;
-  w1[3] = w1[3] ^ 0x36363636;
-  w2[0] = w2[0] ^ 0x36363636;
-  w2[1] = w2[1] ^ 0x36363636;
-  w2[2] = w2[2] ^ 0x36363636;
-  w2[3] = w2[3] ^ 0x36363636;
-  w3[0] = w3[0] ^ 0x36363636;
-  w3[1] = w3[1] ^ 0x36363636;
-  w3[2] = w3[2] ^ 0x36363636;
-  w3[3] = w3[3] ^ 0x36363636;
-
-  ipad[0] = MD5M_A;
-  ipad[1] = MD5M_B;
-  ipad[2] = MD5M_C;
-  ipad[3] = MD5M_D;
-
-  md5_transform_V (w0, w1, w2, w3, ipad);
-
-  w0[0] = w0[0] ^ 0x6a6a6a6a;
-  w0[1] = w0[1] ^ 0x6a6a6a6a;
-  w0[2] = w0[2] ^ 0x6a6a6a6a;
-  w0[3] = w0[3] ^ 0x6a6a6a6a;
-  w1[0] = w1[0] ^ 0x6a6a6a6a;
-  w1[1] = w1[1] ^ 0x6a6a6a6a;
-  w1[2] = w1[2] ^ 0x6a6a6a6a;
-  w1[3] = w1[3] ^ 0x6a6a6a6a;
-  w2[0] = w2[0] ^ 0x6a6a6a6a;
-  w2[1] = w2[1] ^ 0x6a6a6a6a;
-  w2[2] = w2[2] ^ 0x6a6a6a6a;
-  w2[3] = w2[3] ^ 0x6a6a6a6a;
-  w3[0] = w3[0] ^ 0x6a6a6a6a;
-  w3[1] = w3[1] ^ 0x6a6a6a6a;
-  w3[2] = w3[2] ^ 0x6a6a6a6a;
-  w3[3] = w3[3] ^ 0x6a6a6a6a;
-
-  opad[0] = MD5M_A;
-  opad[1] = MD5M_B;
-  opad[2] = MD5M_C;
-  opad[3] = MD5M_D;
-
-  md5_transform_V (w0, w1, w2, w3, opad);
+  md5_transform_vector (w0, w1, w2, w3, digest);
 }
 
-void hmac_md5_run_V (u32x w0[4], u32x w1[4], u32x w2[4], u32x w3[4], u32x ipad[4], u32x opad[4], u32x digest[4])
-{
-  digest[0] = ipad[0];
-  digest[1] = ipad[1];
-  digest[2] = ipad[2];
-  digest[3] = ipad[3];
-
-  md5_transform_V (w0, w1, w2, w3, digest);
-
-  w0[0] = digest[0];
-  w0[1] = digest[1];
-  w0[2] = digest[2];
-  w0[3] = digest[3];
-  w1[0] = 0x80;
-  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] = (64 + 16) * 8;
-  w3[3] = 0;
-
-  digest[0] = opad[0];
-  digest[1] = opad[1];
-  digest[2] = opad[2];
-  digest[3] = opad[3];
-
-  md5_transform_V (w0, w1, w2, w3, digest);
-}
-
-__kernel void m11900_init (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_md5_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pbkdf2_md5_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m11900_init (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_md5_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const pbkdf2_md5_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
    * base
@@ -392,95 +61,81 @@ __kernel void m11900_init (__global pw_t *pws, __global const kernel_rule_t *rul
   if (gid >= gid_max) return;
 
   u32 w0[4];
+  u32 w1[4];
+  u32 w2[4];
+  u32 w3[4];
 
   w0[0] = pws[gid].i[ 0];
   w0[1] = pws[gid].i[ 1];
   w0[2] = pws[gid].i[ 2];
   w0[3] = pws[gid].i[ 3];
-
-  u32 w1[4];
-
   w1[0] = pws[gid].i[ 4];
   w1[1] = pws[gid].i[ 5];
   w1[2] = pws[gid].i[ 6];
   w1[3] = pws[gid].i[ 7];
-
-  u32 w2[4];
-
   w2[0] = pws[gid].i[ 8];
   w2[1] = pws[gid].i[ 9];
   w2[2] = pws[gid].i[10];
   w2[3] = pws[gid].i[11];
-
-  u32 w3[4];
-
   w3[0] = pws[gid].i[12];
   w3[1] = pws[gid].i[13];
   w3[2] = pws[gid].i[14];
   w3[3] = pws[gid].i[15];
 
-  /**
-   * salt
-   */
+  md5_hmac_ctx_t md5_hmac_ctx;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
-  u32 esalt_buf0[4];
-  u32 esalt_buf1[4];
-  u32 esalt_buf2[4];
-  u32 esalt_buf3[4];
-
-  esalt_buf0[0] = esalt_bufs[digests_offset].salt_buf[ 0];
-  esalt_buf0[1] = esalt_bufs[digests_offset].salt_buf[ 1];
-  esalt_buf0[2] = esalt_bufs[digests_offset].salt_buf[ 2];
-  esalt_buf0[3] = esalt_bufs[digests_offset].salt_buf[ 3];
-  esalt_buf1[0] = esalt_bufs[digests_offset].salt_buf[ 4];
-  esalt_buf1[1] = esalt_bufs[digests_offset].salt_buf[ 5];
-  esalt_buf1[2] = esalt_bufs[digests_offset].salt_buf[ 6];
-  esalt_buf1[3] = esalt_bufs[digests_offset].salt_buf[ 7];
-  esalt_buf2[0] = esalt_bufs[digests_offset].salt_buf[ 8];
-  esalt_buf2[1] = esalt_bufs[digests_offset].salt_buf[ 9];
-  esalt_buf2[2] = esalt_bufs[digests_offset].salt_buf[10];
-  esalt_buf2[3] = esalt_bufs[digests_offset].salt_buf[11];
-  esalt_buf3[0] = esalt_bufs[digests_offset].salt_buf[12];
-  esalt_buf3[1] = esalt_bufs[digests_offset].salt_buf[13];
-  esalt_buf3[2] = (64 + salt_len + 4) * 8;
-  esalt_buf3[3] = 0;
-
-  u32 ipad[4];
-  u32 opad[4];
-
-  hmac_md5_pad_S (w0, w1, w2, w3, ipad, opad);
-
-  tmps[gid].ipad[0] = ipad[0];
-  tmps[gid].ipad[1] = ipad[1];
-  tmps[gid].ipad[2] = ipad[2];
-  tmps[gid].ipad[3] = ipad[3];
-
-  tmps[gid].opad[0] = opad[0];
-  tmps[gid].opad[1] = opad[1];
-  tmps[gid].opad[2] = opad[2];
-  tmps[gid].opad[3] = opad[3];
+  md5_hmac_init (&md5_hmac_ctx, w0, w1, w2, w3);
 
-  for (u32 i = 0, j = 1; i < 4; i += 4, j += 1)
-  {
-    u32 dgst[4];
+  tmps[gid].ipad[0] = md5_hmac_ctx.ipad.h[0];
+  tmps[gid].ipad[1] = md5_hmac_ctx.ipad.h[1];
+  tmps[gid].ipad[2] = md5_hmac_ctx.ipad.h[2];
+  tmps[gid].ipad[3] = md5_hmac_ctx.ipad.h[3];
 
-    hmac_md5_run_S (esalt_buf0, esalt_buf1, esalt_buf2, esalt_buf3, ipad, opad, dgst);
+  tmps[gid].opad[0] = md5_hmac_ctx.opad.h[0];
+  tmps[gid].opad[1] = md5_hmac_ctx.opad.h[1];
+  tmps[gid].opad[2] = md5_hmac_ctx.opad.h[2];
+  tmps[gid].opad[3] = md5_hmac_ctx.opad.h[3];
 
-    tmps[gid].dgst[i + 0] = dgst[0];
-    tmps[gid].dgst[i + 1] = dgst[1];
-    tmps[gid].dgst[i + 2] = dgst[2];
-    tmps[gid].dgst[i + 3] = dgst[3];
+  md5_hmac_update_global (&md5_hmac_ctx, esalt_bufs[digests_offset].salt_buf, salt_bufs[salt_pos].salt_len);
 
-    tmps[gid].out[i + 0] = dgst[0];
-    tmps[gid].out[i + 1] = dgst[1];
-    tmps[gid].out[i + 2] = dgst[2];
-    tmps[gid].out[i + 3] = dgst[3];
+  for (u32 i = 0, j = 1; i < 4; i += 4, j += 1)
+  {
+    md5_hmac_ctx_t md5_hmac_ctx2 = md5_hmac_ctx;
+
+    w0[0] = j << 24;
+    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;
+
+    md5_hmac_update_64 (&md5_hmac_ctx2, w0, w1, w2, w3, 4);
+
+    md5_hmac_final (&md5_hmac_ctx2);
+
+    tmps[gid].dgst[i + 0] = md5_hmac_ctx2.opad.h[0];
+    tmps[gid].dgst[i + 1] = md5_hmac_ctx2.opad.h[1];
+    tmps[gid].dgst[i + 2] = md5_hmac_ctx2.opad.h[2];
+    tmps[gid].dgst[i + 3] = md5_hmac_ctx2.opad.h[3];
+
+    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];
   }
 }
 
-__kernel void m11900_loop (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_md5_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pbkdf2_md5_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m11900_loop (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_md5_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const pbkdf2_md5_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   const u32 gid = get_global_id (0);
 
@@ -504,15 +159,15 @@ __kernel void m11900_loop (__global pw_t *pws, __global const kernel_rule_t *rul
     u32x dgst[4];
     u32x out[4];
 
-    dgst[0] = packv (tmps, dgst, gid, 0);
-    dgst[1] = packv (tmps, dgst, gid, 1);
-    dgst[2] = packv (tmps, dgst, gid, 2);
-    dgst[3] = packv (tmps, dgst, gid, 3);
+    dgst[0] = packv (tmps, dgst, gid, i + 0);
+    dgst[1] = packv (tmps, dgst, gid, i + 1);
+    dgst[2] = packv (tmps, dgst, gid, i + 2);
+    dgst[3] = packv (tmps, dgst, gid, i + 3);
 
-    out[0] = packv (tmps, out, gid, 0);
-    out[1] = packv (tmps, out, gid, 1);
-    out[2] = packv (tmps, out, gid, 2);
-    out[3] = packv (tmps, out, gid, 3);
+    out[0] = packv (tmps, out, gid, i + 0);
+    out[1] = packv (tmps, out, gid, i + 1);
+    out[2] = packv (tmps, out, gid, i + 2);
+    out[3] = packv (tmps, out, gid, i + 3);
 
     for (u32 j = 0; j < loop_cnt; j++)
     {
@@ -546,19 +201,19 @@ __kernel void m11900_loop (__global pw_t *pws, __global const kernel_rule_t *rul
       out[3] ^= dgst[3];
     }
 
-    unpackv (tmps, dgst, gid, 0, dgst[0]);
-    unpackv (tmps, dgst, gid, 1, dgst[1]);
-    unpackv (tmps, dgst, gid, 2, dgst[2]);
-    unpackv (tmps, dgst, gid, 3, dgst[3]);
+    unpackv (tmps, dgst, gid, i + 0, dgst[0]);
+    unpackv (tmps, dgst, gid, i + 1, dgst[1]);
+    unpackv (tmps, dgst, gid, i + 2, dgst[2]);
+    unpackv (tmps, dgst, gid, i + 3, dgst[3]);
 
-    unpackv (tmps, out, gid, 0, out[0]);
-    unpackv (tmps, out, gid, 1, out[1]);
-    unpackv (tmps, out, gid, 2, out[2]);
-    unpackv (tmps, out, gid, 3, out[3]);
+    unpackv (tmps, out, gid, i + 0, out[0]);
+    unpackv (tmps, out, gid, i + 1, out[1]);
+    unpackv (tmps, out, gid, i + 2, out[2]);
+    unpackv (tmps, out, gid, i + 3, out[3]);
   }
 }
 
-__kernel void m11900_comp (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_md5_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pbkdf2_md5_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
+__kernel void m11900_comp (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_md5_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const pbkdf2_md5_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
 {
   /**
    * base
diff --git a/src/interface.c b/src/interface.c
index f72489580..0c2f1e55b 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -24622,7 +24622,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
                   break;
       case  8600: hashconfig->pw_max = 16;
                   break;
-      case 10700: hashconfig->pw_max = 16;
+      case 10700: hashconfig->pw_max = 16; // todo
                   break;
       case 12500: hashconfig->pw_max = 20;
                   break;
@@ -24739,6 +24739,8 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
                 break;
     case 10900: hashconfig->pw_max = 64;  // PBKDF2-HMAC-SHA256 max
                 break;
+    case 11900: hashconfig->pw_max = 64;  // PBKDF2-HMAC-MD5 max
+                break;
     case 12000: hashconfig->pw_max = 64;  // PBKDF2-HMAC-SHA1 max
                 break;
     case 12001: hashconfig->pw_max = 64;  // PBKDF2-HMAC-SHA1 max