1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-22 22:58:30 +00:00

Merge pull request #3714 from matrix/fix_4410_metal

Fixed build failed for 4410 with vector width > 1
This commit is contained in:
Jens Steube 2023-05-13 19:59:17 +02:00 committed by GitHub
commit 18639745ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 24 deletions

View File

@ -641,10 +641,10 @@ KERNEL_FQ void m04410_m04 (KERN_ATTR_RULES ())
MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
a += digest[0] - MD5M_A; a += digest[0] - make_u32x (MD5M_A);
b += digest[1] - MD5M_B; b += digest[1] - make_u32x (MD5M_B);
c += digest[2] - MD5M_C; c += digest[2] - make_u32x (MD5M_C);
d += digest[3] - MD5M_D; d += digest[3] - make_u32x (MD5M_D);
COMPARE_M_SIMD (a, d, c, b); COMPARE_M_SIMD (a, d, c, b);
} }
@ -1285,10 +1285,10 @@ KERNEL_FQ void m04410_s04 (KERN_ATTR_RULES ())
MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
a += digest[0] - MD5M_A; a += digest[0] - make_u32x (MD5M_A);
b += digest[1] - MD5M_B; b += digest[1] - make_u32x (MD5M_B);
c += digest[2] - MD5M_C; c += digest[2] - make_u32x (MD5M_C);
d += digest[3] - MD5M_D; d += digest[3] - make_u32x (MD5M_D);
COMPARE_S_SIMD (a, d, c, b); COMPARE_S_SIMD (a, d, c, b);
} }

View File

@ -697,10 +697,10 @@ KERNEL_FQ void m04410_m04 (KERN_ATTR_BASIC ())
MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
a += digest[0] - MD5M_A; a += digest[0] - make_u32x (MD5M_A);
b += digest[1] - MD5M_B; b += digest[1] - make_u32x (MD5M_B);
c += digest[2] - MD5M_C; c += digest[2] - make_u32x (MD5M_C);
d += digest[3] - MD5M_D; d += digest[3] - make_u32x (MD5M_D);
COMPARE_M_SIMD (a, d, c, b); COMPARE_M_SIMD (a, d, c, b);
} }
@ -1399,10 +1399,10 @@ KERNEL_FQ void m04410_s04 (KERN_ATTR_BASIC ())
MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
a += digest[0] - MD5M_A; a += digest[0] - make_u32x (MD5M_A);
b += digest[1] - MD5M_B; b += digest[1] - make_u32x (MD5M_B);
c += digest[2] - MD5M_C; c += digest[2] - make_u32x (MD5M_C);
d += digest[3] - MD5M_D; d += digest[3] - make_u32x (MD5M_D);
COMPARE_S_SIMD (a, d, c, b); COMPARE_S_SIMD (a, d, c, b);
} }

View File

@ -595,10 +595,10 @@ DECLSPEC void m04410m (PRIVATE_AS u32 *w0, PRIVATE_AS u32 *w1, PRIVATE_AS u32 *w
MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
a += digest[0] - MD5M_A; a += digest[0] - make_u32x (MD5M_A);
b += digest[1] - MD5M_B; b += digest[1] - make_u32x (MD5M_B);
c += digest[2] - MD5M_C; c += digest[2] - make_u32x (MD5M_C);
d += digest[3] - MD5M_D; d += digest[3] - make_u32x (MD5M_D);
COMPARE_M_SIMD (a, d, c, b); COMPARE_M_SIMD (a, d, c, b);
} }
@ -1187,10 +1187,10 @@ DECLSPEC void m04410s (PRIVATE_AS u32 *w0, PRIVATE_AS u32 *w1, PRIVATE_AS u32 *w
MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32); MD5_STEP (MD5_I , c, d, a, b, w2_t, MD5C3e, MD5S32);
MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33); MD5_STEP (MD5_I , b, c, d, a, w9_t, MD5C3f, MD5S33);
a += digest[0] - MD5M_A; a += digest[0] - make_u32x (MD5M_A);
b += digest[1] - MD5M_B; b += digest[1] - make_u32x (MD5M_B);
c += digest[2] - MD5M_C; c += digest[2] - make_u32x (MD5M_C);
d += digest[3] - MD5M_D; d += digest[3] - make_u32x (MD5M_D);
COMPARE_S_SIMD (a, d, c, b); COMPARE_S_SIMD (a, d, c, b);
} }

View File

@ -58,6 +58,7 @@
- Fixed bug in 29600 module OPTS_TYPE setting - Fixed bug in 29600 module OPTS_TYPE setting
- Fixed bug in grep out-of-memory workaround on Unit Test - Fixed bug in grep out-of-memory workaround on Unit Test
- Fixed bug in input_tokenizer when TOKEN_ATTR_FIXED_LENGTH is used and refactor modules - Fixed bug in input_tokenizer when TOKEN_ATTR_FIXED_LENGTH is used and refactor modules
- Fixed build failed for 4410 with vector width > 1
- Fixed build failed for 18400 with Apple Metal - Fixed build failed for 18400 with Apple Metal
- Fixed build failed for 18600 with Apple Metal - Fixed build failed for 18600 with Apple Metal
- Fixed build failed for 31700 with Apple Metal - Fixed build failed for 31700 with Apple Metal