mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-18 14:18:11 +00:00
Merge branch 'fix_m06231' of https://github.com/matrix/hashcat into matrix-fix_m06231
This commit is contained in:
commit
8ea0dc075e
@ -1083,7 +1083,7 @@ __constant u32 Cl[8][256] =
|
|||||||
|
|
||||||
#define BOX(S,n,i) (S)[(n)][(i)]
|
#define BOX(S,n,i) (S)[(n)][(i)]
|
||||||
|
|
||||||
void whirlpool_transform_last (u32 dgst[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
static void whirlpool_transform_last (u32 dgst[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
||||||
{
|
{
|
||||||
const u32 rch[R + 1] =
|
const u32 rch[R + 1] =
|
||||||
{
|
{
|
||||||
@ -1286,7 +1286,7 @@ void whirlpool_transform_last (u32 dgst[16], __local u32 (*s_Ch)[256], __local u
|
|||||||
dgst[15] ^= statel[7] ^ LAST_W15;
|
dgst[15] ^= statel[7] ^ LAST_W15;
|
||||||
}
|
}
|
||||||
|
|
||||||
void whirlpool_transform (const u32 w[16], u32 dgst[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
static void whirlpool_transform (const u32 w[16], u32 dgst[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
||||||
{
|
{
|
||||||
const u32 rch[R + 1] =
|
const u32 rch[R + 1] =
|
||||||
{
|
{
|
||||||
@ -1486,7 +1486,7 @@ void whirlpool_transform (const u32 w[16], u32 dgst[16], __local u32 (*s_Ch)[256
|
|||||||
dgst[15] ^= statel[7] ^ w[15];
|
dgst[15] ^= statel[7] ^ w[15];
|
||||||
}
|
}
|
||||||
|
|
||||||
void hmac_run2a (const u32 w1[16], const u32 w2[16], const u32 ipad[16], const u32 opad[16], u32 dgst[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
static void hmac_run2a (const u32 w1[16], const u32 w2[16], const u32 ipad[16], const u32 opad[16], u32 dgst[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
||||||
{
|
{
|
||||||
dgst[ 0] = ipad[ 0];
|
dgst[ 0] = ipad[ 0];
|
||||||
dgst[ 1] = ipad[ 1];
|
dgst[ 1] = ipad[ 1];
|
||||||
@ -1549,7 +1549,7 @@ void hmac_run2a (const u32 w1[16], const u32 w2[16], const u32 ipad[16], const u
|
|||||||
whirlpool_transform_last (dgst, s_Ch, s_Cl);
|
whirlpool_transform_last (dgst, s_Ch, s_Cl);
|
||||||
}
|
}
|
||||||
|
|
||||||
void hmac_run2b (const u32 w1[16], const u32 ipad[16], const u32 opad[16], u32 dgst[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
static void hmac_run2b (const u32 w1[16], const u32 ipad[16], const u32 opad[16], u32 dgst[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
||||||
{
|
{
|
||||||
dgst[ 0] = ipad[ 0];
|
dgst[ 0] = ipad[ 0];
|
||||||
dgst[ 1] = ipad[ 1];
|
dgst[ 1] = ipad[ 1];
|
||||||
@ -1613,7 +1613,7 @@ void hmac_run2b (const u32 w1[16], const u32 ipad[16], const u32 opad[16], u32 d
|
|||||||
whirlpool_transform_last (dgst, s_Ch, s_Cl);
|
whirlpool_transform_last (dgst, s_Ch, s_Cl);
|
||||||
}
|
}
|
||||||
|
|
||||||
void hmac_init (u32 w[16], u32 ipad[16], u32 opad[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
static void hmac_init (u32 w[16], u32 ipad[16], u32 opad[16], __local u32 (*s_Ch)[256], __local u32 (*s_Cl)[256])
|
||||||
{
|
{
|
||||||
w[ 0] ^= 0x36363636;
|
w[ 0] ^= 0x36363636;
|
||||||
w[ 1] ^= 0x36363636;
|
w[ 1] ^= 0x36363636;
|
||||||
@ -1688,7 +1688,7 @@ void hmac_init (u32 w[16], u32 ipad[16], u32 opad[16], __local u32 (*s_Ch)[256],
|
|||||||
whirlpool_transform (w, opad, s_Ch, s_Cl);
|
whirlpool_transform (w, opad, s_Ch, s_Cl);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 u8add (const u32 a, const u32 b)
|
static u32 u8add (const u32 a, const u32 b)
|
||||||
{
|
{
|
||||||
const u32 a1 = (a >> 0) & 0xff;
|
const u32 a1 = (a >> 0) & 0xff;
|
||||||
const u32 a2 = (a >> 8) & 0xff;
|
const u32 a2 = (a >> 8) & 0xff;
|
||||||
|
Loading…
Reference in New Issue
Block a user