1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-24 08:58:13 +00:00

Merge branch 'fix_m00500' of https://github.com/matrix/hashcat into matrix-fix_m00500

This commit is contained in:
jsteube 2016-11-28 10:39:28 +01:00
commit e01ab3054b

View File

@ -16,7 +16,7 @@
#define md5crypt_magic 0x00243124u #define md5crypt_magic 0x00243124u
void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4]) static void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[4])
{ {
u32 a = digest[0]; u32 a = digest[0];
u32 b = digest[1]; u32 b = digest[1];
@ -114,7 +114,7 @@ void md5_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32
digest[3] += d; digest[3] += d;
} }
void memcat16 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[4]) static void memcat16 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[4])
{ {
u32 tmp0; u32 tmp0;
u32 tmp1; u32 tmp1;
@ -226,7 +226,7 @@ void memcat16 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const
} }
} }
void memcat16_x80 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[4]) static void memcat16_x80 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[4])
{ {
u32 tmp0; u32 tmp0;
u32 tmp1; u32 tmp1;
@ -338,7 +338,7 @@ void memcat16_x80 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], c
} }
} }
void memcat8 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[2]) static void memcat8 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append[2])
{ {
u32 tmp0; u32 tmp0;
u32 tmp1; u32 tmp1;
@ -430,7 +430,7 @@ void memcat8 (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const
} }
} }
void append_sign (u32 block0[4], u32 block1[4], const u32 block_len) static void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
{ {
switch (block_len) switch (block_len)
{ {
@ -512,7 +512,7 @@ void append_sign (u32 block0[4], u32 block1[4], const u32 block_len)
} }
} }
void append_1st (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append) static void append_1st (u32 block0[4], u32 block1[4], u32 block2[4], u32 block3[4], const u32 block_len, const u32 append)
{ {
switch (block_len) switch (block_len)
{ {