From 2a6444c05aae6c6178d27802669a1796ccf80e2c Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Tue, 20 Nov 2018 15:26:46 +0100 Subject: [PATCH] Give the compiler a hint for automatic optimizations based on password length --- OpenCL/m00000_a0-optimized.cl | 4 ++-- OpenCL/m00000_a3-optimized.cl | 12 ++++++------ OpenCL/m00000_a3-pure.cl | 4 ++-- OpenCL/m00010_a0-optimized.cl | 4 ++-- OpenCL/m00010_a3-optimized.cl | 12 ++++++------ OpenCL/m00010_a3-pure.cl | 4 ++-- OpenCL/m00020_a0-optimized.cl | 4 ++-- OpenCL/m00020_a3-optimized.cl | 12 ++++++------ OpenCL/m00020_a3-pure.cl | 4 ++-- OpenCL/m00030_a0-optimized.cl | 4 ++-- OpenCL/m00030_a3-optimized.cl | 12 ++++++------ OpenCL/m00030_a3-pure.cl | 4 ++-- OpenCL/m00040_a0-optimized.cl | 4 ++-- OpenCL/m00040_a3-optimized.cl | 12 ++++++------ OpenCL/m00040_a3-pure.cl | 4 ++-- OpenCL/m00050_a0-optimized.cl | 4 ++-- OpenCL/m00050_a1-pure.cl | 4 ++-- OpenCL/m00050_a3-optimized.cl | 12 ++++++------ OpenCL/m00050_a3-pure.cl | 4 ++-- OpenCL/m00060_a0-optimized.cl | 4 ++-- OpenCL/m00060_a1-pure.cl | 4 ++-- OpenCL/m00060_a3-optimized.cl | 12 ++++++------ OpenCL/m00060_a3-pure.cl | 4 ++-- OpenCL/m00100_a0-optimized.cl | 4 ++-- OpenCL/m00100_a3-optimized.cl | 12 ++++++------ OpenCL/m00100_a3-pure.cl | 4 ++-- OpenCL/m00110_a0-optimized.cl | 4 ++-- OpenCL/m00110_a3-optimized.cl | 12 ++++++------ OpenCL/m00110_a3-pure.cl | 4 ++-- OpenCL/m00120_a0-optimized.cl | 4 ++-- OpenCL/m00120_a3-optimized.cl | 12 ++++++------ OpenCL/m00120_a3-pure.cl | 4 ++-- OpenCL/m00130_a0-optimized.cl | 4 ++-- OpenCL/m00130_a3-optimized.cl | 12 ++++++------ OpenCL/m00130_a3-pure.cl | 4 ++-- OpenCL/m00140_a0-optimized.cl | 4 ++-- OpenCL/m00140_a3-optimized.cl | 12 ++++++------ OpenCL/m00140_a3-pure.cl | 4 ++-- OpenCL/m00150_a0-optimized.cl | 4 ++-- OpenCL/m00150_a1-pure.cl | 4 ++-- OpenCL/m00150_a3-optimized.cl | 12 ++++++------ OpenCL/m00150_a3-pure.cl | 4 ++-- OpenCL/m00160_a0-optimized.cl | 4 ++-- OpenCL/m00160_a1-pure.cl | 4 ++-- OpenCL/m00160_a3-optimized.cl | 12 ++++++------ OpenCL/m00160_a3-pure.cl | 4 ++-- OpenCL/m00200_a0-optimized.cl | 4 ++-- OpenCL/m00200_a3-optimized.cl | 12 ++++++------ OpenCL/m00300_a0-optimized.cl | 4 ++-- OpenCL/m00300_a3-optimized.cl | 12 ++++++------ OpenCL/m00300_a3-pure.cl | 4 ++-- OpenCL/m00400-optimized.cl | 2 +- OpenCL/m00400-pure.cl | 2 +- OpenCL/m00500-optimized.cl | 4 ++-- OpenCL/m00500-pure.cl | 4 ++-- OpenCL/m00600_a0-optimized.cl | 4 ++-- OpenCL/m00900_a0-optimized.cl | 4 ++-- OpenCL/m00900_a3-optimized.cl | 12 ++++++------ OpenCL/m00900_a3-pure.cl | 4 ++-- OpenCL/m01000_a0-optimized.cl | 4 ++-- OpenCL/m01000_a3-optimized.cl | 12 ++++++------ OpenCL/m01000_a3-pure.cl | 4 ++-- OpenCL/m01100_a0-optimized.cl | 4 ++-- OpenCL/m01100_a3-optimized.cl | 8 ++++---- OpenCL/m01100_a3-pure.cl | 4 ++-- OpenCL/m01300_a0-optimized.cl | 4 ++-- OpenCL/m01300_a3-optimized.cl | 12 ++++++------ OpenCL/m01300_a3-pure.cl | 4 ++-- OpenCL/m01400_a0-optimized.cl | 4 ++-- OpenCL/m01400_a3-optimized.cl | 12 ++++++------ OpenCL/m01400_a3-pure.cl | 4 ++-- OpenCL/m01410_a0-optimized.cl | 4 ++-- OpenCL/m01410_a3-optimized.cl | 12 ++++++------ OpenCL/m01410_a3-pure.cl | 4 ++-- OpenCL/m01420_a0-optimized.cl | 4 ++-- OpenCL/m01420_a3-optimized.cl | 12 ++++++------ OpenCL/m01420_a3-pure.cl | 4 ++-- OpenCL/m01430_a0-optimized.cl | 4 ++-- OpenCL/m01430_a3-optimized.cl | 12 ++++++------ OpenCL/m01430_a3-pure.cl | 4 ++-- OpenCL/m01440_a0-optimized.cl | 4 ++-- OpenCL/m01440_a3-optimized.cl | 12 ++++++------ OpenCL/m01440_a3-pure.cl | 4 ++-- OpenCL/m01450_a0-optimized.cl | 4 ++-- OpenCL/m01450_a1-pure.cl | 4 ++-- OpenCL/m01450_a3-optimized.cl | 12 ++++++------ OpenCL/m01450_a3-pure.cl | 4 ++-- OpenCL/m01460_a0-optimized.cl | 4 ++-- OpenCL/m01460_a1-pure.cl | 4 ++-- OpenCL/m01460_a3-optimized.cl | 12 ++++++------ OpenCL/m01460_a3-pure.cl | 4 ++-- OpenCL/m01600-optimized.cl | 4 ++-- OpenCL/m01600-pure.cl | 4 ++-- OpenCL/m01700_a0-optimized.cl | 4 ++-- OpenCL/m01700_a3-optimized.cl | 12 ++++++------ OpenCL/m01700_a3-pure.cl | 4 ++-- OpenCL/m01710_a0-optimized.cl | 4 ++-- OpenCL/m01710_a3-optimized.cl | 12 ++++++------ OpenCL/m01710_a3-pure.cl | 4 ++-- OpenCL/m01720_a0-optimized.cl | 4 ++-- OpenCL/m01720_a3-optimized.cl | 12 ++++++------ OpenCL/m01720_a3-pure.cl | 4 ++-- OpenCL/m01730_a0-optimized.cl | 4 ++-- OpenCL/m01730_a3-optimized.cl | 12 ++++++------ OpenCL/m01730_a3-pure.cl | 4 ++-- OpenCL/m01740_a0-optimized.cl | 4 ++-- OpenCL/m01740_a3-optimized.cl | 12 ++++++------ OpenCL/m01740_a3-pure.cl | 4 ++-- OpenCL/m01750_a0-optimized.cl | 4 ++-- OpenCL/m01750_a1-pure.cl | 4 ++-- OpenCL/m01750_a3-optimized.cl | 12 ++++++------ OpenCL/m01750_a3-pure.cl | 4 ++-- OpenCL/m01760_a0-optimized.cl | 4 ++-- OpenCL/m01760_a1-pure.cl | 4 ++-- OpenCL/m01760_a3-optimized.cl | 12 ++++++------ OpenCL/m01760_a3-pure.cl | 4 ++-- OpenCL/m01800-optimized.cl | 4 ++-- OpenCL/m01800-pure.cl | 4 ++-- OpenCL/m02400_a0-optimized.cl | 4 ++-- OpenCL/m02400_a3-optimized.cl | 4 ++-- OpenCL/m02410_a0-optimized.cl | 4 ++-- OpenCL/m02410_a3-optimized.cl | 4 ++-- OpenCL/m02610_a0-optimized.cl | 4 ++-- OpenCL/m02610_a3-optimized.cl | 12 ++++++------ OpenCL/m02610_a3-pure.cl | 4 ++-- OpenCL/m02710_a0-optimized.cl | 4 ++-- OpenCL/m02710_a3-optimized.cl | 12 ++++++------ OpenCL/m02810_a0-optimized.cl | 4 ++-- OpenCL/m02810_a3-optimized.cl | 12 ++++++------ OpenCL/m02810_a3-pure.cl | 4 ++-- OpenCL/m03100_a0-optimized.cl | 4 ++-- OpenCL/m03100_a3-optimized.cl | 8 ++++---- OpenCL/m03200-pure.cl | 2 +- OpenCL/m03710_a0-optimized.cl | 4 ++-- OpenCL/m03710_a3-optimized.cl | 12 ++++++------ OpenCL/m03710_a3-pure.cl | 4 ++-- OpenCL/m03800_a0-optimized.cl | 4 ++-- OpenCL/m03800_a3-optimized.cl | 12 ++++++------ OpenCL/m03800_a3-pure.cl | 4 ++-- OpenCL/m03910_a0-optimized.cl | 4 ++-- OpenCL/m03910_a3-optimized.cl | 12 ++++++------ OpenCL/m03910_a3-pure.cl | 4 ++-- OpenCL/m04010_a0-optimized.cl | 4 ++-- OpenCL/m04010_a3-optimized.cl | 12 ++++++------ OpenCL/m04010_a3-pure.cl | 4 ++-- OpenCL/m04110_a0-optimized.cl | 4 ++-- OpenCL/m04110_a3-optimized.cl | 12 ++++++------ OpenCL/m04110_a3-pure.cl | 4 ++-- OpenCL/m04310_a0-optimized.cl | 4 ++-- OpenCL/m04310_a3-optimized.cl | 12 ++++++------ OpenCL/m04310_a3-pure.cl | 4 ++-- OpenCL/m04400_a0-optimized.cl | 4 ++-- OpenCL/m04400_a3-optimized.cl | 12 ++++++------ OpenCL/m04400_a3-pure.cl | 4 ++-- OpenCL/m04500_a0-optimized.cl | 4 ++-- OpenCL/m04500_a3-optimized.cl | 12 ++++++------ OpenCL/m04500_a3-pure.cl | 4 ++-- OpenCL/m04520_a0-optimized.cl | 4 ++-- OpenCL/m04520_a3-optimized.cl | 12 ++++++------ OpenCL/m04520_a3-pure.cl | 4 ++-- OpenCL/m04700_a0-optimized.cl | 4 ++-- OpenCL/m04700_a3-optimized.cl | 12 ++++++------ OpenCL/m04700_a3-pure.cl | 4 ++-- OpenCL/m04800_a0-optimized.cl | 4 ++-- OpenCL/m04800_a3-optimized.cl | 12 ++++++------ OpenCL/m04800_a3-pure.cl | 4 ++-- OpenCL/m04900_a0-optimized.cl | 4 ++-- OpenCL/m04900_a3-optimized.cl | 12 ++++++------ OpenCL/m04900_a3-pure.cl | 4 ++-- OpenCL/m05100_a0-optimized.cl | 4 ++-- OpenCL/m05100_a3-optimized.cl | 12 ++++++------ OpenCL/m05100_a3-pure.cl | 4 ++-- OpenCL/m05300_a0-optimized.cl | 4 ++-- OpenCL/m05300_a1-pure.cl | 4 ++-- OpenCL/m05300_a3-optimized.cl | 12 ++++++------ OpenCL/m05300_a3-pure.cl | 4 ++-- OpenCL/m05400_a0-optimized.cl | 4 ++-- OpenCL/m05400_a1-pure.cl | 4 ++-- OpenCL/m05400_a3-optimized.cl | 12 ++++++------ OpenCL/m05400_a3-pure.cl | 4 ++-- OpenCL/m05500_a0-optimized.cl | 4 ++-- OpenCL/m05500_a3-optimized.cl | 8 ++++---- OpenCL/m05500_a3-pure.cl | 4 ++-- OpenCL/m05600_a0-optimized.cl | 4 ++-- OpenCL/m05600_a3-optimized.cl | 12 ++++++------ OpenCL/m05600_a3-pure.cl | 4 ++-- OpenCL/m05800-optimized.cl | 4 ++-- OpenCL/m05800-pure.cl | 2 +- OpenCL/m06000_a0-optimized.cl | 4 ++-- OpenCL/m06000_a3-optimized.cl | 12 ++++++------ OpenCL/m06000_a3-pure.cl | 4 ++-- OpenCL/m06100_a0-optimized.cl | 4 ++-- OpenCL/m06100_a3-optimized.cl | 12 ++++++------ OpenCL/m06100_a3-pure.cl | 4 ++-- OpenCL/m06300-optimized.cl | 4 ++-- OpenCL/m06300-pure.cl | 4 ++-- OpenCL/m06900_a0-optimized.cl | 4 ++-- OpenCL/m06900_a3-optimized.cl | 8 ++++---- OpenCL/m07000_a0-optimized.cl | 4 ++-- OpenCL/m07000_a3-optimized.cl | 12 ++++++------ OpenCL/m07000_a3-pure.cl | 4 ++-- OpenCL/m07300_a0-optimized.cl | 4 ++-- OpenCL/m07300_a1-pure.cl | 4 ++-- OpenCL/m07300_a3-optimized.cl | 12 ++++++------ OpenCL/m07300_a3-pure.cl | 4 ++-- OpenCL/m07400-optimized.cl | 4 ++-- OpenCL/m07400-pure.cl | 4 ++-- OpenCL/m07500_a0-optimized.cl | 4 ++-- OpenCL/m07500_a3-optimized.cl | 8 ++++---- OpenCL/m07500_a3-pure.cl | 4 ++-- OpenCL/m07700_a0-optimized.cl | 4 ++-- OpenCL/m07700_a3-optimized.cl | 8 ++++---- OpenCL/m07701_a0-optimized.cl | 4 ++-- OpenCL/m07701_a3-optimized.cl | 8 ++++---- OpenCL/m07800_a0-optimized.cl | 4 ++-- OpenCL/m07800_a3-optimized.cl | 8 ++++---- OpenCL/m07801_a0-optimized.cl | 4 ++-- OpenCL/m07801_a3-optimized.cl | 8 ++++---- OpenCL/m07900-pure.cl | 2 +- OpenCL/m08000_a0-optimized.cl | 4 ++-- OpenCL/m08000_a3-optimized.cl | 12 ++++++------ OpenCL/m08100_a0-optimized.cl | 4 ++-- OpenCL/m08100_a3-optimized.cl | 12 ++++++------ OpenCL/m08100_a3-pure.cl | 4 ++-- OpenCL/m08300_a0-optimized.cl | 4 ++-- OpenCL/m08300_a3-optimized.cl | 12 ++++++------ OpenCL/m08300_a3-pure.cl | 4 ++-- OpenCL/m08400_a0-optimized.cl | 4 ++-- OpenCL/m08400_a3-optimized.cl | 12 ++++++------ OpenCL/m08400_a3-pure.cl | 4 ++-- OpenCL/m08500_a3-pure.cl | 4 ++-- OpenCL/m08600_a3-pure.cl | 4 ++-- OpenCL/m08700_a0-optimized.cl | 4 ++-- OpenCL/m08700_a3-optimized.cl | 12 ++++++------ OpenCL/m09000-pure.cl | 2 +- OpenCL/m09700_a0-optimized.cl | 4 ++-- OpenCL/m09700_a3-optimized.cl | 12 ++++++------ OpenCL/m09710_a0-optimized.cl | 4 ++-- OpenCL/m09710_a3-optimized.cl | 4 ++-- OpenCL/m09720_a0-optimized.cl | 4 ++-- OpenCL/m09720_a3-optimized.cl | 12 ++++++------ OpenCL/m09800_a0-optimized.cl | 4 ++-- OpenCL/m09800_a3-optimized.cl | 12 ++++++------ OpenCL/m09810_a0-optimized.cl | 4 ++-- OpenCL/m09810_a3-optimized.cl | 12 ++++++------ OpenCL/m09820_a0-optimized.cl | 4 ++-- OpenCL/m09820_a3-optimized.cl | 12 ++++++------ OpenCL/m09900_a0-optimized.cl | 4 ++-- OpenCL/m09900_a3-optimized.cl | 12 ++++++------ OpenCL/m09900_a3-pure.cl | 4 ++-- OpenCL/m10100_a0-optimized.cl | 4 ++-- OpenCL/m10100_a3-optimized.cl | 12 ++++++------ OpenCL/m10400_a0-optimized.cl | 4 ++-- OpenCL/m10400_a3-optimized.cl | 12 ++++++------ OpenCL/m10410_a0-optimized.cl | 4 ++-- OpenCL/m10410_a3-optimized.cl | 12 ++++++------ OpenCL/m10420_a0-optimized.cl | 4 ++-- OpenCL/m10420_a3-optimized.cl | 12 ++++++------ OpenCL/m10500-pure.cl | 2 +- OpenCL/m10700-optimized.cl | 2 +- OpenCL/m10700-pure.cl | 2 +- OpenCL/m10800_a0-optimized.cl | 4 ++-- OpenCL/m10800_a3-optimized.cl | 12 ++++++------ OpenCL/m10800_a3-pure.cl | 4 ++-- OpenCL/m11000_a0-optimized.cl | 4 ++-- OpenCL/m11000_a3-optimized.cl | 12 ++++++------ OpenCL/m11000_a3-pure.cl | 4 ++-- OpenCL/m11100_a0-optimized.cl | 4 ++-- OpenCL/m11100_a3-optimized.cl | 12 ++++++------ OpenCL/m11100_a3-pure.cl | 4 ++-- OpenCL/m11200_a0-optimized.cl | 4 ++-- OpenCL/m11200_a3-optimized.cl | 12 ++++++------ OpenCL/m11200_a3-pure.cl | 4 ++-- OpenCL/m11400_a3-pure.cl | 4 ++-- OpenCL/m11500_a0-optimized.cl | 4 ++-- OpenCL/m11500_a3-optimized.cl | 12 ++++++------ OpenCL/m11600-pure.cl | 2 +- OpenCL/m11700_a0-optimized.cl | 4 ++-- OpenCL/m11700_a3-optimized.cl | 12 ++++++------ OpenCL/m11700_a3-pure.cl | 4 ++-- OpenCL/m11750_a1-pure.cl | 4 ++-- OpenCL/m11750_a3-pure.cl | 4 ++-- OpenCL/m11760_a1-pure.cl | 4 ++-- OpenCL/m11760_a3-pure.cl | 4 ++-- OpenCL/m11800_a0-optimized.cl | 4 ++-- OpenCL/m11800_a3-optimized.cl | 12 ++++++------ OpenCL/m11800_a3-pure.cl | 4 ++-- OpenCL/m11850_a1-pure.cl | 4 ++-- OpenCL/m11850_a3-pure.cl | 4 ++-- OpenCL/m11860_a1-pure.cl | 4 ++-- OpenCL/m11860_a3-pure.cl | 4 ++-- OpenCL/m12400-pure.cl | 2 +- OpenCL/m12500-pure.cl | 2 +- OpenCL/m12600_a0-optimized.cl | 4 ++-- OpenCL/m12600_a3-optimized.cl | 12 ++++++------ OpenCL/m12600_a3-pure.cl | 4 ++-- OpenCL/m13100_a0-optimized.cl | 4 ++-- OpenCL/m13100_a3-optimized.cl | 8 ++++---- OpenCL/m13100_a3-pure.cl | 4 ++-- OpenCL/m13300_a0-optimized.cl | 4 ++-- OpenCL/m13300_a3-optimized.cl | 12 ++++++------ OpenCL/m13300_a3-pure.cl | 4 ++-- OpenCL/m13500_a0-optimized.cl | 4 ++-- OpenCL/m13500_a3-optimized.cl | 12 ++++++------ OpenCL/m13500_a3-pure.cl | 4 ++-- OpenCL/m13800_a0-optimized.cl | 4 ++-- OpenCL/m13800_a3-optimized.cl | 12 ++++++------ OpenCL/m13800_a3-pure.cl | 4 ++-- OpenCL/m13900_a0-optimized.cl | 4 ++-- OpenCL/m13900_a3-optimized.cl | 12 ++++++------ OpenCL/m13900_a3-pure.cl | 4 ++-- OpenCL/m14000_a0-pure.cl | 4 ++-- OpenCL/m14100_a0-pure.cl | 4 ++-- OpenCL/m14100_a3-pure.cl | 4 ++-- OpenCL/m14400_a0-optimized.cl | 4 ++-- OpenCL/m14400_a3-optimized.cl | 12 ++++++------ OpenCL/m14400_a3-pure.cl | 4 ++-- OpenCL/m14900_a0-optimized.cl | 4 ++-- OpenCL/m14900_a3-optimized.cl | 4 ++-- OpenCL/m15000_a0-optimized.cl | 4 ++-- OpenCL/m15000_a3-optimized.cl | 12 ++++++------ OpenCL/m15000_a3-pure.cl | 4 ++-- OpenCL/m15400_a0-optimized.cl | 4 ++-- OpenCL/m15500_a0-optimized.cl | 4 ++-- OpenCL/m15500_a3-optimized.cl | 12 ++++++------ OpenCL/m15500_a3-pure.cl | 4 ++-- OpenCL/m16000_a3-pure.cl | 4 ++-- OpenCL/m16100_a0-optimized.cl | 4 ++-- OpenCL/m16100_a3-optimized.cl | 12 ++++++------ OpenCL/m16100_a3-pure.cl | 4 ++-- OpenCL/m16400_a0-optimized.cl | 4 ++-- OpenCL/m16400_a3-optimized.cl | 12 ++++++------ OpenCL/m16400_a3-pure.cl | 4 ++-- OpenCL/m16511_a1-pure.cl | 4 ++-- OpenCL/m16511_a3-pure.cl | 4 ++-- OpenCL/m16512_a1-pure.cl | 4 ++-- OpenCL/m16512_a3-pure.cl | 4 ++-- OpenCL/m16513_a1-pure.cl | 4 ++-- OpenCL/m16513_a3-pure.cl | 4 ++-- OpenCL/m16600_a0-optimized.cl | 4 ++-- OpenCL/m16600_a3-optimized.cl | 12 ++++++------ OpenCL/m16600_a3-pure.cl | 4 ++-- OpenCL/m17300_a0-optimized.cl | 4 ++-- OpenCL/m17300_a3-optimized.cl | 12 ++++++------ OpenCL/m17400_a0-optimized.cl | 4 ++-- OpenCL/m17400_a3-optimized.cl | 12 ++++++------ OpenCL/m17500_a0-optimized.cl | 4 ++-- OpenCL/m17500_a3-optimized.cl | 12 ++++++------ OpenCL/m17600_a0-optimized.cl | 4 ++-- OpenCL/m17600_a3-optimized.cl | 12 ++++++------ OpenCL/m17700_a0-optimized.cl | 4 ++-- OpenCL/m17700_a3-optimized.cl | 12 ++++++------ OpenCL/m17800_a0-optimized.cl | 4 ++-- OpenCL/m17800_a3-optimized.cl | 12 ++++++------ OpenCL/m17900_a0-optimized.cl | 4 ++-- OpenCL/m17900_a3-optimized.cl | 12 ++++++------ OpenCL/m18000_a0-optimized.cl | 4 ++-- OpenCL/m18000_a3-optimized.cl | 12 ++++++------ OpenCL/m18100_a1-pure.cl | 4 ++-- OpenCL/m18100_a3-pure.cl | 4 ++-- OpenCL/m18200_a0-optimized.cl | 4 ++-- OpenCL/m18200_a3-optimized.cl | 8 ++++---- OpenCL/m18200_a3-pure.cl | 4 ++-- 363 files changed, 1124 insertions(+), 1124 deletions(-) diff --git a/OpenCL/m00000_a0-optimized.cl b/OpenCL/m00000_a0-optimized.cl index 789ce9a90..9670e47d2 100644 --- a/OpenCL/m00000_a0-optimized.cl +++ b/OpenCL/m00000_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00000_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -177,7 +177,7 @@ __kernel void m00000_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m00000_a3-optimized.cl b/OpenCL/m00000_a3-optimized.cl index a0ce05826..f4af39fcf 100644 --- a/OpenCL/m00000_a3-optimized.cl +++ b/OpenCL/m00000_a3-optimized.cl @@ -457,7 +457,7 @@ __kernel void m00000_m04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -495,7 +495,7 @@ __kernel void m00000_m08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -533,7 +533,7 @@ __kernel void m00000_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -571,7 +571,7 @@ __kernel void m00000_s04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -609,7 +609,7 @@ __kernel void m00000_s08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -647,7 +647,7 @@ __kernel void m00000_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00000_a3-pure.cl b/OpenCL/m00000_a3-pure.cl index 907673903..b32e5d921 100644 --- a/OpenCL/m00000_a3-pure.cl +++ b/OpenCL/m00000_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00000_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m00000_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00010_a0-optimized.cl b/OpenCL/m00010_a0-optimized.cl index 4c6e6bf72..e565b94ca 100644 --- a/OpenCL/m00010_a0-optimized.cl +++ b/OpenCL/m00010_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00010_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -251,7 +251,7 @@ __kernel void m00010_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00010_a3-optimized.cl b/OpenCL/m00010_a3-optimized.cl index bf4eb38bb..bff79c561 100644 --- a/OpenCL/m00010_a3-optimized.cl +++ b/OpenCL/m00010_a3-optimized.cl @@ -505,7 +505,7 @@ __kernel void m00010_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -543,7 +543,7 @@ __kernel void m00010_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -581,7 +581,7 @@ __kernel void m00010_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -619,7 +619,7 @@ __kernel void m00010_s04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -657,7 +657,7 @@ __kernel void m00010_s08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -695,7 +695,7 @@ __kernel void m00010_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00010_a3-pure.cl b/OpenCL/m00010_a3-pure.cl index 16f0f38b2..83a8de40d 100644 --- a/OpenCL/m00010_a3-pure.cl +++ b/OpenCL/m00010_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00010_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m00010_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00020_a0-optimized.cl b/OpenCL/m00020_a0-optimized.cl index 42ae20848..94f430180 100644 --- a/OpenCL/m00020_a0-optimized.cl +++ b/OpenCL/m00020_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00020_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -231,7 +231,7 @@ __kernel void m00020_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00020_a3-optimized.cl b/OpenCL/m00020_a3-optimized.cl index 285e90a05..cf560f37e 100644 --- a/OpenCL/m00020_a3-optimized.cl +++ b/OpenCL/m00020_a3-optimized.cl @@ -415,7 +415,7 @@ __kernel void m00020_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -462,7 +462,7 @@ __kernel void m00020_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -509,7 +509,7 @@ __kernel void m00020_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -556,7 +556,7 @@ __kernel void m00020_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -603,7 +603,7 @@ __kernel void m00020_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -650,7 +650,7 @@ __kernel void m00020_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00020_a3-pure.cl b/OpenCL/m00020_a3-pure.cl index 1b4e680d2..7c4f9f173 100644 --- a/OpenCL/m00020_a3-pure.cl +++ b/OpenCL/m00020_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00020_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m00020_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00030_a0-optimized.cl b/OpenCL/m00030_a0-optimized.cl index bcf40ed3c..bd6535c98 100644 --- a/OpenCL/m00030_a0-optimized.cl +++ b/OpenCL/m00030_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00030_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -256,7 +256,7 @@ __kernel void m00030_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00030_a3-optimized.cl b/OpenCL/m00030_a3-optimized.cl index 9998f70d3..44d866211 100644 --- a/OpenCL/m00030_a3-optimized.cl +++ b/OpenCL/m00030_a3-optimized.cl @@ -505,7 +505,7 @@ __kernel void m00030_m04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -543,7 +543,7 @@ __kernel void m00030_m08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -581,7 +581,7 @@ __kernel void m00030_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -619,7 +619,7 @@ __kernel void m00030_s04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -657,7 +657,7 @@ __kernel void m00030_s08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -695,7 +695,7 @@ __kernel void m00030_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00030_a3-pure.cl b/OpenCL/m00030_a3-pure.cl index 6ee6d8735..6b28758b8 100644 --- a/OpenCL/m00030_a3-pure.cl +++ b/OpenCL/m00030_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00030_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m00030_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00040_a0-optimized.cl b/OpenCL/m00040_a0-optimized.cl index 90a41d2d1..3fea14114 100644 --- a/OpenCL/m00040_a0-optimized.cl +++ b/OpenCL/m00040_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00040_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -236,7 +236,7 @@ __kernel void m00040_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00040_a3-optimized.cl b/OpenCL/m00040_a3-optimized.cl index 2d580bc41..9e6f68445 100644 --- a/OpenCL/m00040_a3-optimized.cl +++ b/OpenCL/m00040_a3-optimized.cl @@ -415,7 +415,7 @@ __kernel void m00040_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -462,7 +462,7 @@ __kernel void m00040_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -509,7 +509,7 @@ __kernel void m00040_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -556,7 +556,7 @@ __kernel void m00040_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -603,7 +603,7 @@ __kernel void m00040_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -650,7 +650,7 @@ __kernel void m00040_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00040_a3-pure.cl b/OpenCL/m00040_a3-pure.cl index 867a5136b..cab6c2ca1 100644 --- a/OpenCL/m00040_a3-pure.cl +++ b/OpenCL/m00040_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00040_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m00040_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00050_a0-optimized.cl b/OpenCL/m00050_a0-optimized.cl index b8bd0ed7b..d423feaf0 100644 --- a/OpenCL/m00050_a0-optimized.cl +++ b/OpenCL/m00050_a0-optimized.cl @@ -128,7 +128,7 @@ __kernel void m00050_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -241,7 +241,7 @@ __kernel void m00050_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00050_a1-pure.cl b/OpenCL/m00050_a1-pure.cl index 74ef70be8..fc4ffa681 100644 --- a/OpenCL/m00050_a1-pure.cl +++ b/OpenCL/m00050_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m00050_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -118,7 +118,7 @@ __kernel void m00050_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m00050_a3-optimized.cl b/OpenCL/m00050_a3-optimized.cl index 93e64ff01..40d7546d0 100644 --- a/OpenCL/m00050_a3-optimized.cl +++ b/OpenCL/m00050_a3-optimized.cl @@ -358,7 +358,7 @@ __kernel void m00050_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -405,7 +405,7 @@ __kernel void m00050_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -452,7 +452,7 @@ __kernel void m00050_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -499,7 +499,7 @@ __kernel void m00050_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -546,7 +546,7 @@ __kernel void m00050_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -593,7 +593,7 @@ __kernel void m00050_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00050_a3-pure.cl b/OpenCL/m00050_a3-pure.cl index 24d12103e..a4df006a8 100644 --- a/OpenCL/m00050_a3-pure.cl +++ b/OpenCL/m00050_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00050_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -104,7 +104,7 @@ __kernel void m00050_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00060_a0-optimized.cl b/OpenCL/m00060_a0-optimized.cl index c8d4e8a9d..82cc698d8 100644 --- a/OpenCL/m00060_a0-optimized.cl +++ b/OpenCL/m00060_a0-optimized.cl @@ -128,7 +128,7 @@ __kernel void m00060_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -265,7 +265,7 @@ __kernel void m00060_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00060_a1-pure.cl b/OpenCL/m00060_a1-pure.cl index ed8af4509..da338113c 100644 --- a/OpenCL/m00060_a1-pure.cl +++ b/OpenCL/m00060_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m00060_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -120,7 +120,7 @@ __kernel void m00060_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m00060_a3-optimized.cl b/OpenCL/m00060_a3-optimized.cl index 61977bc42..a1bd27608 100644 --- a/OpenCL/m00060_a3-optimized.cl +++ b/OpenCL/m00060_a3-optimized.cl @@ -358,7 +358,7 @@ __kernel void m00060_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -405,7 +405,7 @@ __kernel void m00060_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -452,7 +452,7 @@ __kernel void m00060_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -499,7 +499,7 @@ __kernel void m00060_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -546,7 +546,7 @@ __kernel void m00060_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -593,7 +593,7 @@ __kernel void m00060_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00060_a3-pure.cl b/OpenCL/m00060_a3-pure.cl index de705e6b4..6f9ce3ab0 100644 --- a/OpenCL/m00060_a3-pure.cl +++ b/OpenCL/m00060_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00060_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m00060_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00100_a0-optimized.cl b/OpenCL/m00100_a0-optimized.cl index 9b0506752..7e05f0260 100644 --- a/OpenCL/m00100_a0-optimized.cl +++ b/OpenCL/m00100_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00100_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -222,7 +222,7 @@ __kernel void m00100_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m00100_a3-optimized.cl b/OpenCL/m00100_a3-optimized.cl index 168777c09..f35fe93f0 100644 --- a/OpenCL/m00100_a3-optimized.cl +++ b/OpenCL/m00100_a3-optimized.cl @@ -549,7 +549,7 @@ __kernel void m00100_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -587,7 +587,7 @@ __kernel void m00100_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -625,7 +625,7 @@ __kernel void m00100_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -663,7 +663,7 @@ __kernel void m00100_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -701,7 +701,7 @@ __kernel void m00100_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -739,7 +739,7 @@ __kernel void m00100_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00100_a3-pure.cl b/OpenCL/m00100_a3-pure.cl index 819a50d79..069c70c44 100644 --- a/OpenCL/m00100_a3-pure.cl +++ b/OpenCL/m00100_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00100_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m00100_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00110_a0-optimized.cl b/OpenCL/m00110_a0-optimized.cl index 987f4bf48..0e71cef8b 100644 --- a/OpenCL/m00110_a0-optimized.cl +++ b/OpenCL/m00110_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00110_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -295,7 +295,7 @@ __kernel void m00110_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00110_a3-optimized.cl b/OpenCL/m00110_a3-optimized.cl index 7dafcffe4..e60ddacbb 100644 --- a/OpenCL/m00110_a3-optimized.cl +++ b/OpenCL/m00110_a3-optimized.cl @@ -597,7 +597,7 @@ __kernel void m00110_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -635,7 +635,7 @@ __kernel void m00110_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -673,7 +673,7 @@ __kernel void m00110_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -711,7 +711,7 @@ __kernel void m00110_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -749,7 +749,7 @@ __kernel void m00110_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -787,7 +787,7 @@ __kernel void m00110_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00110_a3-pure.cl b/OpenCL/m00110_a3-pure.cl index b69cfa0de..96770df33 100644 --- a/OpenCL/m00110_a3-pure.cl +++ b/OpenCL/m00110_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00110_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m00110_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00120_a0-optimized.cl b/OpenCL/m00120_a0-optimized.cl index 7d03a028f..a618e4e20 100644 --- a/OpenCL/m00120_a0-optimized.cl +++ b/OpenCL/m00120_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00120_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -287,7 +287,7 @@ __kernel void m00120_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00120_a3-optimized.cl b/OpenCL/m00120_a3-optimized.cl index c75233df4..7d676b013 100644 --- a/OpenCL/m00120_a3-optimized.cl +++ b/OpenCL/m00120_a3-optimized.cl @@ -509,7 +509,7 @@ __kernel void m00120_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -556,7 +556,7 @@ __kernel void m00120_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -603,7 +603,7 @@ __kernel void m00120_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -650,7 +650,7 @@ __kernel void m00120_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -697,7 +697,7 @@ __kernel void m00120_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -744,7 +744,7 @@ __kernel void m00120_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00120_a3-pure.cl b/OpenCL/m00120_a3-pure.cl index 609f3936d..5c94c6e43 100644 --- a/OpenCL/m00120_a3-pure.cl +++ b/OpenCL/m00120_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00120_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m00120_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00130_a0-optimized.cl b/OpenCL/m00130_a0-optimized.cl index 5f6cfe285..87db1f2f1 100644 --- a/OpenCL/m00130_a0-optimized.cl +++ b/OpenCL/m00130_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00130_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -300,7 +300,7 @@ __kernel void m00130_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00130_a3-optimized.cl b/OpenCL/m00130_a3-optimized.cl index 7a60c4721..c76b6ccee 100644 --- a/OpenCL/m00130_a3-optimized.cl +++ b/OpenCL/m00130_a3-optimized.cl @@ -597,7 +597,7 @@ __kernel void m00130_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -635,7 +635,7 @@ __kernel void m00130_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -673,7 +673,7 @@ __kernel void m00130_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -711,7 +711,7 @@ __kernel void m00130_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -749,7 +749,7 @@ __kernel void m00130_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -787,7 +787,7 @@ __kernel void m00130_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00130_a3-pure.cl b/OpenCL/m00130_a3-pure.cl index 2549e284c..d51b73f9c 100644 --- a/OpenCL/m00130_a3-pure.cl +++ b/OpenCL/m00130_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00130_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m00130_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00140_a0-optimized.cl b/OpenCL/m00140_a0-optimized.cl index 0e9da7cb9..18143986c 100644 --- a/OpenCL/m00140_a0-optimized.cl +++ b/OpenCL/m00140_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00140_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -280,7 +280,7 @@ __kernel void m00140_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00140_a3-optimized.cl b/OpenCL/m00140_a3-optimized.cl index 285ae279c..dc87214b3 100644 --- a/OpenCL/m00140_a3-optimized.cl +++ b/OpenCL/m00140_a3-optimized.cl @@ -509,7 +509,7 @@ __kernel void m00140_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -556,7 +556,7 @@ __kernel void m00140_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -603,7 +603,7 @@ __kernel void m00140_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -650,7 +650,7 @@ __kernel void m00140_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -697,7 +697,7 @@ __kernel void m00140_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -744,7 +744,7 @@ __kernel void m00140_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00140_a3-pure.cl b/OpenCL/m00140_a3-pure.cl index bbe21ef22..af6886b3c 100644 --- a/OpenCL/m00140_a3-pure.cl +++ b/OpenCL/m00140_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00140_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m00140_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00150_a0-optimized.cl b/OpenCL/m00150_a0-optimized.cl index 21e54936b..9ab7c2413 100644 --- a/OpenCL/m00150_a0-optimized.cl +++ b/OpenCL/m00150_a0-optimized.cl @@ -132,7 +132,7 @@ __kernel void m00150_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -254,7 +254,7 @@ __kernel void m00150_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00150_a1-pure.cl b/OpenCL/m00150_a1-pure.cl index 8c31203d0..67faaea8b 100644 --- a/OpenCL/m00150_a1-pure.cl +++ b/OpenCL/m00150_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m00150_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -118,7 +118,7 @@ __kernel void m00150_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m00150_a3-optimized.cl b/OpenCL/m00150_a3-optimized.cl index 7c4565928..178bccc70 100644 --- a/OpenCL/m00150_a3-optimized.cl +++ b/OpenCL/m00150_a3-optimized.cl @@ -362,7 +362,7 @@ __kernel void m00150_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -409,7 +409,7 @@ __kernel void m00150_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -456,7 +456,7 @@ __kernel void m00150_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -503,7 +503,7 @@ __kernel void m00150_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -550,7 +550,7 @@ __kernel void m00150_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -597,7 +597,7 @@ __kernel void m00150_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00150_a3-pure.cl b/OpenCL/m00150_a3-pure.cl index 0769e56c6..9cd454048 100644 --- a/OpenCL/m00150_a3-pure.cl +++ b/OpenCL/m00150_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00150_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -104,7 +104,7 @@ __kernel void m00150_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00160_a0-optimized.cl b/OpenCL/m00160_a0-optimized.cl index d07db4581..414ee2446 100644 --- a/OpenCL/m00160_a0-optimized.cl +++ b/OpenCL/m00160_a0-optimized.cl @@ -132,7 +132,7 @@ __kernel void m00160_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -269,7 +269,7 @@ __kernel void m00160_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00160_a1-pure.cl b/OpenCL/m00160_a1-pure.cl index aac58a349..cbdb4c87a 100644 --- a/OpenCL/m00160_a1-pure.cl +++ b/OpenCL/m00160_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m00160_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -120,7 +120,7 @@ __kernel void m00160_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m00160_a3-optimized.cl b/OpenCL/m00160_a3-optimized.cl index fef8cac8f..a4626955e 100644 --- a/OpenCL/m00160_a3-optimized.cl +++ b/OpenCL/m00160_a3-optimized.cl @@ -362,7 +362,7 @@ __kernel void m00160_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -409,7 +409,7 @@ __kernel void m00160_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -456,7 +456,7 @@ __kernel void m00160_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -503,7 +503,7 @@ __kernel void m00160_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -550,7 +550,7 @@ __kernel void m00160_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -597,7 +597,7 @@ __kernel void m00160_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00160_a3-pure.cl b/OpenCL/m00160_a3-pure.cl index f86eb66a7..859ac47c1 100644 --- a/OpenCL/m00160_a3-pure.cl +++ b/OpenCL/m00160_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00160_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m00160_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00200_a0-optimized.cl b/OpenCL/m00200_a0-optimized.cl index c34042243..64afb2560 100644 --- a/OpenCL/m00200_a0-optimized.cl +++ b/OpenCL/m00200_a0-optimized.cl @@ -43,7 +43,7 @@ __kernel void m00200_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -169,7 +169,7 @@ __kernel void m00200_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m00200_a3-optimized.cl b/OpenCL/m00200_a3-optimized.cl index ee4b91ec6..5a74ac844 100644 --- a/OpenCL/m00200_a3-optimized.cl +++ b/OpenCL/m00200_a3-optimized.cl @@ -422,7 +422,7 @@ __kernel void m00200_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -460,7 +460,7 @@ __kernel void m00200_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -498,7 +498,7 @@ __kernel void m00200_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -536,7 +536,7 @@ __kernel void m00200_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -574,7 +574,7 @@ __kernel void m00200_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -612,7 +612,7 @@ __kernel void m00200_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00300_a0-optimized.cl b/OpenCL/m00300_a0-optimized.cl index 678ae16c6..67b53bbfb 100644 --- a/OpenCL/m00300_a0-optimized.cl +++ b/OpenCL/m00300_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00300_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -347,7 +347,7 @@ __kernel void m00300_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m00300_a3-optimized.cl b/OpenCL/m00300_a3-optimized.cl index b16787eb1..d934387b5 100644 --- a/OpenCL/m00300_a3-optimized.cl +++ b/OpenCL/m00300_a3-optimized.cl @@ -800,7 +800,7 @@ __kernel void m00300_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -838,7 +838,7 @@ __kernel void m00300_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -876,7 +876,7 @@ __kernel void m00300_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -914,7 +914,7 @@ __kernel void m00300_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -952,7 +952,7 @@ __kernel void m00300_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -990,7 +990,7 @@ __kernel void m00300_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00300_a3-pure.cl b/OpenCL/m00300_a3-pure.cl index 35242eda1..fb20cc9da 100644 --- a/OpenCL/m00300_a3-pure.cl +++ b/OpenCL/m00300_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00300_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -118,7 +118,7 @@ __kernel void m00300_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m00400-optimized.cl b/OpenCL/m00400-optimized.cl index d7933ab72..ffb51984b 100644 --- a/OpenCL/m00400-optimized.cl +++ b/OpenCL/m00400-optimized.cl @@ -47,7 +47,7 @@ __kernel void m00400_init (KERN_ATTR_TMPS (phpass_tmp_t)) w2[2] = 0; w2[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m00400-pure.cl b/OpenCL/m00400-pure.cl index 65430e0bd..85515b503 100644 --- a/OpenCL/m00400-pure.cl +++ b/OpenCL/m00400-pure.cl @@ -67,7 +67,7 @@ __kernel void m00400_loop (KERN_ATTR_TMPS (phpass_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m00500-optimized.cl b/OpenCL/m00500-optimized.cl index 6ebc15113..d28a3994c 100644 --- a/OpenCL/m00500-optimized.cl +++ b/OpenCL/m00500-optimized.cl @@ -667,7 +667,7 @@ __kernel void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) w0[2] = pws[gid].i[2]; w0[3] = pws[gid].i[3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -830,7 +830,7 @@ __kernel void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) w0[2] = pws[gid].i[2]; w0[3] = pws[gid].i[3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; u32 w0_x80[4]; diff --git a/OpenCL/m00500-pure.cl b/OpenCL/m00500-pure.cl index bc4816999..9474378bb 100644 --- a/OpenCL/m00500-pure.cl +++ b/OpenCL/m00500-pure.cl @@ -31,7 +31,7 @@ __kernel void m00500_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -137,7 +137,7 @@ __kernel void m00500_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m00600_a0-optimized.cl b/OpenCL/m00600_a0-optimized.cl index 9b7fa93e2..f5991d1b2 100644 --- a/OpenCL/m00600_a0-optimized.cl +++ b/OpenCL/m00600_a0-optimized.cl @@ -142,7 +142,7 @@ __kernel void m00600_m04 (KERN_ATTR_RULES_ESALT (blake2_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; u64 tmp_h[8]; u64 tmp_t[2]; @@ -250,7 +250,7 @@ __kernel void m00600_s04 (KERN_ATTR_RULES_ESALT (blake2_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; u64 tmp_h[8]; u64 tmp_t[2]; diff --git a/OpenCL/m00900_a0-optimized.cl b/OpenCL/m00900_a0-optimized.cl index 6c5722557..7774ce314 100644 --- a/OpenCL/m00900_a0-optimized.cl +++ b/OpenCL/m00900_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m00900_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -158,7 +158,7 @@ __kernel void m00900_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m00900_a3-optimized.cl b/OpenCL/m00900_a3-optimized.cl index fc13168c7..39074e9ba 100644 --- a/OpenCL/m00900_a3-optimized.cl +++ b/OpenCL/m00900_a3-optimized.cl @@ -380,7 +380,7 @@ __kernel void m00900_m04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -418,7 +418,7 @@ __kernel void m00900_m08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -456,7 +456,7 @@ __kernel void m00900_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -494,7 +494,7 @@ __kernel void m00900_s04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -532,7 +532,7 @@ __kernel void m00900_s08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -570,7 +570,7 @@ __kernel void m00900_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m00900_a3-pure.cl b/OpenCL/m00900_a3-pure.cl index 8a7662c92..dcf0aa77a 100644 --- a/OpenCL/m00900_a3-pure.cl +++ b/OpenCL/m00900_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m00900_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m00900_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01000_a0-optimized.cl b/OpenCL/m01000_a0-optimized.cl index b1e0a3455..4faf305dc 100644 --- a/OpenCL/m01000_a0-optimized.cl +++ b/OpenCL/m01000_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m01000_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -161,7 +161,7 @@ __kernel void m01000_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m01000_a3-optimized.cl b/OpenCL/m01000_a3-optimized.cl index 79f0d6695..9e0777bcc 100644 --- a/OpenCL/m01000_a3-optimized.cl +++ b/OpenCL/m01000_a3-optimized.cl @@ -380,7 +380,7 @@ __kernel void m01000_m04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -418,7 +418,7 @@ __kernel void m01000_m08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -456,7 +456,7 @@ __kernel void m01000_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -494,7 +494,7 @@ __kernel void m01000_s04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -532,7 +532,7 @@ __kernel void m01000_s08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -570,7 +570,7 @@ __kernel void m01000_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01000_a3-pure.cl b/OpenCL/m01000_a3-pure.cl index 95bce5431..3afa893ce 100644 --- a/OpenCL/m01000_a3-pure.cl +++ b/OpenCL/m01000_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01000_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m01000_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01100_a0-optimized.cl b/OpenCL/m01100_a0-optimized.cl index 53d8debfd..47d0e419d 100644 --- a/OpenCL/m01100_a0-optimized.cl +++ b/OpenCL/m01100_a0-optimized.cl @@ -35,7 +35,7 @@ __kernel void m01100_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -254,7 +254,7 @@ __kernel void m01100_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01100_a3-optimized.cl b/OpenCL/m01100_a3-optimized.cl index fc7b0f16d..3feba0808 100644 --- a/OpenCL/m01100_a3-optimized.cl +++ b/OpenCL/m01100_a3-optimized.cl @@ -525,7 +525,7 @@ __kernel void m01100_m04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -579,7 +579,7 @@ __kernel void m01100_m08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -637,7 +637,7 @@ __kernel void m01100_s04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -691,7 +691,7 @@ __kernel void m01100_s08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01100_a3-pure.cl b/OpenCL/m01100_a3-pure.cl index 79f261a0a..ce81721a2 100644 --- a/OpenCL/m01100_a3-pure.cl +++ b/OpenCL/m01100_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01100_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -119,7 +119,7 @@ __kernel void m01100_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01300_a0-optimized.cl b/OpenCL/m01300_a0-optimized.cl index cf9ccbd4b..82421c1b3 100644 --- a/OpenCL/m01300_a0-optimized.cl +++ b/OpenCL/m01300_a0-optimized.cl @@ -55,7 +55,7 @@ __kernel void m01300_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -210,7 +210,7 @@ __kernel void m01300_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m01300_a3-optimized.cl b/OpenCL/m01300_a3-optimized.cl index 889765692..409a176bc 100644 --- a/OpenCL/m01300_a3-optimized.cl +++ b/OpenCL/m01300_a3-optimized.cl @@ -323,7 +323,7 @@ __kernel void m01300_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -361,7 +361,7 @@ __kernel void m01300_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -399,7 +399,7 @@ __kernel void m01300_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -437,7 +437,7 @@ __kernel void m01300_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -475,7 +475,7 @@ __kernel void m01300_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -513,7 +513,7 @@ __kernel void m01300_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01300_a3-pure.cl b/OpenCL/m01300_a3-pure.cl index 7609a65d2..cb54601f8 100644 --- a/OpenCL/m01300_a3-pure.cl +++ b/OpenCL/m01300_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01300_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m01300_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01400_a0-optimized.cl b/OpenCL/m01400_a0-optimized.cl index 6ff70455b..bd8063550 100644 --- a/OpenCL/m01400_a0-optimized.cl +++ b/OpenCL/m01400_a0-optimized.cl @@ -56,7 +56,7 @@ __kernel void m01400_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -211,7 +211,7 @@ __kernel void m01400_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m01400_a3-optimized.cl b/OpenCL/m01400_a3-optimized.cl index 3fc256a8f..62f63252d 100644 --- a/OpenCL/m01400_a3-optimized.cl +++ b/OpenCL/m01400_a3-optimized.cl @@ -326,7 +326,7 @@ __kernel void m01400_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -364,7 +364,7 @@ __kernel void m01400_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -402,7 +402,7 @@ __kernel void m01400_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -440,7 +440,7 @@ __kernel void m01400_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -478,7 +478,7 @@ __kernel void m01400_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -516,7 +516,7 @@ __kernel void m01400_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01400_a3-pure.cl b/OpenCL/m01400_a3-pure.cl index 288f5fd06..b1c8b24ae 100644 --- a/OpenCL/m01400_a3-pure.cl +++ b/OpenCL/m01400_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01400_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m01400_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01410_a0-optimized.cl b/OpenCL/m01410_a0-optimized.cl index cc47db24e..f1e3d51a5 100644 --- a/OpenCL/m01410_a0-optimized.cl +++ b/OpenCL/m01410_a0-optimized.cl @@ -56,7 +56,7 @@ __kernel void m01410_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -284,7 +284,7 @@ __kernel void m01410_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01410_a3-optimized.cl b/OpenCL/m01410_a3-optimized.cl index 25459ce40..c87e7988d 100644 --- a/OpenCL/m01410_a3-optimized.cl +++ b/OpenCL/m01410_a3-optimized.cl @@ -377,7 +377,7 @@ __kernel void m01410_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -415,7 +415,7 @@ __kernel void m01410_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -453,7 +453,7 @@ __kernel void m01410_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -491,7 +491,7 @@ __kernel void m01410_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -529,7 +529,7 @@ __kernel void m01410_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -567,7 +567,7 @@ __kernel void m01410_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01410_a3-pure.cl b/OpenCL/m01410_a3-pure.cl index 571c1c961..212009382 100644 --- a/OpenCL/m01410_a3-pure.cl +++ b/OpenCL/m01410_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01410_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m01410_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01420_a0-optimized.cl b/OpenCL/m01420_a0-optimized.cl index 64a548c43..ad7855d3a 100644 --- a/OpenCL/m01420_a0-optimized.cl +++ b/OpenCL/m01420_a0-optimized.cl @@ -56,7 +56,7 @@ __kernel void m01420_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -264,7 +264,7 @@ __kernel void m01420_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01420_a3-optimized.cl b/OpenCL/m01420_a3-optimized.cl index 83065460d..1848d5e3a 100644 --- a/OpenCL/m01420_a3-optimized.cl +++ b/OpenCL/m01420_a3-optimized.cl @@ -485,7 +485,7 @@ __kernel void m01420_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -532,7 +532,7 @@ __kernel void m01420_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -579,7 +579,7 @@ __kernel void m01420_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -626,7 +626,7 @@ __kernel void m01420_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -673,7 +673,7 @@ __kernel void m01420_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -720,7 +720,7 @@ __kernel void m01420_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01420_a3-pure.cl b/OpenCL/m01420_a3-pure.cl index 962c71a7b..b3e8c9bfc 100644 --- a/OpenCL/m01420_a3-pure.cl +++ b/OpenCL/m01420_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01420_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m01420_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01430_a0-optimized.cl b/OpenCL/m01430_a0-optimized.cl index 1f52db0db..82b02abf2 100644 --- a/OpenCL/m01430_a0-optimized.cl +++ b/OpenCL/m01430_a0-optimized.cl @@ -56,7 +56,7 @@ __kernel void m01430_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -289,7 +289,7 @@ __kernel void m01430_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01430_a3-optimized.cl b/OpenCL/m01430_a3-optimized.cl index 129855a68..1cedd82ca 100644 --- a/OpenCL/m01430_a3-optimized.cl +++ b/OpenCL/m01430_a3-optimized.cl @@ -377,7 +377,7 @@ __kernel void m01430_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -415,7 +415,7 @@ __kernel void m01430_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -453,7 +453,7 @@ __kernel void m01430_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -491,7 +491,7 @@ __kernel void m01430_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -529,7 +529,7 @@ __kernel void m01430_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -567,7 +567,7 @@ __kernel void m01430_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01430_a3-pure.cl b/OpenCL/m01430_a3-pure.cl index 6b0a05a50..5a5c7d74b 100644 --- a/OpenCL/m01430_a3-pure.cl +++ b/OpenCL/m01430_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01430_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m01430_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01440_a0-optimized.cl b/OpenCL/m01440_a0-optimized.cl index a8321b84d..dc74d0e28 100644 --- a/OpenCL/m01440_a0-optimized.cl +++ b/OpenCL/m01440_a0-optimized.cl @@ -56,7 +56,7 @@ __kernel void m01440_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -269,7 +269,7 @@ __kernel void m01440_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01440_a3-optimized.cl b/OpenCL/m01440_a3-optimized.cl index c0e827537..09f598630 100644 --- a/OpenCL/m01440_a3-optimized.cl +++ b/OpenCL/m01440_a3-optimized.cl @@ -485,7 +485,7 @@ __kernel void m01440_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -532,7 +532,7 @@ __kernel void m01440_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -579,7 +579,7 @@ __kernel void m01440_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -626,7 +626,7 @@ __kernel void m01440_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -673,7 +673,7 @@ __kernel void m01440_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -720,7 +720,7 @@ __kernel void m01440_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01440_a3-pure.cl b/OpenCL/m01440_a3-pure.cl index 37cbf1fc4..08cf54de6 100644 --- a/OpenCL/m01440_a3-pure.cl +++ b/OpenCL/m01440_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01440_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m01440_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01450_a0-optimized.cl b/OpenCL/m01450_a0-optimized.cl index dd51c278e..d44f19e60 100644 --- a/OpenCL/m01450_a0-optimized.cl +++ b/OpenCL/m01450_a0-optimized.cl @@ -144,7 +144,7 @@ __kernel void m01450_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -266,7 +266,7 @@ __kernel void m01450_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01450_a1-pure.cl b/OpenCL/m01450_a1-pure.cl index ffae634c1..6d4c42f53 100644 --- a/OpenCL/m01450_a1-pure.cl +++ b/OpenCL/m01450_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m01450_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -118,7 +118,7 @@ __kernel void m01450_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m01450_a3-optimized.cl b/OpenCL/m01450_a3-optimized.cl index 30fb8262f..fcb346593 100644 --- a/OpenCL/m01450_a3-optimized.cl +++ b/OpenCL/m01450_a3-optimized.cl @@ -374,7 +374,7 @@ __kernel void m01450_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -421,7 +421,7 @@ __kernel void m01450_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -468,7 +468,7 @@ __kernel void m01450_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -515,7 +515,7 @@ __kernel void m01450_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -562,7 +562,7 @@ __kernel void m01450_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -609,7 +609,7 @@ __kernel void m01450_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01450_a3-pure.cl b/OpenCL/m01450_a3-pure.cl index fc55918a6..f6cc99b7f 100644 --- a/OpenCL/m01450_a3-pure.cl +++ b/OpenCL/m01450_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01450_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -104,7 +104,7 @@ __kernel void m01450_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01460_a0-optimized.cl b/OpenCL/m01460_a0-optimized.cl index c28034b98..63008000c 100644 --- a/OpenCL/m01460_a0-optimized.cl +++ b/OpenCL/m01460_a0-optimized.cl @@ -144,7 +144,7 @@ __kernel void m01460_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -281,7 +281,7 @@ __kernel void m01460_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01460_a1-pure.cl b/OpenCL/m01460_a1-pure.cl index 9264121f1..11894a743 100644 --- a/OpenCL/m01460_a1-pure.cl +++ b/OpenCL/m01460_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m01460_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -120,7 +120,7 @@ __kernel void m01460_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m01460_a3-optimized.cl b/OpenCL/m01460_a3-optimized.cl index e1bfe287a..8378faf41 100644 --- a/OpenCL/m01460_a3-optimized.cl +++ b/OpenCL/m01460_a3-optimized.cl @@ -374,7 +374,7 @@ __kernel void m01460_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -421,7 +421,7 @@ __kernel void m01460_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -468,7 +468,7 @@ __kernel void m01460_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -515,7 +515,7 @@ __kernel void m01460_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -562,7 +562,7 @@ __kernel void m01460_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -609,7 +609,7 @@ __kernel void m01460_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01460_a3-pure.cl b/OpenCL/m01460_a3-pure.cl index 22490cd2b..bd7da0fed 100644 --- a/OpenCL/m01460_a3-pure.cl +++ b/OpenCL/m01460_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01460_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m01460_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01600-optimized.cl b/OpenCL/m01600-optimized.cl index 334fd1c09..e0927a056 100644 --- a/OpenCL/m01600-optimized.cl +++ b/OpenCL/m01600-optimized.cl @@ -682,7 +682,7 @@ __kernel void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) w0[2] = pws[gid].i[2]; w0[3] = pws[gid].i[3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -845,7 +845,7 @@ __kernel void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) w0[2] = pws[gid].i[2]; w0[3] = pws[gid].i[3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; u32 w0_x80[4]; diff --git a/OpenCL/m01600-pure.cl b/OpenCL/m01600-pure.cl index 1963842af..60eeb5e99 100644 --- a/OpenCL/m01600-pure.cl +++ b/OpenCL/m01600-pure.cl @@ -35,7 +35,7 @@ __kernel void m01600_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -142,7 +142,7 @@ __kernel void m01600_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m01700_a0-optimized.cl b/OpenCL/m01700_a0-optimized.cl index bbd2c581b..7b4adc7d9 100644 --- a/OpenCL/m01700_a0-optimized.cl +++ b/OpenCL/m01700_a0-optimized.cl @@ -165,7 +165,7 @@ __kernel void m01700_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -266,7 +266,7 @@ __kernel void m01700_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m01700_a3-optimized.cl b/OpenCL/m01700_a3-optimized.cl index 73c537eb8..4e18ac6e8 100644 --- a/OpenCL/m01700_a3-optimized.cl +++ b/OpenCL/m01700_a3-optimized.cl @@ -306,7 +306,7 @@ __kernel void m01700_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -344,7 +344,7 @@ __kernel void m01700_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -382,7 +382,7 @@ __kernel void m01700_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -420,7 +420,7 @@ __kernel void m01700_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -458,7 +458,7 @@ __kernel void m01700_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -496,7 +496,7 @@ __kernel void m01700_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01700_a3-pure.cl b/OpenCL/m01700_a3-pure.cl index 4ba18f4f7..fc1cbf059 100644 --- a/OpenCL/m01700_a3-pure.cl +++ b/OpenCL/m01700_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01700_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m01700_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01710_a0-optimized.cl b/OpenCL/m01710_a0-optimized.cl index dc007e819..7cfe0eb24 100644 --- a/OpenCL/m01710_a0-optimized.cl +++ b/OpenCL/m01710_a0-optimized.cl @@ -165,7 +165,7 @@ __kernel void m01710_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -339,7 +339,7 @@ __kernel void m01710_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01710_a3-optimized.cl b/OpenCL/m01710_a3-optimized.cl index 0a0e466d1..b212b4d6a 100644 --- a/OpenCL/m01710_a3-optimized.cl +++ b/OpenCL/m01710_a3-optimized.cl @@ -357,7 +357,7 @@ __kernel void m01710_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -395,7 +395,7 @@ __kernel void m01710_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -433,7 +433,7 @@ __kernel void m01710_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -471,7 +471,7 @@ __kernel void m01710_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -509,7 +509,7 @@ __kernel void m01710_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -547,7 +547,7 @@ __kernel void m01710_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01710_a3-pure.cl b/OpenCL/m01710_a3-pure.cl index 5c427111f..f9a95b19a 100644 --- a/OpenCL/m01710_a3-pure.cl +++ b/OpenCL/m01710_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01710_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m01710_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01720_a0-optimized.cl b/OpenCL/m01720_a0-optimized.cl index a232e5770..69428a625 100644 --- a/OpenCL/m01720_a0-optimized.cl +++ b/OpenCL/m01720_a0-optimized.cl @@ -165,7 +165,7 @@ __kernel void m01720_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -319,7 +319,7 @@ __kernel void m01720_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01720_a3-optimized.cl b/OpenCL/m01720_a3-optimized.cl index 14a75a61a..04a2de8b9 100644 --- a/OpenCL/m01720_a3-optimized.cl +++ b/OpenCL/m01720_a3-optimized.cl @@ -421,7 +421,7 @@ __kernel void m01720_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -468,7 +468,7 @@ __kernel void m01720_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -515,7 +515,7 @@ __kernel void m01720_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -562,7 +562,7 @@ __kernel void m01720_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -609,7 +609,7 @@ __kernel void m01720_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -656,7 +656,7 @@ __kernel void m01720_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01720_a3-pure.cl b/OpenCL/m01720_a3-pure.cl index 7b0890c73..445dcf1cf 100644 --- a/OpenCL/m01720_a3-pure.cl +++ b/OpenCL/m01720_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01720_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m01720_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01730_a0-optimized.cl b/OpenCL/m01730_a0-optimized.cl index 9e57649d8..f5d297e93 100644 --- a/OpenCL/m01730_a0-optimized.cl +++ b/OpenCL/m01730_a0-optimized.cl @@ -165,7 +165,7 @@ __kernel void m01730_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -344,7 +344,7 @@ __kernel void m01730_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01730_a3-optimized.cl b/OpenCL/m01730_a3-optimized.cl index 7da71d6a1..2a6785fc2 100644 --- a/OpenCL/m01730_a3-optimized.cl +++ b/OpenCL/m01730_a3-optimized.cl @@ -357,7 +357,7 @@ __kernel void m01730_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -395,7 +395,7 @@ __kernel void m01730_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -433,7 +433,7 @@ __kernel void m01730_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -471,7 +471,7 @@ __kernel void m01730_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -509,7 +509,7 @@ __kernel void m01730_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -547,7 +547,7 @@ __kernel void m01730_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01730_a3-pure.cl b/OpenCL/m01730_a3-pure.cl index 000de2839..c924f2ce5 100644 --- a/OpenCL/m01730_a3-pure.cl +++ b/OpenCL/m01730_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01730_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m01730_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01740_a0-optimized.cl b/OpenCL/m01740_a0-optimized.cl index abad8716c..c3954184d 100644 --- a/OpenCL/m01740_a0-optimized.cl +++ b/OpenCL/m01740_a0-optimized.cl @@ -165,7 +165,7 @@ __kernel void m01740_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -324,7 +324,7 @@ __kernel void m01740_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01740_a3-optimized.cl b/OpenCL/m01740_a3-optimized.cl index 4d3e49e4e..8132d07f9 100644 --- a/OpenCL/m01740_a3-optimized.cl +++ b/OpenCL/m01740_a3-optimized.cl @@ -421,7 +421,7 @@ __kernel void m01740_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -468,7 +468,7 @@ __kernel void m01740_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -515,7 +515,7 @@ __kernel void m01740_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -562,7 +562,7 @@ __kernel void m01740_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -609,7 +609,7 @@ __kernel void m01740_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -656,7 +656,7 @@ __kernel void m01740_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01740_a3-pure.cl b/OpenCL/m01740_a3-pure.cl index 0094fcd55..88101f3d9 100644 --- a/OpenCL/m01740_a3-pure.cl +++ b/OpenCL/m01740_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01740_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m01740_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01750_a0-optimized.cl b/OpenCL/m01750_a0-optimized.cl index 4bb9e6450..c4134bcf6 100644 --- a/OpenCL/m01750_a0-optimized.cl +++ b/OpenCL/m01750_a0-optimized.cl @@ -218,7 +218,7 @@ __kernel void m01750_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -345,7 +345,7 @@ __kernel void m01750_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01750_a1-pure.cl b/OpenCL/m01750_a1-pure.cl index 13de99173..8b5ae3547 100644 --- a/OpenCL/m01750_a1-pure.cl +++ b/OpenCL/m01750_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m01750_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -118,7 +118,7 @@ __kernel void m01750_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m01750_a3-optimized.cl b/OpenCL/m01750_a3-optimized.cl index 2772eac20..6ab12853d 100644 --- a/OpenCL/m01750_a3-optimized.cl +++ b/OpenCL/m01750_a3-optimized.cl @@ -458,7 +458,7 @@ __kernel void m01750_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -505,7 +505,7 @@ __kernel void m01750_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -552,7 +552,7 @@ __kernel void m01750_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -599,7 +599,7 @@ __kernel void m01750_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -646,7 +646,7 @@ __kernel void m01750_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -693,7 +693,7 @@ __kernel void m01750_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01750_a3-pure.cl b/OpenCL/m01750_a3-pure.cl index ee3e7c9ed..e58c35aa9 100644 --- a/OpenCL/m01750_a3-pure.cl +++ b/OpenCL/m01750_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01750_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -104,7 +104,7 @@ __kernel void m01750_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01760_a0-optimized.cl b/OpenCL/m01760_a0-optimized.cl index a11a63a81..d218b2303 100644 --- a/OpenCL/m01760_a0-optimized.cl +++ b/OpenCL/m01760_a0-optimized.cl @@ -218,7 +218,7 @@ __kernel void m01760_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -360,7 +360,7 @@ __kernel void m01760_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m01760_a1-pure.cl b/OpenCL/m01760_a1-pure.cl index d99b95883..84c2d8737 100644 --- a/OpenCL/m01760_a1-pure.cl +++ b/OpenCL/m01760_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m01760_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -120,7 +120,7 @@ __kernel void m01760_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m01760_a3-optimized.cl b/OpenCL/m01760_a3-optimized.cl index ff43b4a57..576fa9eb4 100644 --- a/OpenCL/m01760_a3-optimized.cl +++ b/OpenCL/m01760_a3-optimized.cl @@ -458,7 +458,7 @@ __kernel void m01760_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -505,7 +505,7 @@ __kernel void m01760_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -552,7 +552,7 @@ __kernel void m01760_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -599,7 +599,7 @@ __kernel void m01760_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -646,7 +646,7 @@ __kernel void m01760_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -693,7 +693,7 @@ __kernel void m01760_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m01760_a3-pure.cl b/OpenCL/m01760_a3-pure.cl index ac07d9b22..4f1d309ae 100644 --- a/OpenCL/m01760_a3-pure.cl +++ b/OpenCL/m01760_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m01760_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m01760_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m01800-optimized.cl b/OpenCL/m01800-optimized.cl index 076b6f061..15a9d6fd9 100644 --- a/OpenCL/m01800-optimized.cl +++ b/OpenCL/m01800-optimized.cl @@ -173,7 +173,7 @@ __kernel void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) w0[2] = pws[gid].i[2]; w0[3] = pws[gid].i[3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -300,7 +300,7 @@ __kernel void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) l_p_bytes0[0] = tmps[gid].l_p_bytes[0]; l_p_bytes0[1] = tmps[gid].l_p_bytes[1]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; u64 l_s_bytes0[2]; diff --git a/OpenCL/m01800-pure.cl b/OpenCL/m01800-pure.cl index c31be393f..695a96573 100644 --- a/OpenCL/m01800-pure.cl +++ b/OpenCL/m01800-pure.cl @@ -27,7 +27,7 @@ __kernel void m01800_init (KERN_ATTR_TMPS (sha512crypt_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -308,7 +308,7 @@ __kernel void m01800_loop (KERN_ATTR_TMPS (sha512crypt_tmp_t)) if (gid >= gid_max) return; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; const u32 salt_len = salt_bufs[salt_pos].salt_len; diff --git a/OpenCL/m02400_a0-optimized.cl b/OpenCL/m02400_a0-optimized.cl index 614aaec4d..3c5451456 100644 --- a/OpenCL/m02400_a0-optimized.cl +++ b/OpenCL/m02400_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m02400_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -211,7 +211,7 @@ __kernel void m02400_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m02400_a3-optimized.cl b/OpenCL/m02400_a3-optimized.cl index 754b85dd9..d3f7f604b 100644 --- a/OpenCL/m02400_a3-optimized.cl +++ b/OpenCL/m02400_a3-optimized.cl @@ -486,7 +486,7 @@ __kernel void m02400_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -532,7 +532,7 @@ __kernel void m02400_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m02410_a0-optimized.cl b/OpenCL/m02410_a0-optimized.cl index 7c6d3919e..325ad9d36 100644 --- a/OpenCL/m02410_a0-optimized.cl +++ b/OpenCL/m02410_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m02410_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -290,7 +290,7 @@ __kernel void m02410_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m02410_a3-optimized.cl b/OpenCL/m02410_a3-optimized.cl index 727d5765b..4c6dadf8e 100644 --- a/OpenCL/m02410_a3-optimized.cl +++ b/OpenCL/m02410_a3-optimized.cl @@ -584,7 +584,7 @@ __kernel void m02410_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -630,7 +630,7 @@ __kernel void m02410_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m02610_a0-optimized.cl b/OpenCL/m02610_a0-optimized.cl index 32d0c524f..77bc266e3 100644 --- a/OpenCL/m02610_a0-optimized.cl +++ b/OpenCL/m02610_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m02610_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -355,7 +355,7 @@ __kernel void m02610_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m02610_a3-optimized.cl b/OpenCL/m02610_a3-optimized.cl index 8dc2766d9..133b1c9ed 100644 --- a/OpenCL/m02610_a3-optimized.cl +++ b/OpenCL/m02610_a3-optimized.cl @@ -598,7 +598,7 @@ __kernel void m02610_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -668,7 +668,7 @@ __kernel void m02610_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -738,7 +738,7 @@ __kernel void m02610_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -808,7 +808,7 @@ __kernel void m02610_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -878,7 +878,7 @@ __kernel void m02610_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -948,7 +948,7 @@ __kernel void m02610_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table diff --git a/OpenCL/m02610_a3-pure.cl b/OpenCL/m02610_a3-pure.cl index 8cf4561a5..517cc5567 100644 --- a/OpenCL/m02610_a3-pure.cl +++ b/OpenCL/m02610_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m02610_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -184,7 +184,7 @@ __kernel void m02610_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m02710_a0-optimized.cl b/OpenCL/m02710_a0-optimized.cl index 4d3ffc3da..739d057bf 100644 --- a/OpenCL/m02710_a0-optimized.cl +++ b/OpenCL/m02710_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m02710_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -440,7 +440,7 @@ __kernel void m02710_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m02710_a3-optimized.cl b/OpenCL/m02710_a3-optimized.cl index 38fc22edf..13ef1b7bd 100644 --- a/OpenCL/m02710_a3-optimized.cl +++ b/OpenCL/m02710_a3-optimized.cl @@ -767,7 +767,7 @@ __kernel void m02710_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -837,7 +837,7 @@ __kernel void m02710_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -907,7 +907,7 @@ __kernel void m02710_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -977,7 +977,7 @@ __kernel void m02710_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1047,7 +1047,7 @@ __kernel void m02710_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1117,7 +1117,7 @@ __kernel void m02710_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table diff --git a/OpenCL/m02810_a0-optimized.cl b/OpenCL/m02810_a0-optimized.cl index d227a77f4..fd13b186c 100644 --- a/OpenCL/m02810_a0-optimized.cl +++ b/OpenCL/m02810_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m02810_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -441,7 +441,7 @@ __kernel void m02810_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m02810_a3-optimized.cl b/OpenCL/m02810_a3-optimized.cl index c3fa66316..649e637a4 100644 --- a/OpenCL/m02810_a3-optimized.cl +++ b/OpenCL/m02810_a3-optimized.cl @@ -769,7 +769,7 @@ __kernel void m02810_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -839,7 +839,7 @@ __kernel void m02810_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -909,7 +909,7 @@ __kernel void m02810_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -979,7 +979,7 @@ __kernel void m02810_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1049,7 +1049,7 @@ __kernel void m02810_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1119,7 +1119,7 @@ __kernel void m02810_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table diff --git a/OpenCL/m02810_a3-pure.cl b/OpenCL/m02810_a3-pure.cl index c7955844f..1c94d7b90 100644 --- a/OpenCL/m02810_a3-pure.cl +++ b/OpenCL/m02810_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m02810_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -207,7 +207,7 @@ __kernel void m02810_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m03100_a0-optimized.cl b/OpenCL/m03100_a0-optimized.cl index 10d65d663..10dbe10a9 100644 --- a/OpenCL/m03100_a0-optimized.cl +++ b/OpenCL/m03100_a0-optimized.cl @@ -545,7 +545,7 @@ __kernel void m03100_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -768,7 +768,7 @@ __kernel void m03100_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m03100_a3-optimized.cl b/OpenCL/m03100_a3-optimized.cl index b7e4a40d7..bdbd06636 100644 --- a/OpenCL/m03100_a3-optimized.cl +++ b/OpenCL/m03100_a3-optimized.cl @@ -891,7 +891,7 @@ __kernel void m03100_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * sbox, kbox @@ -965,7 +965,7 @@ __kernel void m03100_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * sbox, kbox @@ -1043,7 +1043,7 @@ __kernel void m03100_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * sbox, kbox @@ -1117,7 +1117,7 @@ __kernel void m03100_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * sbox, kbox diff --git a/OpenCL/m03200-pure.cl b/OpenCL/m03200-pure.cl index 92b2dabfb..35def55bf 100644 --- a/OpenCL/m03200-pure.cl +++ b/OpenCL/m03200-pure.cl @@ -359,7 +359,7 @@ __kernel void __attribute__((reqd_work_group_size(8, 1, 1))) m03200_init (KERN_A if (gid >= gid_max) return; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[18]; diff --git a/OpenCL/m03710_a0-optimized.cl b/OpenCL/m03710_a0-optimized.cl index dddf1a572..9fe959a15 100644 --- a/OpenCL/m03710_a0-optimized.cl +++ b/OpenCL/m03710_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m03710_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -386,7 +386,7 @@ __kernel void m03710_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m03710_a3-optimized.cl b/OpenCL/m03710_a3-optimized.cl index 3a587f5b2..a487c55fa 100644 --- a/OpenCL/m03710_a3-optimized.cl +++ b/OpenCL/m03710_a3-optimized.cl @@ -678,7 +678,7 @@ __kernel void m03710_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -729,7 +729,7 @@ __kernel void m03710_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -799,7 +799,7 @@ __kernel void m03710_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -869,7 +869,7 @@ __kernel void m03710_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -939,7 +939,7 @@ __kernel void m03710_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1028,7 +1028,7 @@ __kernel void m03710_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m03710_a3-pure.cl b/OpenCL/m03710_a3-pure.cl index 42973b92e..e7b2c36ea 100644 --- a/OpenCL/m03710_a3-pure.cl +++ b/OpenCL/m03710_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m03710_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -197,7 +197,7 @@ __kernel void m03710_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m03800_a0-optimized.cl b/OpenCL/m03800_a0-optimized.cl index 68f63c74a..1311a02b4 100644 --- a/OpenCL/m03800_a0-optimized.cl +++ b/OpenCL/m03800_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m03800_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -281,7 +281,7 @@ __kernel void m03800_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m03800_a3-optimized.cl b/OpenCL/m03800_a3-optimized.cl index 398348779..c4827fc0c 100644 --- a/OpenCL/m03800_a3-optimized.cl +++ b/OpenCL/m03800_a3-optimized.cl @@ -519,7 +519,7 @@ __kernel void m03800_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -572,7 +572,7 @@ __kernel void m03800_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -625,7 +625,7 @@ __kernel void m03800_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -678,7 +678,7 @@ __kernel void m03800_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -731,7 +731,7 @@ __kernel void m03800_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -784,7 +784,7 @@ __kernel void m03800_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m03800_a3-pure.cl b/OpenCL/m03800_a3-pure.cl index 392f3f2ec..87f25efca 100644 --- a/OpenCL/m03800_a3-pure.cl +++ b/OpenCL/m03800_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m03800_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -112,7 +112,7 @@ __kernel void m03800_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m03910_a0-optimized.cl b/OpenCL/m03910_a0-optimized.cl index 74f977f5a..ef1b0e202 100644 --- a/OpenCL/m03910_a0-optimized.cl +++ b/OpenCL/m03910_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m03910_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -441,7 +441,7 @@ __kernel void m03910_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m03910_a3-optimized.cl b/OpenCL/m03910_a3-optimized.cl index a229f931a..4ff8bef25 100644 --- a/OpenCL/m03910_a3-optimized.cl +++ b/OpenCL/m03910_a3-optimized.cl @@ -769,7 +769,7 @@ __kernel void m03910_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -839,7 +839,7 @@ __kernel void m03910_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -909,7 +909,7 @@ __kernel void m03910_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -979,7 +979,7 @@ __kernel void m03910_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1049,7 +1049,7 @@ __kernel void m03910_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1119,7 +1119,7 @@ __kernel void m03910_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table diff --git a/OpenCL/m03910_a3-pure.cl b/OpenCL/m03910_a3-pure.cl index 77ed6d321..d03785de8 100644 --- a/OpenCL/m03910_a3-pure.cl +++ b/OpenCL/m03910_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m03910_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -207,7 +207,7 @@ __kernel void m03910_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m04010_a0-optimized.cl b/OpenCL/m04010_a0-optimized.cl index ff911e3c0..34113e208 100644 --- a/OpenCL/m04010_a0-optimized.cl +++ b/OpenCL/m04010_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m04010_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -412,7 +412,7 @@ __kernel void m04010_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m04010_a3-optimized.cl b/OpenCL/m04010_a3-optimized.cl index 2ce486a68..75e2f916d 100644 --- a/OpenCL/m04010_a3-optimized.cl +++ b/OpenCL/m04010_a3-optimized.cl @@ -718,7 +718,7 @@ __kernel void m04010_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -769,7 +769,7 @@ __kernel void m04010_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -839,7 +839,7 @@ __kernel void m04010_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -909,7 +909,7 @@ __kernel void m04010_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -979,7 +979,7 @@ __kernel void m04010_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1068,7 +1068,7 @@ __kernel void m04010_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m04010_a3-pure.cl b/OpenCL/m04010_a3-pure.cl index c87c791cf..a8c01ebef 100644 --- a/OpenCL/m04010_a3-pure.cl +++ b/OpenCL/m04010_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m04010_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -192,7 +192,7 @@ __kernel void m04010_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m04110_a0-optimized.cl b/OpenCL/m04110_a0-optimized.cl index 723bb00f9..b07486633 100644 --- a/OpenCL/m04110_a0-optimized.cl +++ b/OpenCL/m04110_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m04110_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -457,7 +457,7 @@ __kernel void m04110_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m04110_a3-optimized.cl b/OpenCL/m04110_a3-optimized.cl index f23498da1..6f7e76d5b 100644 --- a/OpenCL/m04110_a3-optimized.cl +++ b/OpenCL/m04110_a3-optimized.cl @@ -774,7 +774,7 @@ __kernel void m04110_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -825,7 +825,7 @@ __kernel void m04110_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -895,7 +895,7 @@ __kernel void m04110_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -965,7 +965,7 @@ __kernel void m04110_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1035,7 +1035,7 @@ __kernel void m04110_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -1124,7 +1124,7 @@ __kernel void m04110_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m04110_a3-pure.cl b/OpenCL/m04110_a3-pure.cl index c5090ce2c..15cfc7574 100644 --- a/OpenCL/m04110_a3-pure.cl +++ b/OpenCL/m04110_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m04110_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -203,7 +203,7 @@ __kernel void m04110_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m04310_a0-optimized.cl b/OpenCL/m04310_a0-optimized.cl index 26792f43f..f37e0a2c5 100644 --- a/OpenCL/m04310_a0-optimized.cl +++ b/OpenCL/m04310_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m04310_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -355,7 +355,7 @@ __kernel void m04310_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m04310_a3-optimized.cl b/OpenCL/m04310_a3-optimized.cl index b7d831266..8822ef6c4 100644 --- a/OpenCL/m04310_a3-optimized.cl +++ b/OpenCL/m04310_a3-optimized.cl @@ -598,7 +598,7 @@ __kernel void m04310_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -668,7 +668,7 @@ __kernel void m04310_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -738,7 +738,7 @@ __kernel void m04310_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -808,7 +808,7 @@ __kernel void m04310_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -878,7 +878,7 @@ __kernel void m04310_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table @@ -948,7 +948,7 @@ __kernel void m04310_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * bin2asc table diff --git a/OpenCL/m04310_a3-pure.cl b/OpenCL/m04310_a3-pure.cl index e0e1f0033..83372cac0 100644 --- a/OpenCL/m04310_a3-pure.cl +++ b/OpenCL/m04310_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m04310_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -184,7 +184,7 @@ __kernel void m04310_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m04400_a0-optimized.cl b/OpenCL/m04400_a0-optimized.cl index 938cb8b28..20e96cadd 100644 --- a/OpenCL/m04400_a0-optimized.cl +++ b/OpenCL/m04400_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m04400_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -381,7 +381,7 @@ __kernel void m04400_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m04400_a3-optimized.cl b/OpenCL/m04400_a3-optimized.cl index 5269ab6e6..a25de6af4 100644 --- a/OpenCL/m04400_a3-optimized.cl +++ b/OpenCL/m04400_a3-optimized.cl @@ -622,7 +622,7 @@ __kernel void m04400_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -692,7 +692,7 @@ __kernel void m04400_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -762,7 +762,7 @@ __kernel void m04400_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -832,7 +832,7 @@ __kernel void m04400_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -902,7 +902,7 @@ __kernel void m04400_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -972,7 +972,7 @@ __kernel void m04400_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m04400_a3-pure.cl b/OpenCL/m04400_a3-pure.cl index 534e67ebf..e2714af19 100644 --- a/OpenCL/m04400_a3-pure.cl +++ b/OpenCL/m04400_a3-pure.cl @@ -59,7 +59,7 @@ __kernel void m04400_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -179,7 +179,7 @@ __kernel void m04400_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m04500_a0-optimized.cl b/OpenCL/m04500_a0-optimized.cl index d86e312fc..1eb3300db 100644 --- a/OpenCL/m04500_a0-optimized.cl +++ b/OpenCL/m04500_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m04500_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -408,7 +408,7 @@ __kernel void m04500_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m04500_a3-optimized.cl b/OpenCL/m04500_a3-optimized.cl index 0664532f1..82d30f11c 100644 --- a/OpenCL/m04500_a3-optimized.cl +++ b/OpenCL/m04500_a3-optimized.cl @@ -682,7 +682,7 @@ __kernel void m04500_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -752,7 +752,7 @@ __kernel void m04500_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -822,7 +822,7 @@ __kernel void m04500_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -892,7 +892,7 @@ __kernel void m04500_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -962,7 +962,7 @@ __kernel void m04500_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1032,7 +1032,7 @@ __kernel void m04500_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m04500_a3-pure.cl b/OpenCL/m04500_a3-pure.cl index cb7f02bd6..84d25857a 100644 --- a/OpenCL/m04500_a3-pure.cl +++ b/OpenCL/m04500_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m04500_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -178,7 +178,7 @@ __kernel void m04500_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m04520_a0-optimized.cl b/OpenCL/m04520_a0-optimized.cl index 942164c87..f535f08af 100644 --- a/OpenCL/m04520_a0-optimized.cl +++ b/OpenCL/m04520_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m04520_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -639,7 +639,7 @@ __kernel void m04520_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m04520_a3-optimized.cl b/OpenCL/m04520_a3-optimized.cl index 6d820e39d..08d10e3eb 100644 --- a/OpenCL/m04520_a3-optimized.cl +++ b/OpenCL/m04520_a3-optimized.cl @@ -1135,7 +1135,7 @@ __kernel void m04520_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1205,7 +1205,7 @@ __kernel void m04520_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1275,7 +1275,7 @@ __kernel void m04520_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1345,7 +1345,7 @@ __kernel void m04520_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1415,7 +1415,7 @@ __kernel void m04520_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1485,7 +1485,7 @@ __kernel void m04520_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m04520_a3-pure.cl b/OpenCL/m04520_a3-pure.cl index 3a9351b45..69a6cfc39 100644 --- a/OpenCL/m04520_a3-pure.cl +++ b/OpenCL/m04520_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m04520_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -195,7 +195,7 @@ __kernel void m04520_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m04700_a0-optimized.cl b/OpenCL/m04700_a0-optimized.cl index 3a1fb22ad..15206a4a8 100644 --- a/OpenCL/m04700_a0-optimized.cl +++ b/OpenCL/m04700_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m04700_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -364,7 +364,7 @@ __kernel void m04700_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m04700_a3-optimized.cl b/OpenCL/m04700_a3-optimized.cl index 2465e4747..c3f76c04e 100644 --- a/OpenCL/m04700_a3-optimized.cl +++ b/OpenCL/m04700_a3-optimized.cl @@ -622,7 +622,7 @@ __kernel void m04700_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -692,7 +692,7 @@ __kernel void m04700_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -762,7 +762,7 @@ __kernel void m04700_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -832,7 +832,7 @@ __kernel void m04700_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -902,7 +902,7 @@ __kernel void m04700_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -972,7 +972,7 @@ __kernel void m04700_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m04700_a3-pure.cl b/OpenCL/m04700_a3-pure.cl index 545cb1b34..3091d2315 100644 --- a/OpenCL/m04700_a3-pure.cl +++ b/OpenCL/m04700_a3-pure.cl @@ -59,7 +59,7 @@ __kernel void m04700_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -174,7 +174,7 @@ __kernel void m04700_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m04800_a0-optimized.cl b/OpenCL/m04800_a0-optimized.cl index 42b8f3e90..457b76dab 100644 --- a/OpenCL/m04800_a0-optimized.cl +++ b/OpenCL/m04800_a0-optimized.cl @@ -41,7 +41,7 @@ __kernel void m04800_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -246,7 +246,7 @@ __kernel void m04800_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m04800_a3-optimized.cl b/OpenCL/m04800_a3-optimized.cl index 6c2f19df2..51073477e 100644 --- a/OpenCL/m04800_a3-optimized.cl +++ b/OpenCL/m04800_a3-optimized.cl @@ -443,7 +443,7 @@ __kernel void m04800_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -496,7 +496,7 @@ __kernel void m04800_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -549,7 +549,7 @@ __kernel void m04800_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -602,7 +602,7 @@ __kernel void m04800_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -655,7 +655,7 @@ __kernel void m04800_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -708,7 +708,7 @@ __kernel void m04800_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m04800_a3-pure.cl b/OpenCL/m04800_a3-pure.cl index da1c7670f..44e3221bc 100644 --- a/OpenCL/m04800_a3-pure.cl +++ b/OpenCL/m04800_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m04800_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -114,7 +114,7 @@ __kernel void m04800_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m04900_a0-optimized.cl b/OpenCL/m04900_a0-optimized.cl index 37797342d..263723417 100644 --- a/OpenCL/m04900_a0-optimized.cl +++ b/OpenCL/m04900_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m04900_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -322,7 +322,7 @@ __kernel void m04900_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m04900_a3-optimized.cl b/OpenCL/m04900_a3-optimized.cl index a44e1781f..ef0210912 100644 --- a/OpenCL/m04900_a3-optimized.cl +++ b/OpenCL/m04900_a3-optimized.cl @@ -611,7 +611,7 @@ __kernel void m04900_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -664,7 +664,7 @@ __kernel void m04900_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -717,7 +717,7 @@ __kernel void m04900_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -770,7 +770,7 @@ __kernel void m04900_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -823,7 +823,7 @@ __kernel void m04900_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -876,7 +876,7 @@ __kernel void m04900_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m04900_a3-pure.cl b/OpenCL/m04900_a3-pure.cl index c21617972..0c453dc1b 100644 --- a/OpenCL/m04900_a3-pure.cl +++ b/OpenCL/m04900_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m04900_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -112,7 +112,7 @@ __kernel void m04900_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m05100_a0-optimized.cl b/OpenCL/m05100_a0-optimized.cl index 4e3476776..66c479e49 100644 --- a/OpenCL/m05100_a0-optimized.cl +++ b/OpenCL/m05100_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m05100_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -190,7 +190,7 @@ __kernel void m05100_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m05100_a3-optimized.cl b/OpenCL/m05100_a3-optimized.cl index e2f9e27e2..ddfcd357e 100644 --- a/OpenCL/m05100_a3-optimized.cl +++ b/OpenCL/m05100_a3-optimized.cl @@ -332,7 +332,7 @@ __kernel void m05100_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -379,7 +379,7 @@ __kernel void m05100_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -426,7 +426,7 @@ __kernel void m05100_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -473,7 +473,7 @@ __kernel void m05100_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -520,7 +520,7 @@ __kernel void m05100_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -567,7 +567,7 @@ __kernel void m05100_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m05100_a3-pure.cl b/OpenCL/m05100_a3-pure.cl index 545b1bd12..870b4b4de 100644 --- a/OpenCL/m05100_a3-pure.cl +++ b/OpenCL/m05100_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m05100_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -99,7 +99,7 @@ __kernel void m05100_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m05300_a0-optimized.cl b/OpenCL/m05300_a0-optimized.cl index e9fa8e246..40d80eb99 100644 --- a/OpenCL/m05300_a0-optimized.cl +++ b/OpenCL/m05300_a0-optimized.cl @@ -148,7 +148,7 @@ __kernel void m05300_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -323,7 +323,7 @@ __kernel void m05300_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m05300_a1-pure.cl b/OpenCL/m05300_a1-pure.cl index 6eedc6c1a..6e4453d8b 100644 --- a/OpenCL/m05300_a1-pure.cl +++ b/OpenCL/m05300_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m05300_mxx (KERN_ATTR_ESALT (ikepsk_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -139,7 +139,7 @@ __kernel void m05300_sxx (KERN_ATTR_ESALT (ikepsk_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m05300_a3-optimized.cl b/OpenCL/m05300_a3-optimized.cl index 04c0c299f..99fb7d6ac 100644 --- a/OpenCL/m05300_a3-optimized.cl +++ b/OpenCL/m05300_a3-optimized.cl @@ -468,7 +468,7 @@ __kernel void m05300_m04 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -541,7 +541,7 @@ __kernel void m05300_m08 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -614,7 +614,7 @@ __kernel void m05300_m16 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -687,7 +687,7 @@ __kernel void m05300_s04 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -760,7 +760,7 @@ __kernel void m05300_s08 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -833,7 +833,7 @@ __kernel void m05300_s16 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m05300_a3-pure.cl b/OpenCL/m05300_a3-pure.cl index b623f5fb3..c2e5384ca 100644 --- a/OpenCL/m05300_a3-pure.cl +++ b/OpenCL/m05300_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m05300_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -125,7 +125,7 @@ __kernel void m05300_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m05400_a0-optimized.cl b/OpenCL/m05400_a0-optimized.cl index 14f01b3b6..64240619d 100644 --- a/OpenCL/m05400_a0-optimized.cl +++ b/OpenCL/m05400_a0-optimized.cl @@ -152,7 +152,7 @@ __kernel void m05400_m04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -336,7 +336,7 @@ __kernel void m05400_s04 (KERN_ATTR_RULES_ESALT (ikepsk_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m05400_a1-pure.cl b/OpenCL/m05400_a1-pure.cl index 5a946786b..a79e5a219 100644 --- a/OpenCL/m05400_a1-pure.cl +++ b/OpenCL/m05400_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m05400_mxx (KERN_ATTR_ESALT (ikepsk_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -139,7 +139,7 @@ __kernel void m05400_sxx (KERN_ATTR_ESALT (ikepsk_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m05400_a3-optimized.cl b/OpenCL/m05400_a3-optimized.cl index 31fae5e9b..53e346845 100644 --- a/OpenCL/m05400_a3-optimized.cl +++ b/OpenCL/m05400_a3-optimized.cl @@ -472,7 +472,7 @@ __kernel void m05400_m04 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -545,7 +545,7 @@ __kernel void m05400_m08 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -618,7 +618,7 @@ __kernel void m05400_m16 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -691,7 +691,7 @@ __kernel void m05400_s04 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -764,7 +764,7 @@ __kernel void m05400_s08 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -837,7 +837,7 @@ __kernel void m05400_s16 (KERN_ATTR_ESALT (ikepsk_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m05400_a3-pure.cl b/OpenCL/m05400_a3-pure.cl index 6098c1340..e7e303036 100644 --- a/OpenCL/m05400_a3-pure.cl +++ b/OpenCL/m05400_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m05400_mxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -125,7 +125,7 @@ __kernel void m05400_sxx (KERN_ATTR_VECTOR_ESALT (ikepsk_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m05500_a0-optimized.cl b/OpenCL/m05500_a0-optimized.cl index 030cdeff2..78927a5ca 100644 --- a/OpenCL/m05500_a0-optimized.cl +++ b/OpenCL/m05500_a0-optimized.cl @@ -546,7 +546,7 @@ __kernel void m05500_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -759,7 +759,7 @@ __kernel void m05500_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m05500_a3-optimized.cl b/OpenCL/m05500_a3-optimized.cl index 3fa0cc3f7..5856f846f 100644 --- a/OpenCL/m05500_a3-optimized.cl +++ b/OpenCL/m05500_a3-optimized.cl @@ -884,7 +884,7 @@ __kernel void m05500_m04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -958,7 +958,7 @@ __kernel void m05500_m08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1036,7 +1036,7 @@ __kernel void m05500_s04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1110,7 +1110,7 @@ __kernel void m05500_s08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m05500_a3-pure.cl b/OpenCL/m05500_a3-pure.cl index 0a4fd5f40..f80136b38 100644 --- a/OpenCL/m05500_a3-pure.cl +++ b/OpenCL/m05500_a3-pure.cl @@ -541,7 +541,7 @@ __kernel void m05500_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -688,7 +688,7 @@ __kernel void m05500_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m05600_a0-optimized.cl b/OpenCL/m05600_a0-optimized.cl index 01b97bd2e..95c419b1c 100644 --- a/OpenCL/m05600_a0-optimized.cl +++ b/OpenCL/m05600_a0-optimized.cl @@ -155,7 +155,7 @@ __kernel void m05600_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -394,7 +394,7 @@ __kernel void m05600_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m05600_a3-optimized.cl b/OpenCL/m05600_a3-optimized.cl index c128a1a05..75f313d9a 100644 --- a/OpenCL/m05600_a3-optimized.cl +++ b/OpenCL/m05600_a3-optimized.cl @@ -587,7 +587,7 @@ __kernel void m05600_m04 (KERN_ATTR_ESALT (netntlm_t)) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -660,7 +660,7 @@ __kernel void m05600_m08 (KERN_ATTR_ESALT (netntlm_t)) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -733,7 +733,7 @@ __kernel void m05600_m16 (KERN_ATTR_ESALT (netntlm_t)) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -806,7 +806,7 @@ __kernel void m05600_s04 (KERN_ATTR_ESALT (netntlm_t)) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -879,7 +879,7 @@ __kernel void m05600_s08 (KERN_ATTR_ESALT (netntlm_t)) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -952,7 +952,7 @@ __kernel void m05600_s16 (KERN_ATTR_ESALT (netntlm_t)) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m05600_a3-pure.cl b/OpenCL/m05600_a3-pure.cl index 5b9515b14..6a34224d4 100644 --- a/OpenCL/m05600_a3-pure.cl +++ b/OpenCL/m05600_a3-pure.cl @@ -29,7 +29,7 @@ __kernel void m05600_mxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -151,7 +151,7 @@ __kernel void m05600_sxx (KERN_ATTR_VECTOR_ESALT (netntlm_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m05800-optimized.cl b/OpenCL/m05800-optimized.cl index e1044c3b3..7fd955917 100644 --- a/OpenCL/m05800-optimized.cl +++ b/OpenCL/m05800-optimized.cl @@ -2214,7 +2214,7 @@ __kernel void m05800_init (KERN_ATTR_TMPS (androidpin_tmp_t)) word_buf[2] = pws[gid].i[ 2]; word_buf[3] = pws[gid].i[ 3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -2324,7 +2324,7 @@ __kernel void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) word_buf[2] = pws[gid].i[ 2]; word_buf[3] = pws[gid].i[ 3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; u32 digest[5]; diff --git a/OpenCL/m05800-pure.cl b/OpenCL/m05800-pure.cl index 82f60467a..434f6bc3e 100644 --- a/OpenCL/m05800-pure.cl +++ b/OpenCL/m05800-pure.cl @@ -2258,7 +2258,7 @@ __kernel void m05800_loop (KERN_ATTR_TMPS (androidpin_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m06000_a0-optimized.cl b/OpenCL/m06000_a0-optimized.cl index eed09027b..bc79b691f 100644 --- a/OpenCL/m06000_a0-optimized.cl +++ b/OpenCL/m06000_a0-optimized.cl @@ -48,7 +48,7 @@ __kernel void m06000_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -138,7 +138,7 @@ __kernel void m06000_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m06000_a3-optimized.cl b/OpenCL/m06000_a3-optimized.cl index e99ab8e35..bace8824f 100644 --- a/OpenCL/m06000_a3-optimized.cl +++ b/OpenCL/m06000_a3-optimized.cl @@ -184,7 +184,7 @@ __kernel void m06000_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -231,7 +231,7 @@ __kernel void m06000_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -278,7 +278,7 @@ __kernel void m06000_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -325,7 +325,7 @@ __kernel void m06000_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -372,7 +372,7 @@ __kernel void m06000_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -419,7 +419,7 @@ __kernel void m06000_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m06000_a3-pure.cl b/OpenCL/m06000_a3-pure.cl index cd868f0f1..ed1d0e542 100644 --- a/OpenCL/m06000_a3-pure.cl +++ b/OpenCL/m06000_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m06000_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m06000_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m06100_a0-optimized.cl b/OpenCL/m06100_a0-optimized.cl index bf4462d8a..422038dd7 100644 --- a/OpenCL/m06100_a0-optimized.cl +++ b/OpenCL/m06100_a0-optimized.cl @@ -78,7 +78,7 @@ __kernel void m06100_m04 (KERN_ATTR_RULES_ESALT (netntlm_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -209,7 +209,7 @@ __kernel void m06100_s04 (KERN_ATTR_RULES_ESALT (netntlm_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m06100_a3-optimized.cl b/OpenCL/m06100_a3-optimized.cl index c3630bda4..2c966e352 100644 --- a/OpenCL/m06100_a3-optimized.cl +++ b/OpenCL/m06100_a3-optimized.cl @@ -242,7 +242,7 @@ __kernel void m06100_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -325,7 +325,7 @@ __kernel void m06100_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -408,7 +408,7 @@ __kernel void m06100_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -491,7 +491,7 @@ __kernel void m06100_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -574,7 +574,7 @@ __kernel void m06100_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -657,7 +657,7 @@ __kernel void m06100_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m06100_a3-pure.cl b/OpenCL/m06100_a3-pure.cl index 776d3de92..ab49863e3 100644 --- a/OpenCL/m06100_a3-pure.cl +++ b/OpenCL/m06100_a3-pure.cl @@ -59,7 +59,7 @@ __kernel void m06100_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -157,7 +157,7 @@ __kernel void m06100_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m06300-optimized.cl b/OpenCL/m06300-optimized.cl index 392317293..8972d64b0 100644 --- a/OpenCL/m06300-optimized.cl +++ b/OpenCL/m06300-optimized.cl @@ -581,7 +581,7 @@ __kernel void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) w0[2] = pws[gid].i[2]; w0[3] = pws[gid].i[3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -739,7 +739,7 @@ __kernel void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) w0[2] = pws[gid].i[2]; w0[3] = pws[gid].i[3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; u32 w0_x80[4]; diff --git a/OpenCL/m06300-pure.cl b/OpenCL/m06300-pure.cl index d37087cec..6072a26b8 100644 --- a/OpenCL/m06300-pure.cl +++ b/OpenCL/m06300-pure.cl @@ -32,7 +32,7 @@ __kernel void m06300_init (KERN_ATTR_TMPS (md5crypt_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -132,7 +132,7 @@ __kernel void m06300_loop (KERN_ATTR_TMPS (md5crypt_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m06900_a0-optimized.cl b/OpenCL/m06900_a0-optimized.cl index a748bd5b8..379713f29 100644 --- a/OpenCL/m06900_a0-optimized.cl +++ b/OpenCL/m06900_a0-optimized.cl @@ -741,7 +741,7 @@ __kernel void m06900_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -957,7 +957,7 @@ __kernel void m06900_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m06900_a3-optimized.cl b/OpenCL/m06900_a3-optimized.cl index 2b8ae6f6b..ec56c840d 100644 --- a/OpenCL/m06900_a3-optimized.cl +++ b/OpenCL/m06900_a3-optimized.cl @@ -1115,7 +1115,7 @@ __kernel void m06900_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1184,7 +1184,7 @@ __kernel void m06900_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1257,7 +1257,7 @@ __kernel void m06900_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1326,7 +1326,7 @@ __kernel void m06900_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m07000_a0-optimized.cl b/OpenCL/m07000_a0-optimized.cl index 59ed2dfbb..9954daf0e 100644 --- a/OpenCL/m07000_a0-optimized.cl +++ b/OpenCL/m07000_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m07000_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -304,7 +304,7 @@ __kernel void m07000_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m07000_a3-optimized.cl b/OpenCL/m07000_a3-optimized.cl index d41ee70ec..b74e44a8b 100644 --- a/OpenCL/m07000_a3-optimized.cl +++ b/OpenCL/m07000_a3-optimized.cl @@ -611,7 +611,7 @@ __kernel void m07000_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -664,7 +664,7 @@ __kernel void m07000_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -717,7 +717,7 @@ __kernel void m07000_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -770,7 +770,7 @@ __kernel void m07000_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -823,7 +823,7 @@ __kernel void m07000_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -876,7 +876,7 @@ __kernel void m07000_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m07000_a3-pure.cl b/OpenCL/m07000_a3-pure.cl index b7fe098b5..ad97fd998 100644 --- a/OpenCL/m07000_a3-pure.cl +++ b/OpenCL/m07000_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m07000_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -129,7 +129,7 @@ __kernel void m07000_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m07300_a0-optimized.cl b/OpenCL/m07300_a0-optimized.cl index 39c1646f5..82335c3a5 100644 --- a/OpenCL/m07300_a0-optimized.cl +++ b/OpenCL/m07300_a0-optimized.cl @@ -132,7 +132,7 @@ __kernel void m07300_m04 (KERN_ATTR_RULES_ESALT (rakp_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -259,7 +259,7 @@ __kernel void m07300_s04 (KERN_ATTR_RULES_ESALT (rakp_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m07300_a1-pure.cl b/OpenCL/m07300_a1-pure.cl index 34e087878..ca349ac37 100644 --- a/OpenCL/m07300_a1-pure.cl +++ b/OpenCL/m07300_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m07300_mxx (KERN_ATTR_ESALT (rakp_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -109,7 +109,7 @@ __kernel void m07300_sxx (KERN_ATTR_ESALT (rakp_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m07300_a3-optimized.cl b/OpenCL/m07300_a3-optimized.cl index 0698c409a..9eebb48e5 100644 --- a/OpenCL/m07300_a3-optimized.cl +++ b/OpenCL/m07300_a3-optimized.cl @@ -372,7 +372,7 @@ __kernel void m07300_m04 (KERN_ATTR_ESALT (rakp_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -419,7 +419,7 @@ __kernel void m07300_m08 (KERN_ATTR_ESALT (rakp_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -466,7 +466,7 @@ __kernel void m07300_m16 (KERN_ATTR_ESALT (rakp_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -513,7 +513,7 @@ __kernel void m07300_s04 (KERN_ATTR_ESALT (rakp_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -560,7 +560,7 @@ __kernel void m07300_s08 (KERN_ATTR_ESALT (rakp_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -607,7 +607,7 @@ __kernel void m07300_s16 (KERN_ATTR_ESALT (rakp_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m07300_a3-pure.cl b/OpenCL/m07300_a3-pure.cl index 05525566e..ceadbfe2e 100644 --- a/OpenCL/m07300_a3-pure.cl +++ b/OpenCL/m07300_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m07300_mxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m07300_sxx (KERN_ATTR_VECTOR_ESALT (rakp_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m07400-optimized.cl b/OpenCL/m07400-optimized.cl index 1202cd317..9bb671c84 100644 --- a/OpenCL/m07400-optimized.cl +++ b/OpenCL/m07400-optimized.cl @@ -709,7 +709,7 @@ __kernel void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) w0[2] = pws[gid].i[2]; w0[3] = pws[gid].i[3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -951,7 +951,7 @@ __kernel void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) if (gid >= gid_max) return; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * base diff --git a/OpenCL/m07400-pure.cl b/OpenCL/m07400-pure.cl index 2935d79cb..2783338a4 100644 --- a/OpenCL/m07400-pure.cl +++ b/OpenCL/m07400-pure.cl @@ -27,7 +27,7 @@ __kernel void m07400_init (KERN_ATTR_TMPS (sha256crypt_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -260,7 +260,7 @@ __kernel void m07400_loop (KERN_ATTR_TMPS (sha256crypt_tmp_t)) if (gid >= gid_max) return; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; const u32 salt_len = salt_bufs[salt_pos].salt_len; diff --git a/OpenCL/m07500_a0-optimized.cl b/OpenCL/m07500_a0-optimized.cl index 95197cd9e..f1a76fde8 100644 --- a/OpenCL/m07500_a0-optimized.cl +++ b/OpenCL/m07500_a0-optimized.cl @@ -412,7 +412,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m07500_m04 (KERN_A pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -518,7 +518,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m07500_s04 (KERN_A pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m07500_a3-optimized.cl b/OpenCL/m07500_a3-optimized.cl index c881f9661..236cd4b3b 100644 --- a/OpenCL/m07500_a3-optimized.cl +++ b/OpenCL/m07500_a3-optimized.cl @@ -511,7 +511,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m07500_m04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -563,7 +563,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m07500_m08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -619,7 +619,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m07500_s04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -671,7 +671,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m07500_s08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m07500_a3-pure.cl b/OpenCL/m07500_a3-pure.cl index 4fd5b124f..a4231ff50 100644 --- a/OpenCL/m07500_a3-pure.cl +++ b/OpenCL/m07500_a3-pure.cl @@ -293,7 +293,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m07500_mxx (KERN_A * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -387,7 +387,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m07500_sxx (KERN_A * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m07700_a0-optimized.cl b/OpenCL/m07700_a0-optimized.cl index 1f36cc2fe..1e84c5fe0 100644 --- a/OpenCL/m07700_a0-optimized.cl +++ b/OpenCL/m07700_a0-optimized.cl @@ -175,7 +175,7 @@ __kernel void m07700_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -339,7 +339,7 @@ __kernel void m07700_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m07700_a3-optimized.cl b/OpenCL/m07700_a3-optimized.cl index 18343ead0..b24571b23 100644 --- a/OpenCL/m07700_a3-optimized.cl +++ b/OpenCL/m07700_a3-optimized.cl @@ -442,7 +442,7 @@ __kernel void m07700_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -495,7 +495,7 @@ __kernel void m07700_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -552,7 +552,7 @@ __kernel void m07700_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -605,7 +605,7 @@ __kernel void m07700_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m07701_a0-optimized.cl b/OpenCL/m07701_a0-optimized.cl index 42c825342..eb69422c5 100644 --- a/OpenCL/m07701_a0-optimized.cl +++ b/OpenCL/m07701_a0-optimized.cl @@ -175,7 +175,7 @@ __kernel void m07701_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -339,7 +339,7 @@ __kernel void m07701_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m07701_a3-optimized.cl b/OpenCL/m07701_a3-optimized.cl index 2d14bec59..e625ebf91 100644 --- a/OpenCL/m07701_a3-optimized.cl +++ b/OpenCL/m07701_a3-optimized.cl @@ -442,7 +442,7 @@ __kernel void m07701_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -495,7 +495,7 @@ __kernel void m07701_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -552,7 +552,7 @@ __kernel void m07701_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -605,7 +605,7 @@ __kernel void m07701_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m07800_a0-optimized.cl b/OpenCL/m07800_a0-optimized.cl index 5a9d9093a..3a92560cb 100644 --- a/OpenCL/m07800_a0-optimized.cl +++ b/OpenCL/m07800_a0-optimized.cl @@ -81,7 +81,7 @@ __kernel void m07800_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -329,7 +329,7 @@ __kernel void m07800_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m07800_a3-optimized.cl b/OpenCL/m07800_a3-optimized.cl index d315dabe8..3bd0e1459 100644 --- a/OpenCL/m07800_a3-optimized.cl +++ b/OpenCL/m07800_a3-optimized.cl @@ -539,7 +539,7 @@ __kernel void m07800_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -592,7 +592,7 @@ __kernel void m07800_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -649,7 +649,7 @@ __kernel void m07800_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -702,7 +702,7 @@ __kernel void m07800_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m07801_a0-optimized.cl b/OpenCL/m07801_a0-optimized.cl index 103583eaf..57d686400 100644 --- a/OpenCL/m07801_a0-optimized.cl +++ b/OpenCL/m07801_a0-optimized.cl @@ -81,7 +81,7 @@ __kernel void m07801_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -329,7 +329,7 @@ __kernel void m07801_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m07801_a3-optimized.cl b/OpenCL/m07801_a3-optimized.cl index 3b3da0e2a..fd62a49ce 100644 --- a/OpenCL/m07801_a3-optimized.cl +++ b/OpenCL/m07801_a3-optimized.cl @@ -539,7 +539,7 @@ __kernel void m07801_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -592,7 +592,7 @@ __kernel void m07801_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -649,7 +649,7 @@ __kernel void m07801_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -702,7 +702,7 @@ __kernel void m07801_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m07900-pure.cl b/OpenCL/m07900-pure.cl index 61b393c2c..f33506e08 100644 --- a/OpenCL/m07900-pure.cl +++ b/OpenCL/m07900-pure.cl @@ -57,7 +57,7 @@ __kernel void m07900_loop (KERN_ATTR_TMPS (drupal7_tmp_t)) * init */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m08000_a0-optimized.cl b/OpenCL/m08000_a0-optimized.cl index bcec1a8d6..3324117a3 100644 --- a/OpenCL/m08000_a0-optimized.cl +++ b/OpenCL/m08000_a0-optimized.cl @@ -308,7 +308,7 @@ __kernel void m08000_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -479,7 +479,7 @@ __kernel void m08000_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m08000_a3-optimized.cl b/OpenCL/m08000_a3-optimized.cl index c4a506b77..404a89fb7 100644 --- a/OpenCL/m08000_a3-optimized.cl +++ b/OpenCL/m08000_a3-optimized.cl @@ -510,7 +510,7 @@ __kernel void m08000_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; __local u32 w_s1[64]; __local u32 w_s2[64]; @@ -549,7 +549,7 @@ __kernel void m08000_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; __local u32 w_s1[64]; __local u32 w_s2[64]; @@ -588,7 +588,7 @@ __kernel void m08000_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; __local u32 w_s1[64]; __local u32 w_s2[64]; @@ -627,7 +627,7 @@ __kernel void m08000_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; __local u32 w_s1[64]; __local u32 w_s2[64]; @@ -666,7 +666,7 @@ __kernel void m08000_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; __local u32 w_s1[64]; __local u32 w_s2[64]; @@ -705,7 +705,7 @@ __kernel void m08000_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; __local u32 w_s1[64]; __local u32 w_s2[64]; diff --git a/OpenCL/m08100_a0-optimized.cl b/OpenCL/m08100_a0-optimized.cl index 7e49acfbf..075bc9a70 100644 --- a/OpenCL/m08100_a0-optimized.cl +++ b/OpenCL/m08100_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m08100_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -254,7 +254,7 @@ __kernel void m08100_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m08100_a3-optimized.cl b/OpenCL/m08100_a3-optimized.cl index abc48fa6e..dee098aae 100644 --- a/OpenCL/m08100_a3-optimized.cl +++ b/OpenCL/m08100_a3-optimized.cl @@ -393,7 +393,7 @@ __kernel void m08100_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * base @@ -457,7 +457,7 @@ __kernel void m08100_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * base @@ -529,7 +529,7 @@ __kernel void m08100_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * base @@ -616,7 +616,7 @@ __kernel void m08100_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * base @@ -680,7 +680,7 @@ __kernel void m08100_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * base @@ -752,7 +752,7 @@ __kernel void m08100_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * base diff --git a/OpenCL/m08100_a3-pure.cl b/OpenCL/m08100_a3-pure.cl index 797646eb3..b85908be9 100644 --- a/OpenCL/m08100_a3-pure.cl +++ b/OpenCL/m08100_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m08100_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m08100_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m08300_a0-optimized.cl b/OpenCL/m08300_a0-optimized.cl index 694d53350..fdf808eec 100644 --- a/OpenCL/m08300_a0-optimized.cl +++ b/OpenCL/m08300_a0-optimized.cl @@ -43,7 +43,7 @@ __kernel void m08300_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -300,7 +300,7 @@ __kernel void m08300_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m08300_a3-optimized.cl b/OpenCL/m08300_a3-optimized.cl index fa1ef83b0..1a42360b5 100644 --- a/OpenCL/m08300_a3-optimized.cl +++ b/OpenCL/m08300_a3-optimized.cl @@ -479,7 +479,7 @@ __kernel void m08300_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -526,7 +526,7 @@ __kernel void m08300_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -573,7 +573,7 @@ __kernel void m08300_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -620,7 +620,7 @@ __kernel void m08300_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -667,7 +667,7 @@ __kernel void m08300_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -714,7 +714,7 @@ __kernel void m08300_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m08300_a3-pure.cl b/OpenCL/m08300_a3-pure.cl index cb0d5a41c..2978e84b5 100644 --- a/OpenCL/m08300_a3-pure.cl +++ b/OpenCL/m08300_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m08300_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -158,7 +158,7 @@ __kernel void m08300_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m08400_a0-optimized.cl b/OpenCL/m08400_a0-optimized.cl index 69991f4f6..c81c88764 100644 --- a/OpenCL/m08400_a0-optimized.cl +++ b/OpenCL/m08400_a0-optimized.cl @@ -72,7 +72,7 @@ __kernel void m08400_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -326,7 +326,7 @@ __kernel void m08400_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m08400_a3-optimized.cl b/OpenCL/m08400_a3-optimized.cl index 0161ae65a..eebb4fae5 100644 --- a/OpenCL/m08400_a3-optimized.cl +++ b/OpenCL/m08400_a3-optimized.cl @@ -518,7 +518,7 @@ __kernel void m08400_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -588,7 +588,7 @@ __kernel void m08400_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -658,7 +658,7 @@ __kernel void m08400_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -728,7 +728,7 @@ __kernel void m08400_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -798,7 +798,7 @@ __kernel void m08400_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -868,7 +868,7 @@ __kernel void m08400_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m08400_a3-pure.cl b/OpenCL/m08400_a3-pure.cl index 4af3f0446..f0ceb3623 100644 --- a/OpenCL/m08400_a3-pure.cl +++ b/OpenCL/m08400_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m08400_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -236,7 +236,7 @@ __kernel void m08400_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m08500_a3-pure.cl b/OpenCL/m08500_a3-pure.cl index e00b19e24..85210f5ad 100644 --- a/OpenCL/m08500_a3-pure.cl +++ b/OpenCL/m08500_a3-pure.cl @@ -722,7 +722,7 @@ __kernel void m08500_mxx (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * main @@ -796,7 +796,7 @@ __kernel void m08500_sxx (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * main diff --git a/OpenCL/m08600_a3-pure.cl b/OpenCL/m08600_a3-pure.cl index 61fe68cf6..15f5d8098 100644 --- a/OpenCL/m08600_a3-pure.cl +++ b/OpenCL/m08600_a3-pure.cl @@ -380,7 +380,7 @@ __kernel void m08600_mxx (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * main @@ -437,7 +437,7 @@ __kernel void m08600_sxx (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * main diff --git a/OpenCL/m08700_a0-optimized.cl b/OpenCL/m08700_a0-optimized.cl index 5b1cc046b..5fcfb1432 100644 --- a/OpenCL/m08700_a0-optimized.cl +++ b/OpenCL/m08700_a0-optimized.cl @@ -318,7 +318,7 @@ __kernel void m08700_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -505,7 +505,7 @@ __kernel void m08700_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m08700_a3-optimized.cl b/OpenCL/m08700_a3-optimized.cl index d0479df00..aadea5789 100644 --- a/OpenCL/m08700_a3-optimized.cl +++ b/OpenCL/m08700_a3-optimized.cl @@ -602,7 +602,7 @@ __kernel void m08700_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -670,7 +670,7 @@ __kernel void m08700_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -738,7 +738,7 @@ __kernel void m08700_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -806,7 +806,7 @@ __kernel void m08700_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -874,7 +874,7 @@ __kernel void m08700_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -942,7 +942,7 @@ __kernel void m08700_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m09000-pure.cl b/OpenCL/m09000-pure.cl index 6f4496e48..a8332d0f5 100644 --- a/OpenCL/m09000-pure.cl +++ b/OpenCL/m09000-pure.cl @@ -538,7 +538,7 @@ __kernel void __attribute__((reqd_work_group_size(8, 1, 1))) m09000_init (KERN_A w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; append_0x80_4x4 (w0, w1, w2, w3, pw_len); diff --git a/OpenCL/m09700_a0-optimized.cl b/OpenCL/m09700_a0-optimized.cl index 030914e89..4e62f287f 100644 --- a/OpenCL/m09700_a0-optimized.cl +++ b/OpenCL/m09700_a0-optimized.cl @@ -511,7 +511,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09700_m04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -700,7 +700,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09700_s04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m09700_a3-optimized.cl b/OpenCL/m09700_a3-optimized.cl index 284e185d9..fe5809b51 100644 --- a/OpenCL/m09700_a3-optimized.cl +++ b/OpenCL/m09700_a3-optimized.cl @@ -1004,7 +1004,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09700_m04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1053,7 +1053,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09700_m08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1102,7 +1102,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09700_m16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1151,7 +1151,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09700_s04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1200,7 +1200,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09700_s08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1249,7 +1249,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09700_s16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m09710_a0-optimized.cl b/OpenCL/m09710_a0-optimized.cl index 7d993f5ed..09fd289e1 100644 --- a/OpenCL/m09710_a0-optimized.cl +++ b/OpenCL/m09710_a0-optimized.cl @@ -167,7 +167,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09710_m04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -307,7 +307,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09710_s04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m09710_a3-optimized.cl b/OpenCL/m09710_a3-optimized.cl index 2152f3752..9f2ff478a 100644 --- a/OpenCL/m09710_a3-optimized.cl +++ b/OpenCL/m09710_a3-optimized.cl @@ -409,7 +409,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09710_m04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -466,7 +466,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09710_s04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m09720_a0-optimized.cl b/OpenCL/m09720_a0-optimized.cl index 43f3bae73..b1dd35f30 100644 --- a/OpenCL/m09720_a0-optimized.cl +++ b/OpenCL/m09720_a0-optimized.cl @@ -387,7 +387,7 @@ __kernel void m09720_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -493,7 +493,7 @@ __kernel void m09720_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t)) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m09720_a3-optimized.cl b/OpenCL/m09720_a3-optimized.cl index 35f35a709..190da011f 100644 --- a/OpenCL/m09720_a3-optimized.cl +++ b/OpenCL/m09720_a3-optimized.cl @@ -587,7 +587,7 @@ __kernel void m09720_m04 (KERN_ATTR_ESALT (oldoffice01_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -634,7 +634,7 @@ __kernel void m09720_m08 (KERN_ATTR_ESALT (oldoffice01_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -681,7 +681,7 @@ __kernel void m09720_m16 (KERN_ATTR_ESALT (oldoffice01_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -728,7 +728,7 @@ __kernel void m09720_s04 (KERN_ATTR_ESALT (oldoffice01_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -775,7 +775,7 @@ __kernel void m09720_s08 (KERN_ATTR_ESALT (oldoffice01_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -822,7 +822,7 @@ __kernel void m09720_s16 (KERN_ATTR_ESALT (oldoffice01_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m09800_a0-optimized.cl b/OpenCL/m09800_a0-optimized.cl index f075365e4..44c65b558 100644 --- a/OpenCL/m09800_a0-optimized.cl +++ b/OpenCL/m09800_a0-optimized.cl @@ -167,7 +167,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09800_m04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -367,7 +367,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09800_s04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m09800_a3-optimized.cl b/OpenCL/m09800_a3-optimized.cl index 20840dc6e..71940b67f 100644 --- a/OpenCL/m09800_a3-optimized.cl +++ b/OpenCL/m09800_a3-optimized.cl @@ -520,7 +520,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09800_m04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -569,7 +569,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09800_m08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -618,7 +618,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09800_m16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -667,7 +667,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09800_s04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -716,7 +716,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09800_s08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -765,7 +765,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09800_s16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m09810_a0-optimized.cl b/OpenCL/m09810_a0-optimized.cl index 3d20b9d68..a90363f7a 100644 --- a/OpenCL/m09810_a0-optimized.cl +++ b/OpenCL/m09810_a0-optimized.cl @@ -167,7 +167,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09810_m04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -294,7 +294,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09810_s04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m09810_a3-optimized.cl b/OpenCL/m09810_a3-optimized.cl index 2fa5c2a2f..55425f8dd 100644 --- a/OpenCL/m09810_a3-optimized.cl +++ b/OpenCL/m09810_a3-optimized.cl @@ -379,7 +379,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09810_m04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -428,7 +428,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09810_m08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -477,7 +477,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09810_m16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -526,7 +526,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09810_s04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -575,7 +575,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09810_s08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -624,7 +624,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m09810_s16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m09820_a0-optimized.cl b/OpenCL/m09820_a0-optimized.cl index e02dc1db6..9c3f06cb3 100644 --- a/OpenCL/m09820_a0-optimized.cl +++ b/OpenCL/m09820_a0-optimized.cl @@ -43,7 +43,7 @@ __kernel void m09820_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -177,7 +177,7 @@ __kernel void m09820_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t)) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m09820_a3-optimized.cl b/OpenCL/m09820_a3-optimized.cl index fc57ee297..fe52cc1ac 100644 --- a/OpenCL/m09820_a3-optimized.cl +++ b/OpenCL/m09820_a3-optimized.cl @@ -267,7 +267,7 @@ __kernel void m09820_m04 (KERN_ATTR_ESALT (oldoffice34_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; m09820m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } @@ -310,7 +310,7 @@ __kernel void m09820_m08 (KERN_ATTR_ESALT (oldoffice34_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; m09820m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } @@ -353,7 +353,7 @@ __kernel void m09820_m16 (KERN_ATTR_ESALT (oldoffice34_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; m09820m (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } @@ -396,7 +396,7 @@ __kernel void m09820_s04 (KERN_ATTR_ESALT (oldoffice34_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; m09820s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } @@ -439,7 +439,7 @@ __kernel void m09820_s08 (KERN_ATTR_ESALT (oldoffice34_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; m09820s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } @@ -482,7 +482,7 @@ __kernel void m09820_s16 (KERN_ATTR_ESALT (oldoffice34_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; m09820s (w0, w1, w2, w3, pw_len, pws, rules_buf, combs_buf, bfs_buf, tmps, hooks, bitmaps_buf_s1_a, bitmaps_buf_s1_b, bitmaps_buf_s1_c, bitmaps_buf_s1_d, bitmaps_buf_s2_a, bitmaps_buf_s2_b, bitmaps_buf_s2_c, bitmaps_buf_s2_d, plains_buf, digests_buf, hashes_shown, salt_bufs, esalt_bufs, d_return_buf, d_scryptV0_buf, d_scryptV1_buf, d_scryptV2_buf, d_scryptV3_buf, bitmap_mask, bitmap_shift1, bitmap_shift2, salt_pos, loop_pos, loop_cnt, il_cnt, digests_cnt, digests_offset, combs_mode, gid_max); } diff --git a/OpenCL/m09900_a0-optimized.cl b/OpenCL/m09900_a0-optimized.cl index 709aebe1c..f7d973b16 100644 --- a/OpenCL/m09900_a0-optimized.cl +++ b/OpenCL/m09900_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m09900_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -276,7 +276,7 @@ __kernel void m09900_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m09900_a3-optimized.cl b/OpenCL/m09900_a3-optimized.cl index 1563b0b75..ed9d7e687 100644 --- a/OpenCL/m09900_a3-optimized.cl +++ b/OpenCL/m09900_a3-optimized.cl @@ -618,7 +618,7 @@ __kernel void m09900_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -656,7 +656,7 @@ __kernel void m09900_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -694,7 +694,7 @@ __kernel void m09900_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -732,7 +732,7 @@ __kernel void m09900_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -770,7 +770,7 @@ __kernel void m09900_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -808,7 +808,7 @@ __kernel void m09900_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m09900_a3-pure.cl b/OpenCL/m09900_a3-pure.cl index c708d32c8..0a4e0b88d 100644 --- a/OpenCL/m09900_a3-pure.cl +++ b/OpenCL/m09900_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m09900_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m09900_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m10100_a0-optimized.cl b/OpenCL/m10100_a0-optimized.cl index 48bcde397..e481870a6 100644 --- a/OpenCL/m10100_a0-optimized.cl +++ b/OpenCL/m10100_a0-optimized.cl @@ -59,7 +59,7 @@ __kernel void m10100_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -186,7 +186,7 @@ __kernel void m10100_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m10100_a3-optimized.cl b/OpenCL/m10100_a3-optimized.cl index f468a1aa5..60b9c060f 100644 --- a/OpenCL/m10100_a3-optimized.cl +++ b/OpenCL/m10100_a3-optimized.cl @@ -249,7 +249,7 @@ __kernel void m10100_m04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -287,7 +287,7 @@ __kernel void m10100_m08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -325,7 +325,7 @@ __kernel void m10100_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -363,7 +363,7 @@ __kernel void m10100_s04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -401,7 +401,7 @@ __kernel void m10100_s08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -439,7 +439,7 @@ __kernel void m10100_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m10400_a0-optimized.cl b/OpenCL/m10400_a0-optimized.cl index ba8046920..f74f233e8 100644 --- a/OpenCL/m10400_a0-optimized.cl +++ b/OpenCL/m10400_a0-optimized.cl @@ -164,7 +164,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10400_m04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -340,7 +340,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10400_s04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m10400_a3-optimized.cl b/OpenCL/m10400_a3-optimized.cl index 9c5439a9d..d962db48a 100644 --- a/OpenCL/m10400_a3-optimized.cl +++ b/OpenCL/m10400_a3-optimized.cl @@ -516,7 +516,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10400_m04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -565,7 +565,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10400_m08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -614,7 +614,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10400_m16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -663,7 +663,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10400_s04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -712,7 +712,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10400_s08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -761,7 +761,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10400_s16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m10410_a0-optimized.cl b/OpenCL/m10410_a0-optimized.cl index 90da45d07..d50247790 100644 --- a/OpenCL/m10410_a0-optimized.cl +++ b/OpenCL/m10410_a0-optimized.cl @@ -164,7 +164,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10410_m04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -236,7 +236,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10410_s04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m10410_a3-optimized.cl b/OpenCL/m10410_a3-optimized.cl index a217b05e9..94a4c408e 100644 --- a/OpenCL/m10410_a3-optimized.cl +++ b/OpenCL/m10410_a3-optimized.cl @@ -270,7 +270,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10410_m04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -319,7 +319,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10410_m08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -368,7 +368,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10410_m16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -417,7 +417,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10410_s04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -466,7 +466,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10410_s08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -515,7 +515,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10410_s16 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m10420_a0-optimized.cl b/OpenCL/m10420_a0-optimized.cl index beafdb188..38ef96a0a 100644 --- a/OpenCL/m10420_a0-optimized.cl +++ b/OpenCL/m10420_a0-optimized.cl @@ -55,7 +55,7 @@ __kernel void m10420_m04 (KERN_ATTR_RULES_ESALT (pdf_t)) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * U_buf @@ -216,7 +216,7 @@ __kernel void m10420_s04 (KERN_ATTR_RULES_ESALT (pdf_t)) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * U_buf diff --git a/OpenCL/m10420_a3-optimized.cl b/OpenCL/m10420_a3-optimized.cl index ec3609380..b9bd8965a 100644 --- a/OpenCL/m10420_a3-optimized.cl +++ b/OpenCL/m10420_a3-optimized.cl @@ -381,7 +381,7 @@ __kernel void m10420_m04 (KERN_ATTR_ESALT (pdf_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -428,7 +428,7 @@ __kernel void m10420_m08 (KERN_ATTR_ESALT (pdf_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -475,7 +475,7 @@ __kernel void m10420_m16 (KERN_ATTR_ESALT (pdf_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -522,7 +522,7 @@ __kernel void m10420_s04 (KERN_ATTR_ESALT (pdf_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -569,7 +569,7 @@ __kernel void m10420_s08 (KERN_ATTR_ESALT (pdf_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -616,7 +616,7 @@ __kernel void m10420_s16 (KERN_ATTR_ESALT (pdf_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m10500-pure.cl b/OpenCL/m10500-pure.cl index 4669f65ea..9903b3959 100644 --- a/OpenCL/m10500-pure.cl +++ b/OpenCL/m10500-pure.cl @@ -176,7 +176,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m10500_init (KERN_ w1[2] = pws[gid].i[ 6]; w1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * shared diff --git a/OpenCL/m10700-optimized.cl b/OpenCL/m10700-optimized.cl index 07093da7d..491fd0dee 100644 --- a/OpenCL/m10700-optimized.cl +++ b/OpenCL/m10700-optimized.cl @@ -599,7 +599,7 @@ __kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) w0[2] = pws[gid].i[2]; w0[3] = pws[gid].i[3]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; if (pw_len == 0) return; diff --git a/OpenCL/m10700-pure.cl b/OpenCL/m10700-pure.cl index 3a59d2a35..373faed69 100644 --- a/OpenCL/m10700-pure.cl +++ b/OpenCL/m10700-pure.cl @@ -1193,7 +1193,7 @@ __kernel void m10700_loop (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m10800_a0-optimized.cl b/OpenCL/m10800_a0-optimized.cl index f94978fb9..32535708b 100644 --- a/OpenCL/m10800_a0-optimized.cl +++ b/OpenCL/m10800_a0-optimized.cl @@ -165,7 +165,7 @@ __kernel void m10800_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -266,7 +266,7 @@ __kernel void m10800_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m10800_a3-optimized.cl b/OpenCL/m10800_a3-optimized.cl index 2eb378fbd..24917d66c 100644 --- a/OpenCL/m10800_a3-optimized.cl +++ b/OpenCL/m10800_a3-optimized.cl @@ -306,7 +306,7 @@ __kernel void m10800_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -344,7 +344,7 @@ __kernel void m10800_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -382,7 +382,7 @@ __kernel void m10800_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -420,7 +420,7 @@ __kernel void m10800_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -458,7 +458,7 @@ __kernel void m10800_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -496,7 +496,7 @@ __kernel void m10800_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m10800_a3-pure.cl b/OpenCL/m10800_a3-pure.cl index c0066cdae..e838945d8 100644 --- a/OpenCL/m10800_a3-pure.cl +++ b/OpenCL/m10800_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m10800_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m10800_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11000_a0-optimized.cl b/OpenCL/m11000_a0-optimized.cl index 8eda61a08..8616296bf 100644 --- a/OpenCL/m11000_a0-optimized.cl +++ b/OpenCL/m11000_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m11000_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -339,7 +339,7 @@ __kernel void m11000_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m11000_a3-optimized.cl b/OpenCL/m11000_a3-optimized.cl index efc5b35de..66adb85aa 100644 --- a/OpenCL/m11000_a3-optimized.cl +++ b/OpenCL/m11000_a3-optimized.cl @@ -592,7 +592,7 @@ __kernel void m11000_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -639,7 +639,7 @@ __kernel void m11000_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -686,7 +686,7 @@ __kernel void m11000_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -733,7 +733,7 @@ __kernel void m11000_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -780,7 +780,7 @@ __kernel void m11000_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -827,7 +827,7 @@ __kernel void m11000_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m11000_a3-pure.cl b/OpenCL/m11000_a3-pure.cl index 51c693343..f0c265e65 100644 --- a/OpenCL/m11000_a3-pure.cl +++ b/OpenCL/m11000_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m11000_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -101,7 +101,7 @@ __kernel void m11000_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11100_a0-optimized.cl b/OpenCL/m11100_a0-optimized.cl index 608476b3d..867153678 100644 --- a/OpenCL/m11100_a0-optimized.cl +++ b/OpenCL/m11100_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m11100_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * challenge @@ -405,7 +405,7 @@ __kernel void m11100_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * challenge diff --git a/OpenCL/m11100_a3-optimized.cl b/OpenCL/m11100_a3-optimized.cl index 4cbec19fd..997c70679 100644 --- a/OpenCL/m11100_a3-optimized.cl +++ b/OpenCL/m11100_a3-optimized.cl @@ -710,7 +710,7 @@ __kernel void m11100_m04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -780,7 +780,7 @@ __kernel void m11100_m08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -850,7 +850,7 @@ __kernel void m11100_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -920,7 +920,7 @@ __kernel void m11100_s04 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -990,7 +990,7 @@ __kernel void m11100_s08 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1060,7 +1060,7 @@ __kernel void m11100_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m11100_a3-pure.cl b/OpenCL/m11100_a3-pure.cl index 026faf7a5..1925c0fbc 100644 --- a/OpenCL/m11100_a3-pure.cl +++ b/OpenCL/m11100_a3-pure.cl @@ -80,7 +80,7 @@ __kernel void m11100_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -279,7 +279,7 @@ __kernel void m11100_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11200_a0-optimized.cl b/OpenCL/m11200_a0-optimized.cl index 274f99f5c..e7a19ec5c 100644 --- a/OpenCL/m11200_a0-optimized.cl +++ b/OpenCL/m11200_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m11200_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -504,7 +504,7 @@ __kernel void m11200_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m11200_a3-optimized.cl b/OpenCL/m11200_a3-optimized.cl index 2216d94b8..bfe19532d 100644 --- a/OpenCL/m11200_a3-optimized.cl +++ b/OpenCL/m11200_a3-optimized.cl @@ -926,7 +926,7 @@ __kernel void m11200_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -977,7 +977,7 @@ __kernel void m11200_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1028,7 +1028,7 @@ __kernel void m11200_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1079,7 +1079,7 @@ __kernel void m11200_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1130,7 +1130,7 @@ __kernel void m11200_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1181,7 +1181,7 @@ __kernel void m11200_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m11200_a3-pure.cl b/OpenCL/m11200_a3-pure.cl index 772959f47..a9463cc17 100644 --- a/OpenCL/m11200_a3-pure.cl +++ b/OpenCL/m11200_a3-pure.cl @@ -40,7 +40,7 @@ __kernel void m11200_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -181,7 +181,7 @@ __kernel void m11200_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11400_a3-pure.cl b/OpenCL/m11400_a3-pure.cl index 495c69d51..bfc78967b 100644 --- a/OpenCL/m11400_a3-pure.cl +++ b/OpenCL/m11400_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -190,7 +190,7 @@ __kernel void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11500_a0-optimized.cl b/OpenCL/m11500_a0-optimized.cl index 10998d560..d812318ec 100644 --- a/OpenCL/m11500_a0-optimized.cl +++ b/OpenCL/m11500_a0-optimized.cl @@ -154,7 +154,7 @@ __kernel void m11500_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -242,7 +242,7 @@ __kernel void m11500_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m11500_a3-optimized.cl b/OpenCL/m11500_a3-optimized.cl index 64a5c6cc8..bca699713 100644 --- a/OpenCL/m11500_a3-optimized.cl +++ b/OpenCL/m11500_a3-optimized.cl @@ -281,7 +281,7 @@ __kernel void m11500_m04 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -319,7 +319,7 @@ __kernel void m11500_m08 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -357,7 +357,7 @@ __kernel void m11500_m16 (KERN_ATTR_BASIC ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -395,7 +395,7 @@ __kernel void m11500_s04 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -433,7 +433,7 @@ __kernel void m11500_s08 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -471,7 +471,7 @@ __kernel void m11500_s16 (KERN_ATTR_BASIC ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m11600-pure.cl b/OpenCL/m11600-pure.cl index c22df6156..795821509 100644 --- a/OpenCL/m11600-pure.cl +++ b/OpenCL/m11600-pure.cl @@ -168,7 +168,7 @@ __kernel void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook if (gid >= gid_max) return; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m11700_a0-optimized.cl b/OpenCL/m11700_a0-optimized.cl index f32d361c4..35eaab118 100644 --- a/OpenCL/m11700_a0-optimized.cl +++ b/OpenCL/m11700_a0-optimized.cl @@ -2349,7 +2349,7 @@ __kernel void m11700_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -2507,7 +2507,7 @@ __kernel void m11700_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m11700_a3-optimized.cl b/OpenCL/m11700_a3-optimized.cl index bbc8797d6..d3726fc88 100644 --- a/OpenCL/m11700_a3-optimized.cl +++ b/OpenCL/m11700_a3-optimized.cl @@ -2523,7 +2523,7 @@ __kernel void m11700_m04 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2587,7 +2587,7 @@ __kernel void m11700_m08 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2651,7 +2651,7 @@ __kernel void m11700_m16 (KERN_ATTR_BASIC ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2715,7 +2715,7 @@ __kernel void m11700_s04 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2779,7 +2779,7 @@ __kernel void m11700_s08 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2843,7 +2843,7 @@ __kernel void m11700_s16 (KERN_ATTR_BASIC ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m11700_a3-pure.cl b/OpenCL/m11700_a3-pure.cl index 1fe36c054..a9fa565ae 100644 --- a/OpenCL/m11700_a3-pure.cl +++ b/OpenCL/m11700_a3-pure.cl @@ -57,7 +57,7 @@ __kernel void m11700_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -153,7 +153,7 @@ __kernel void m11700_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11750_a1-pure.cl b/OpenCL/m11750_a1-pure.cl index 8210d3cf7..5d2f912d8 100644 --- a/OpenCL/m11750_a1-pure.cl +++ b/OpenCL/m11750_a1-pure.cl @@ -57,7 +57,7 @@ __kernel void m11750_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -176,7 +176,7 @@ __kernel void m11750_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m11750_a3-pure.cl b/OpenCL/m11750_a3-pure.cl index 9a43338e9..2f62e6a33 100644 --- a/OpenCL/m11750_a3-pure.cl +++ b/OpenCL/m11750_a3-pure.cl @@ -57,7 +57,7 @@ __kernel void m11750_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -162,7 +162,7 @@ __kernel void m11750_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11760_a1-pure.cl b/OpenCL/m11760_a1-pure.cl index 2227d7507..5b2300119 100644 --- a/OpenCL/m11760_a1-pure.cl +++ b/OpenCL/m11760_a1-pure.cl @@ -57,7 +57,7 @@ __kernel void m11760_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -178,7 +178,7 @@ __kernel void m11760_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m11760_a3-pure.cl b/OpenCL/m11760_a3-pure.cl index b24c1ab0e..2693c8e02 100644 --- a/OpenCL/m11760_a3-pure.cl +++ b/OpenCL/m11760_a3-pure.cl @@ -57,7 +57,7 @@ __kernel void m11760_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -164,7 +164,7 @@ __kernel void m11760_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11800_a0-optimized.cl b/OpenCL/m11800_a0-optimized.cl index bea9f3bbf..c88c73123 100644 --- a/OpenCL/m11800_a0-optimized.cl +++ b/OpenCL/m11800_a0-optimized.cl @@ -2349,7 +2349,7 @@ __kernel void m11800_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -2507,7 +2507,7 @@ __kernel void m11800_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m11800_a3-optimized.cl b/OpenCL/m11800_a3-optimized.cl index 229717813..4fb04f270 100644 --- a/OpenCL/m11800_a3-optimized.cl +++ b/OpenCL/m11800_a3-optimized.cl @@ -2523,7 +2523,7 @@ __kernel void m11800_m04 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2587,7 +2587,7 @@ __kernel void m11800_m08 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2651,7 +2651,7 @@ __kernel void m11800_m16 (KERN_ATTR_BASIC ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2715,7 +2715,7 @@ __kernel void m11800_s04 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2779,7 +2779,7 @@ __kernel void m11800_s08 (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -2843,7 +2843,7 @@ __kernel void m11800_s16 (KERN_ATTR_BASIC ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m11800_a3-pure.cl b/OpenCL/m11800_a3-pure.cl index 45bf2052d..e00ed9210 100644 --- a/OpenCL/m11800_a3-pure.cl +++ b/OpenCL/m11800_a3-pure.cl @@ -57,7 +57,7 @@ __kernel void m11800_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -153,7 +153,7 @@ __kernel void m11800_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11850_a1-pure.cl b/OpenCL/m11850_a1-pure.cl index 3ee23e052..b0c1f87dd 100644 --- a/OpenCL/m11850_a1-pure.cl +++ b/OpenCL/m11850_a1-pure.cl @@ -57,7 +57,7 @@ __kernel void m11850_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -176,7 +176,7 @@ __kernel void m11850_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m11850_a3-pure.cl b/OpenCL/m11850_a3-pure.cl index 35c83ff2d..3a9d8e6e5 100644 --- a/OpenCL/m11850_a3-pure.cl +++ b/OpenCL/m11850_a3-pure.cl @@ -57,7 +57,7 @@ __kernel void m11850_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -162,7 +162,7 @@ __kernel void m11850_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m11860_a1-pure.cl b/OpenCL/m11860_a1-pure.cl index e5ef2ab56..c3d29d76c 100644 --- a/OpenCL/m11860_a1-pure.cl +++ b/OpenCL/m11860_a1-pure.cl @@ -57,7 +57,7 @@ __kernel void m11860_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -178,7 +178,7 @@ __kernel void m11860_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m11860_a3-pure.cl b/OpenCL/m11860_a3-pure.cl index 36d9a9a0b..b2f98d141 100644 --- a/OpenCL/m11860_a3-pure.cl +++ b/OpenCL/m11860_a3-pure.cl @@ -57,7 +57,7 @@ __kernel void m11860_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -164,7 +164,7 @@ __kernel void m11860_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m12400-pure.cl b/OpenCL/m12400-pure.cl index 5f46703ed..7e05a148c 100644 --- a/OpenCL/m12400-pure.cl +++ b/OpenCL/m12400-pure.cl @@ -535,7 +535,7 @@ __kernel void m12400_init (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) * word */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m12500-pure.cl b/OpenCL/m12500-pure.cl index 9dd41da1b..c1bfe342b 100644 --- a/OpenCL/m12500-pure.cl +++ b/OpenCL/m12500-pure.cl @@ -403,7 +403,7 @@ __kernel void m12500_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) pw_buf[3] = pws[gid].i[3]; pw_buf[4] = pws[gid].i[4]; - //const u32 pw_len = pws[gid].pw_len; + //const u32 pw_len = pws[gid].pw_len & 255; u32 salt_buf[2]; diff --git a/OpenCL/m12600_a0-optimized.cl b/OpenCL/m12600_a0-optimized.cl index 32a8e53af..71eadc52b 100644 --- a/OpenCL/m12600_a0-optimized.cl +++ b/OpenCL/m12600_a0-optimized.cl @@ -71,7 +71,7 @@ __kernel void m12600_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -411,7 +411,7 @@ __kernel void m12600_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m12600_a3-optimized.cl b/OpenCL/m12600_a3-optimized.cl index bbf7ec065..f7aebe71c 100644 --- a/OpenCL/m12600_a3-optimized.cl +++ b/OpenCL/m12600_a3-optimized.cl @@ -682,7 +682,7 @@ __kernel void m12600_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -752,7 +752,7 @@ __kernel void m12600_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -822,7 +822,7 @@ __kernel void m12600_m16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -892,7 +892,7 @@ __kernel void m12600_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -962,7 +962,7 @@ __kernel void m12600_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1032,7 +1032,7 @@ __kernel void m12600_s16 (KERN_ATTR_BASIC ()) w3[2] = pws[gid].i[14]; w3[3] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m12600_a3-pure.cl b/OpenCL/m12600_a3-pure.cl index 38e4cae4d..57da1c8ab 100644 --- a/OpenCL/m12600_a3-pure.cl +++ b/OpenCL/m12600_a3-pure.cl @@ -74,7 +74,7 @@ __kernel void m12600_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -233,7 +233,7 @@ __kernel void m12600_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m13100_a0-optimized.cl b/OpenCL/m13100_a0-optimized.cl index 0d3417a51..e61092d08 100644 --- a/OpenCL/m13100_a0-optimized.cl +++ b/OpenCL/m13100_a0-optimized.cl @@ -594,7 +594,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m13100_m04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -692,7 +692,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m13100_s04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m13100_a3-optimized.cl b/OpenCL/m13100_a3-optimized.cl index d41655c2f..765af9622 100644 --- a/OpenCL/m13100_a3-optimized.cl +++ b/OpenCL/m13100_a3-optimized.cl @@ -661,7 +661,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m13100_m04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -713,7 +713,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m13100_m08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -769,7 +769,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m13100_s04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -821,7 +821,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m13100_s08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m13100_a3-pure.cl b/OpenCL/m13100_a3-pure.cl index 114f11017..ea01073f5 100644 --- a/OpenCL/m13100_a3-pure.cl +++ b/OpenCL/m13100_a3-pure.cl @@ -390,7 +390,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m13100_mxx (KERN_A * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -463,7 +463,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m13100_sxx (KERN_A * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m13300_a0-optimized.cl b/OpenCL/m13300_a0-optimized.cl index b87dbf996..c12570d31 100644 --- a/OpenCL/m13300_a0-optimized.cl +++ b/OpenCL/m13300_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m13300_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -229,7 +229,7 @@ __kernel void m13300_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m13300_a3-optimized.cl b/OpenCL/m13300_a3-optimized.cl index 7ad3ce535..8bfb88b14 100644 --- a/OpenCL/m13300_a3-optimized.cl +++ b/OpenCL/m13300_a3-optimized.cl @@ -555,7 +555,7 @@ __kernel void m13300_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -593,7 +593,7 @@ __kernel void m13300_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -631,7 +631,7 @@ __kernel void m13300_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -669,7 +669,7 @@ __kernel void m13300_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -707,7 +707,7 @@ __kernel void m13300_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -745,7 +745,7 @@ __kernel void m13300_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m13300_a3-pure.cl b/OpenCL/m13300_a3-pure.cl index 4d1d278a5..dd430b206 100644 --- a/OpenCL/m13300_a3-pure.cl +++ b/OpenCL/m13300_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m13300_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -97,7 +97,7 @@ __kernel void m13300_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m13500_a0-optimized.cl b/OpenCL/m13500_a0-optimized.cl index 8b7f2f52e..0c553ec56 100644 --- a/OpenCL/m13500_a0-optimized.cl +++ b/OpenCL/m13500_a0-optimized.cl @@ -43,7 +43,7 @@ __kernel void m13500_m04 (KERN_ATTR_RULES_ESALT (pstoken_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -468,7 +468,7 @@ __kernel void m13500_s04 (KERN_ATTR_RULES_ESALT (pstoken_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m13500_a3-optimized.cl b/OpenCL/m13500_a3-optimized.cl index ecf7b47b7..974bee9a6 100644 --- a/OpenCL/m13500_a3-optimized.cl +++ b/OpenCL/m13500_a3-optimized.cl @@ -849,7 +849,7 @@ __kernel void m13500_m04 (KERN_ATTR_ESALT (pstoken_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -896,7 +896,7 @@ __kernel void m13500_m08 (KERN_ATTR_ESALT (pstoken_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -943,7 +943,7 @@ __kernel void m13500_m16 (KERN_ATTR_ESALT (pstoken_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -990,7 +990,7 @@ __kernel void m13500_s04 (KERN_ATTR_ESALT (pstoken_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1037,7 +1037,7 @@ __kernel void m13500_s08 (KERN_ATTR_ESALT (pstoken_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1084,7 +1084,7 @@ __kernel void m13500_s16 (KERN_ATTR_ESALT (pstoken_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m13500_a3-pure.cl b/OpenCL/m13500_a3-pure.cl index 26af0447a..e877c0d6a 100644 --- a/OpenCL/m13500_a3-pure.cl +++ b/OpenCL/m13500_a3-pure.cl @@ -61,7 +61,7 @@ __kernel void m13500_mxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -161,7 +161,7 @@ __kernel void m13500_sxx (KERN_ATTR_VECTOR_ESALT (pstoken_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m13800_a0-optimized.cl b/OpenCL/m13800_a0-optimized.cl index 157cf3cb6..ce2aae680 100644 --- a/OpenCL/m13800_a0-optimized.cl +++ b/OpenCL/m13800_a0-optimized.cl @@ -422,7 +422,7 @@ __kernel void m13800_m04 (KERN_ATTR_RULES_ESALT (win8phone_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -618,7 +618,7 @@ __kernel void m13800_s04 (KERN_ATTR_RULES_ESALT (win8phone_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m13800_a3-optimized.cl b/OpenCL/m13800_a3-optimized.cl index 4cf66628a..8fddc0dc7 100644 --- a/OpenCL/m13800_a3-optimized.cl +++ b/OpenCL/m13800_a3-optimized.cl @@ -734,7 +734,7 @@ __kernel void m13800_m04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -791,7 +791,7 @@ __kernel void m13800_m08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -848,7 +848,7 @@ __kernel void m13800_m16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -905,7 +905,7 @@ __kernel void m13800_s04 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -962,7 +962,7 @@ __kernel void m13800_s08 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -1019,7 +1019,7 @@ __kernel void m13800_s16 (KERN_ATTR_VECTOR_ESALT (win8phone_t)) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m13800_a3-pure.cl b/OpenCL/m13800_a3-pure.cl index 2a0de8d04..70189c18d 100644 --- a/OpenCL/m13800_a3-pure.cl +++ b/OpenCL/m13800_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m13800_mxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m13800_sxx (KERN_ATTR_VECTOR_ESALT (win8phone_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m13900_a0-optimized.cl b/OpenCL/m13900_a0-optimized.cl index dbed4bda0..1a9901bb8 100644 --- a/OpenCL/m13900_a0-optimized.cl +++ b/OpenCL/m13900_a0-optimized.cl @@ -72,7 +72,7 @@ __kernel void m13900_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -299,7 +299,7 @@ __kernel void m13900_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m13900_a3-optimized.cl b/OpenCL/m13900_a3-optimized.cl index 8bb15fae0..fdbe278d3 100644 --- a/OpenCL/m13900_a3-optimized.cl +++ b/OpenCL/m13900_a3-optimized.cl @@ -475,7 +475,7 @@ __kernel void m13900_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -545,7 +545,7 @@ __kernel void m13900_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -615,7 +615,7 @@ __kernel void m13900_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -685,7 +685,7 @@ __kernel void m13900_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -755,7 +755,7 @@ __kernel void m13900_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -825,7 +825,7 @@ __kernel void m13900_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m13900_a3-pure.cl b/OpenCL/m13900_a3-pure.cl index 8b390d65a..1637c94aa 100644 --- a/OpenCL/m13900_a3-pure.cl +++ b/OpenCL/m13900_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m13900_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -236,7 +236,7 @@ __kernel void m13900_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m14000_a0-pure.cl b/OpenCL/m14000_a0-pure.cl index 473207f68..4e5fb29e3 100644 --- a/OpenCL/m14000_a0-pure.cl +++ b/OpenCL/m14000_a0-pure.cl @@ -554,7 +554,7 @@ __kernel void m14000_mxx (KERN_ATTR_RULES ()) pw_buf1[2] = 0; pw_buf1[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * salt @@ -659,7 +659,7 @@ __kernel void m14000_sxx (KERN_ATTR_RULES ()) pw_buf1[2] = 0; pw_buf1[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * salt diff --git a/OpenCL/m14100_a0-pure.cl b/OpenCL/m14100_a0-pure.cl index 76ea4c268..676d34fe1 100644 --- a/OpenCL/m14100_a0-pure.cl +++ b/OpenCL/m14100_a0-pure.cl @@ -598,7 +598,7 @@ __kernel void m14100_mxx (KERN_ATTR_RULES ()) pw_buf1[2] = 0; pw_buf1[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * salt @@ -733,7 +733,7 @@ __kernel void m14100_sxx (KERN_ATTR_RULES ()) pw_buf1[2] = 0; pw_buf1[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * salt diff --git a/OpenCL/m14100_a3-pure.cl b/OpenCL/m14100_a3-pure.cl index 034f7416d..470b6d8f5 100644 --- a/OpenCL/m14100_a3-pure.cl +++ b/OpenCL/m14100_a3-pure.cl @@ -777,7 +777,7 @@ __kernel void m14100_mxx (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * main @@ -851,7 +851,7 @@ __kernel void m14100_sxx (KERN_ATTR_BASIC ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * main diff --git a/OpenCL/m14400_a0-optimized.cl b/OpenCL/m14400_a0-optimized.cl index db3c822d9..e8c7c80b4 100644 --- a/OpenCL/m14400_a0-optimized.cl +++ b/OpenCL/m14400_a0-optimized.cl @@ -162,7 +162,7 @@ __kernel void m14400_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -433,7 +433,7 @@ __kernel void m14400_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m14400_a3-optimized.cl b/OpenCL/m14400_a3-optimized.cl index e6d76facf..7894fb7f6 100644 --- a/OpenCL/m14400_a3-optimized.cl +++ b/OpenCL/m14400_a3-optimized.cl @@ -688,7 +688,7 @@ __kernel void m14400_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -758,7 +758,7 @@ __kernel void m14400_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -828,7 +828,7 @@ __kernel void m14400_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -898,7 +898,7 @@ __kernel void m14400_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -968,7 +968,7 @@ __kernel void m14400_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -1038,7 +1038,7 @@ __kernel void m14400_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m14400_a3-pure.cl b/OpenCL/m14400_a3-pure.cl index 2f2eacec5..8cef4b8a1 100644 --- a/OpenCL/m14400_a3-pure.cl +++ b/OpenCL/m14400_a3-pure.cl @@ -58,7 +58,7 @@ __kernel void m14400_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -340,7 +340,7 @@ __kernel void m14400_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m14900_a0-optimized.cl b/OpenCL/m14900_a0-optimized.cl index e5b3e32e7..91b656e6f 100644 --- a/OpenCL/m14900_a0-optimized.cl +++ b/OpenCL/m14900_a0-optimized.cl @@ -145,7 +145,7 @@ __kernel void m14900_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -236,7 +236,7 @@ __kernel void m14900_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m14900_a3-optimized.cl b/OpenCL/m14900_a3-optimized.cl index 29bc56c0b..1d7e5940d 100644 --- a/OpenCL/m14900_a3-optimized.cl +++ b/OpenCL/m14900_a3-optimized.cl @@ -267,7 +267,7 @@ __kernel void m14900_m04 (KERN_ATTR_ESALT (oldoffice01_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -341,7 +341,7 @@ __kernel void m14900_s04 (KERN_ATTR_ESALT (oldoffice01_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m15000_a0-optimized.cl b/OpenCL/m15000_a0-optimized.cl index 58669990a..c299a438a 100644 --- a/OpenCL/m15000_a0-optimized.cl +++ b/OpenCL/m15000_a0-optimized.cl @@ -165,7 +165,7 @@ __kernel void m15000_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -370,7 +370,7 @@ __kernel void m15000_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m15000_a3-optimized.cl b/OpenCL/m15000_a3-optimized.cl index 71269264c..58a7e82b0 100644 --- a/OpenCL/m15000_a3-optimized.cl +++ b/OpenCL/m15000_a3-optimized.cl @@ -498,7 +498,7 @@ __kernel void m15000_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -536,7 +536,7 @@ __kernel void m15000_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -574,7 +574,7 @@ __kernel void m15000_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -612,7 +612,7 @@ __kernel void m15000_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -650,7 +650,7 @@ __kernel void m15000_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -688,7 +688,7 @@ __kernel void m15000_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m15000_a3-pure.cl b/OpenCL/m15000_a3-pure.cl index 66d4214a4..b58dfbf8a 100644 --- a/OpenCL/m15000_a3-pure.cl +++ b/OpenCL/m15000_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m15000_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -106,7 +106,7 @@ __kernel void m15000_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m15400_a0-optimized.cl b/OpenCL/m15400_a0-optimized.cl index cc3bb0280..2e5e7536c 100644 --- a/OpenCL/m15400_a0-optimized.cl +++ b/OpenCL/m15400_a0-optimized.cl @@ -219,7 +219,7 @@ __kernel void m15400_m04 (KERN_ATTR_RULES_ESALT (chacha20_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * Salt prep @@ -297,7 +297,7 @@ __kernel void m15400_s04 (KERN_ATTR_RULES_ESALT (chacha20_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * Salt prep diff --git a/OpenCL/m15500_a0-optimized.cl b/OpenCL/m15500_a0-optimized.cl index c57bb173e..06e28f417 100644 --- a/OpenCL/m15500_a0-optimized.cl +++ b/OpenCL/m15500_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m15500_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -298,7 +298,7 @@ __kernel void m15500_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m15500_a3-optimized.cl b/OpenCL/m15500_a3-optimized.cl index 9b0379638..6271ba80d 100644 --- a/OpenCL/m15500_a3-optimized.cl +++ b/OpenCL/m15500_a3-optimized.cl @@ -613,7 +613,7 @@ __kernel void m15500_m04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -651,7 +651,7 @@ __kernel void m15500_m08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -689,7 +689,7 @@ __kernel void m15500_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -727,7 +727,7 @@ __kernel void m15500_s04 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -765,7 +765,7 @@ __kernel void m15500_s08 (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -803,7 +803,7 @@ __kernel void m15500_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m15500_a3-pure.cl b/OpenCL/m15500_a3-pure.cl index 65e39a16d..975212087 100644 --- a/OpenCL/m15500_a3-pure.cl +++ b/OpenCL/m15500_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m15500_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -112,7 +112,7 @@ __kernel void m15500_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m16000_a3-pure.cl b/OpenCL/m16000_a3-pure.cl index 42d3699b5..2ab67e012 100644 --- a/OpenCL/m16000_a3-pure.cl +++ b/OpenCL/m16000_a3-pure.cl @@ -563,7 +563,7 @@ __kernel void m16000_mxx (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * loop @@ -684,7 +684,7 @@ __kernel void m16000_sxx (KERN_ATTR_VECTOR ()) w[14] = 0; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; /** * digest diff --git a/OpenCL/m16100_a0-optimized.cl b/OpenCL/m16100_a0-optimized.cl index 038630b78..be6caa422 100644 --- a/OpenCL/m16100_a0-optimized.cl +++ b/OpenCL/m16100_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m16100_m04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt @@ -327,7 +327,7 @@ __kernel void m16100_s04 (KERN_ATTR_RULES_ESALT (tacacs_plus_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * salt diff --git a/OpenCL/m16100_a3-optimized.cl b/OpenCL/m16100_a3-optimized.cl index 20bfb2b02..8d41f0640 100644 --- a/OpenCL/m16100_a3-optimized.cl +++ b/OpenCL/m16100_a3-optimized.cl @@ -556,7 +556,7 @@ __kernel void m16100_m04 (KERN_ATTR_ESALT (tacacs_plus_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -603,7 +603,7 @@ __kernel void m16100_m08 (KERN_ATTR_ESALT (tacacs_plus_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -650,7 +650,7 @@ __kernel void m16100_m16 (KERN_ATTR_ESALT (tacacs_plus_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -697,7 +697,7 @@ __kernel void m16100_s04 (KERN_ATTR_ESALT (tacacs_plus_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -744,7 +744,7 @@ __kernel void m16100_s08 (KERN_ATTR_ESALT (tacacs_plus_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -791,7 +791,7 @@ __kernel void m16100_s16 (KERN_ATTR_ESALT (tacacs_plus_t)) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m16100_a3-pure.cl b/OpenCL/m16100_a3-pure.cl index 3133b5c8b..13d5e5fc4 100644 --- a/OpenCL/m16100_a3-pure.cl +++ b/OpenCL/m16100_a3-pure.cl @@ -27,7 +27,7 @@ __kernel void m16100_mxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -202,7 +202,7 @@ __kernel void m16100_sxx (KERN_ATTR_VECTOR_ESALT (tacacs_plus_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m16400_a0-optimized.cl b/OpenCL/m16400_a0-optimized.cl index 6a4406d76..ad4c701d1 100644 --- a/OpenCL/m16400_a0-optimized.cl +++ b/OpenCL/m16400_a0-optimized.cl @@ -42,7 +42,7 @@ __kernel void m16400_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -189,7 +189,7 @@ __kernel void m16400_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m16400_a3-optimized.cl b/OpenCL/m16400_a3-optimized.cl index b26e4abbf..2bec4f59d 100644 --- a/OpenCL/m16400_a3-optimized.cl +++ b/OpenCL/m16400_a3-optimized.cl @@ -497,7 +497,7 @@ __kernel void m16400_m04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -535,7 +535,7 @@ __kernel void m16400_m08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -573,7 +573,7 @@ __kernel void m16400_m16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -611,7 +611,7 @@ __kernel void m16400_s04 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -649,7 +649,7 @@ __kernel void m16400_s08 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -687,7 +687,7 @@ __kernel void m16400_s16 (KERN_ATTR_VECTOR ()) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m16400_a3-pure.cl b/OpenCL/m16400_a3-pure.cl index a39bf0039..cc7124940 100644 --- a/OpenCL/m16400_a3-pure.cl +++ b/OpenCL/m16400_a3-pure.cl @@ -191,7 +191,7 @@ __kernel void m16400_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -258,7 +258,7 @@ __kernel void m16400_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m16511_a1-pure.cl b/OpenCL/m16511_a1-pure.cl index 742b6dc39..dfaf574da 100644 --- a/OpenCL/m16511_a1-pure.cl +++ b/OpenCL/m16511_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m16511_mxx (KERN_ATTR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -109,7 +109,7 @@ __kernel void m16511_sxx (KERN_ATTR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m16511_a3-pure.cl b/OpenCL/m16511_a3-pure.cl index 8cef28d2c..22ad5c2cc 100644 --- a/OpenCL/m16511_a3-pure.cl +++ b/OpenCL/m16511_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m16511_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m16511_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m16512_a1-pure.cl b/OpenCL/m16512_a1-pure.cl index 2ce9234ae..ffca22675 100644 --- a/OpenCL/m16512_a1-pure.cl +++ b/OpenCL/m16512_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m16512_mxx (KERN_ATTR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -109,7 +109,7 @@ __kernel void m16512_sxx (KERN_ATTR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m16512_a3-pure.cl b/OpenCL/m16512_a3-pure.cl index 0df0be7f5..7ac2218c6 100644 --- a/OpenCL/m16512_a3-pure.cl +++ b/OpenCL/m16512_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m16512_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m16512_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m16513_a1-pure.cl b/OpenCL/m16513_a1-pure.cl index 8d1f7717d..1891bd3e8 100644 --- a/OpenCL/m16513_a1-pure.cl +++ b/OpenCL/m16513_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m16513_mxx (KERN_ATTR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -109,7 +109,7 @@ __kernel void m16513_sxx (KERN_ATTR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m16513_a3-pure.cl b/OpenCL/m16513_a3-pure.cl index 5fb4445f1..76e6958ec 100644 --- a/OpenCL/m16513_a3-pure.cl +++ b/OpenCL/m16513_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m16513_mxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -95,7 +95,7 @@ __kernel void m16513_sxx (KERN_ATTR_VECTOR_ESALT (jwt_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m16600_a0-optimized.cl b/OpenCL/m16600_a0-optimized.cl index 562cfde91..c71a4327f 100644 --- a/OpenCL/m16600_a0-optimized.cl +++ b/OpenCL/m16600_a0-optimized.cl @@ -94,7 +94,7 @@ __kernel void m16600_m04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -463,7 +463,7 @@ __kernel void m16600_s04 (KERN_ATTR_RULES_ESALT (electrum_wallet_t)) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop diff --git a/OpenCL/m16600_a3-optimized.cl b/OpenCL/m16600_a3-optimized.cl index 371f444d7..2b8f4569f 100644 --- a/OpenCL/m16600_a3-optimized.cl +++ b/OpenCL/m16600_a3-optimized.cl @@ -380,7 +380,7 @@ __kernel void m16600_m04 (KERN_ATTR_ESALT (electrum_wallet_t)) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -475,7 +475,7 @@ __kernel void m16600_m08 (KERN_ATTR_ESALT (electrum_wallet_t)) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -570,7 +570,7 @@ __kernel void m16600_m16 (KERN_ATTR_ESALT (electrum_wallet_t)) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -665,7 +665,7 @@ __kernel void m16600_s04 (KERN_ATTR_ESALT (electrum_wallet_t)) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -760,7 +760,7 @@ __kernel void m16600_s08 (KERN_ATTR_ESALT (electrum_wallet_t)) w[14] = 0; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -855,7 +855,7 @@ __kernel void m16600_s16 (KERN_ATTR_ESALT (electrum_wallet_t)) w[14] = pws[gid].i[14]; w[15] = pws[gid].i[15]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m16600_a3-pure.cl b/OpenCL/m16600_a3-pure.cl index 833b0e27e..5c1791fd6 100644 --- a/OpenCL/m16600_a3-pure.cl +++ b/OpenCL/m16600_a3-pure.cl @@ -81,7 +81,7 @@ __kernel void m16600_mxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -267,7 +267,7 @@ __kernel void m16600_sxx (KERN_ATTR_VECTOR_ESALT (electrum_wallet_t)) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m17300_a0-optimized.cl b/OpenCL/m17300_a0-optimized.cl index 5c5050ef7..eb245b351 100644 --- a/OpenCL/m17300_a0-optimized.cl +++ b/OpenCL/m17300_a0-optimized.cl @@ -58,7 +58,7 @@ __kernel void m17300_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -276,7 +276,7 @@ __kernel void m17300_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m17300_a3-optimized.cl b/OpenCL/m17300_a3-optimized.cl index 37ff19853..8e76e6078 100644 --- a/OpenCL/m17300_a3-optimized.cl +++ b/OpenCL/m17300_a3-optimized.cl @@ -450,7 +450,7 @@ __kernel void m17300_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -497,7 +497,7 @@ __kernel void m17300_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -544,7 +544,7 @@ __kernel void m17300_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -591,7 +591,7 @@ __kernel void m17300_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -638,7 +638,7 @@ __kernel void m17300_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -685,7 +685,7 @@ __kernel void m17300_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m17400_a0-optimized.cl b/OpenCL/m17400_a0-optimized.cl index 59e6b213f..d607a0162 100644 --- a/OpenCL/m17400_a0-optimized.cl +++ b/OpenCL/m17400_a0-optimized.cl @@ -58,7 +58,7 @@ __kernel void m17400_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -276,7 +276,7 @@ __kernel void m17400_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m17400_a3-optimized.cl b/OpenCL/m17400_a3-optimized.cl index 4da397c9e..0fa4e7cff 100644 --- a/OpenCL/m17400_a3-optimized.cl +++ b/OpenCL/m17400_a3-optimized.cl @@ -451,7 +451,7 @@ __kernel void m17400_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -498,7 +498,7 @@ __kernel void m17400_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -545,7 +545,7 @@ __kernel void m17400_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -592,7 +592,7 @@ __kernel void m17400_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -639,7 +639,7 @@ __kernel void m17400_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -686,7 +686,7 @@ __kernel void m17400_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m17500_a0-optimized.cl b/OpenCL/m17500_a0-optimized.cl index 8ce400478..f18971bf6 100644 --- a/OpenCL/m17500_a0-optimized.cl +++ b/OpenCL/m17500_a0-optimized.cl @@ -58,7 +58,7 @@ __kernel void m17500_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -276,7 +276,7 @@ __kernel void m17500_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m17500_a3-optimized.cl b/OpenCL/m17500_a3-optimized.cl index c7188c92b..352f8d114 100644 --- a/OpenCL/m17500_a3-optimized.cl +++ b/OpenCL/m17500_a3-optimized.cl @@ -450,7 +450,7 @@ __kernel void m17500_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -497,7 +497,7 @@ __kernel void m17500_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -544,7 +544,7 @@ __kernel void m17500_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -591,7 +591,7 @@ __kernel void m17500_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -638,7 +638,7 @@ __kernel void m17500_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -685,7 +685,7 @@ __kernel void m17500_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m17600_a0-optimized.cl b/OpenCL/m17600_a0-optimized.cl index 947ccac83..fdc5d7894 100644 --- a/OpenCL/m17600_a0-optimized.cl +++ b/OpenCL/m17600_a0-optimized.cl @@ -58,7 +58,7 @@ __kernel void m17600_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -276,7 +276,7 @@ __kernel void m17600_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m17600_a3-optimized.cl b/OpenCL/m17600_a3-optimized.cl index 660e539d0..6748161aa 100644 --- a/OpenCL/m17600_a3-optimized.cl +++ b/OpenCL/m17600_a3-optimized.cl @@ -451,7 +451,7 @@ __kernel void m17600_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -498,7 +498,7 @@ __kernel void m17600_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -545,7 +545,7 @@ __kernel void m17600_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -592,7 +592,7 @@ __kernel void m17600_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -639,7 +639,7 @@ __kernel void m17600_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -686,7 +686,7 @@ __kernel void m17600_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m17700_a0-optimized.cl b/OpenCL/m17700_a0-optimized.cl index bd7a48eba..25a1a5e64 100644 --- a/OpenCL/m17700_a0-optimized.cl +++ b/OpenCL/m17700_a0-optimized.cl @@ -58,7 +58,7 @@ __kernel void m17700_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -276,7 +276,7 @@ __kernel void m17700_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m17700_a3-optimized.cl b/OpenCL/m17700_a3-optimized.cl index 603d30a56..1a669072f 100644 --- a/OpenCL/m17700_a3-optimized.cl +++ b/OpenCL/m17700_a3-optimized.cl @@ -450,7 +450,7 @@ __kernel void m17700_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -497,7 +497,7 @@ __kernel void m17700_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -544,7 +544,7 @@ __kernel void m17700_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -591,7 +591,7 @@ __kernel void m17700_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -638,7 +638,7 @@ __kernel void m17700_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -685,7 +685,7 @@ __kernel void m17700_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m17800_a0-optimized.cl b/OpenCL/m17800_a0-optimized.cl index c06bbd977..337b1b473 100644 --- a/OpenCL/m17800_a0-optimized.cl +++ b/OpenCL/m17800_a0-optimized.cl @@ -58,7 +58,7 @@ __kernel void m17800_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -276,7 +276,7 @@ __kernel void m17800_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m17800_a3-optimized.cl b/OpenCL/m17800_a3-optimized.cl index 8e8a80785..e0bf382a8 100644 --- a/OpenCL/m17800_a3-optimized.cl +++ b/OpenCL/m17800_a3-optimized.cl @@ -450,7 +450,7 @@ __kernel void m17800_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -497,7 +497,7 @@ __kernel void m17800_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -544,7 +544,7 @@ __kernel void m17800_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -591,7 +591,7 @@ __kernel void m17800_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -638,7 +638,7 @@ __kernel void m17800_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -685,7 +685,7 @@ __kernel void m17800_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m17900_a0-optimized.cl b/OpenCL/m17900_a0-optimized.cl index 377a2a2a0..479583d16 100644 --- a/OpenCL/m17900_a0-optimized.cl +++ b/OpenCL/m17900_a0-optimized.cl @@ -58,7 +58,7 @@ __kernel void m17900_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -276,7 +276,7 @@ __kernel void m17900_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m17900_a3-optimized.cl b/OpenCL/m17900_a3-optimized.cl index a1eabb2ea..6d940be95 100644 --- a/OpenCL/m17900_a3-optimized.cl +++ b/OpenCL/m17900_a3-optimized.cl @@ -450,7 +450,7 @@ __kernel void m17900_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -497,7 +497,7 @@ __kernel void m17900_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -544,7 +544,7 @@ __kernel void m17900_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -591,7 +591,7 @@ __kernel void m17900_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -638,7 +638,7 @@ __kernel void m17900_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -685,7 +685,7 @@ __kernel void m17900_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m18000_a0-optimized.cl b/OpenCL/m18000_a0-optimized.cl index 58860032f..4207b1de6 100644 --- a/OpenCL/m18000_a0-optimized.cl +++ b/OpenCL/m18000_a0-optimized.cl @@ -58,7 +58,7 @@ __kernel void m18000_m04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * loop @@ -276,7 +276,7 @@ __kernel void m18000_s04 (KERN_ATTR_RULES ()) pw_buf1[2] = pws[gid].i[6]; pw_buf1[3] = pws[gid].i[7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * digest diff --git a/OpenCL/m18000_a3-optimized.cl b/OpenCL/m18000_a3-optimized.cl index 68c506b67..e80735297 100644 --- a/OpenCL/m18000_a3-optimized.cl +++ b/OpenCL/m18000_a3-optimized.cl @@ -450,7 +450,7 @@ __kernel void m18000_m04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -497,7 +497,7 @@ __kernel void m18000_m08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -544,7 +544,7 @@ __kernel void m18000_m16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -591,7 +591,7 @@ __kernel void m18000_s04 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -638,7 +638,7 @@ __kernel void m18000_s08 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -685,7 +685,7 @@ __kernel void m18000_s16 (KERN_ATTR_BASIC ()) w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m18100_a1-pure.cl b/OpenCL/m18100_a1-pure.cl index 6aecac20e..b8ef4eef2 100644 --- a/OpenCL/m18100_a1-pure.cl +++ b/OpenCL/m18100_a1-pure.cl @@ -28,7 +28,7 @@ __kernel void m18100_mxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; @@ -142,7 +142,7 @@ __kernel void m18100_sxx (KERN_ATTR_BASIC ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32 w[64] = { 0 }; diff --git a/OpenCL/m18100_a3-pure.cl b/OpenCL/m18100_a3-pure.cl index 2b0890c42..ed7584b68 100644 --- a/OpenCL/m18100_a3-pure.cl +++ b/OpenCL/m18100_a3-pure.cl @@ -28,7 +28,7 @@ __kernel void m18100_mxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -129,7 +129,7 @@ __kernel void m18100_sxx (KERN_ATTR_VECTOR ()) * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; diff --git a/OpenCL/m18200_a0-optimized.cl b/OpenCL/m18200_a0-optimized.cl index 5a24095fe..ac01f9c41 100644 --- a/OpenCL/m18200_a0-optimized.cl +++ b/OpenCL/m18200_a0-optimized.cl @@ -592,7 +592,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m18200_m04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared @@ -690,7 +690,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m18200_s04 (KERN_A pw_buf1[2] = pws[gid].i[ 6]; pw_buf1[3] = pws[gid].i[ 7]; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * shared diff --git a/OpenCL/m18200_a3-optimized.cl b/OpenCL/m18200_a3-optimized.cl index 28dcf8868..a55263203 100644 --- a/OpenCL/m18200_a3-optimized.cl +++ b/OpenCL/m18200_a3-optimized.cl @@ -659,7 +659,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m18200_m04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -711,7 +711,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m18200_m08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -767,7 +767,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m18200_s04 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main @@ -819,7 +819,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m18200_s08 (KERN_A w3[2] = 0; w3[3] = 0; - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 63; /** * main diff --git a/OpenCL/m18200_a3-pure.cl b/OpenCL/m18200_a3-pure.cl index cb27d0b3f..d592eaf02 100644 --- a/OpenCL/m18200_a3-pure.cl +++ b/OpenCL/m18200_a3-pure.cl @@ -388,7 +388,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m18200_mxx (KERN_A * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 }; @@ -461,7 +461,7 @@ __kernel void __attribute__((reqd_work_group_size(64, 1, 1))) m18200_sxx (KERN_A * base */ - const u32 pw_len = pws[gid].pw_len; + const u32 pw_len = pws[gid].pw_len & 255; u32x w[64] = { 0 };