mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-24 08:58:13 +00:00
Merge branch 'fix_m01600' of https://github.com/matrix/hashcat into matrix-fix_m01600
This commit is contained in:
commit
2b6766e7c4
@ -17,7 +17,7 @@
|
|||||||
#define md5apr1_magic0 0x72706124u
|
#define md5apr1_magic0 0x72706124u
|
||||||
#define md5apr1_magic1 0x00002431u
|
#define md5apr1_magic1 0x00002431u
|
||||||
|
|
||||||
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];
|
||||||
@ -115,7 +115,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;
|
||||||
@ -227,7 +227,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;
|
||||||
@ -339,7 +339,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;
|
||||||
@ -431,7 +431,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)
|
||||||
{
|
{
|
||||||
@ -529,7 +529,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)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user