mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-28 02:49:18 +00:00
Merge branch 'matrix-fix_m06221'
This commit is contained in:
commit
79f760257c
@ -39,7 +39,7 @@ __constant u64 k_sha512[80] =
|
|||||||
SHA512C4c, SHA512C4d, SHA512C4e, SHA512C4f,
|
SHA512C4c, SHA512C4d, SHA512C4e, SHA512C4f,
|
||||||
};
|
};
|
||||||
|
|
||||||
void sha512_transform (const u64 w[16], u64 dgst[8])
|
static void sha512_transform (const u64 w[16], u64 dgst[8])
|
||||||
{
|
{
|
||||||
u64 a = dgst[0];
|
u64 a = dgst[0];
|
||||||
u64 b = dgst[1];
|
u64 b = dgst[1];
|
||||||
@ -127,7 +127,7 @@ void sha512_transform (const u64 w[16], u64 dgst[8])
|
|||||||
dgst[7] += h;
|
dgst[7] += h;
|
||||||
}
|
}
|
||||||
|
|
||||||
void hmac_run (const u64 w1[16], const u64 ipad[8], const u64 opad[8], u64 dgst[8])
|
static void hmac_run (const u64 w1[16], const u64 ipad[8], const u64 opad[8], u64 dgst[8])
|
||||||
{
|
{
|
||||||
dgst[0] = ipad[0];
|
dgst[0] = ipad[0];
|
||||||
dgst[1] = ipad[1];
|
dgst[1] = ipad[1];
|
||||||
@ -171,7 +171,7 @@ void hmac_run (const u64 w1[16], const u64 ipad[8], const u64 opad[8], u64 dgst[
|
|||||||
sha512_transform (w, dgst);
|
sha512_transform (w, dgst);
|
||||||
}
|
}
|
||||||
|
|
||||||
void hmac_init (u64 w[16], u64 ipad[8], u64 opad[8])
|
static void hmac_init (u64 w[16], u64 ipad[8], u64 opad[8])
|
||||||
{
|
{
|
||||||
w[ 0] ^= 0x3636363636363636;
|
w[ 0] ^= 0x3636363636363636;
|
||||||
w[ 1] ^= 0x3636363636363636;
|
w[ 1] ^= 0x3636363636363636;
|
||||||
@ -230,7 +230,7 @@ void hmac_init (u64 w[16], u64 ipad[8], u64 opad[8])
|
|||||||
sha512_transform (w, opad);
|
sha512_transform (w, opad);
|
||||||
}
|
}
|
||||||
|
|
||||||
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