mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-28 02:49:18 +00:00
Merge branch 'matrix-fix_m06600'
This commit is contained in:
commit
8e593d8836
@ -701,7 +701,7 @@ __constant u32 rcon[] =
|
|||||||
0x1b000000, 0x36000000,
|
0x1b000000, 0x36000000,
|
||||||
};
|
};
|
||||||
|
|
||||||
void AES128_ExpandKey (u32 *userkey, u32 *rek, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4)
|
static void AES128_ExpandKey (u32 *userkey, u32 *rek, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4)
|
||||||
{
|
{
|
||||||
rek[0] = userkey[0];
|
rek[0] = userkey[0];
|
||||||
rek[1] = userkey[1];
|
rek[1] = userkey[1];
|
||||||
@ -730,7 +730,7 @@ void AES128_ExpandKey (u32 *userkey, u32 *rek, __local u32 *s_te0, __local u32 *
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AES128_InvertKey (u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local u32 *s_td2, __local u32 *s_td3, __local u32 *s_td4, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4)
|
static void AES128_InvertKey (u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local u32 *s_td2, __local u32 *s_td3, __local u32 *s_td4, __local u32 *s_te0, __local u32 *s_te1, __local u32 *s_te2, __local u32 *s_te3, __local u32 *s_te4)
|
||||||
{
|
{
|
||||||
for (u32 i = 0, j = 40; i < j; i += 4, j -= 4)
|
for (u32 i = 0, j = 40; i < j; i += 4, j -= 4)
|
||||||
{
|
{
|
||||||
@ -770,7 +770,7 @@ void AES128_InvertKey (u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AES128_decrypt (const u32 *in, u32 *out, const u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local u32 *s_td2, __local u32 *s_td3, __local u32 *s_td4)
|
static void AES128_decrypt (const u32 *in, u32 *out, const u32 *rdk, __local u32 *s_td0, __local u32 *s_td1, __local u32 *s_td2, __local u32 *s_td3, __local u32 *s_td4)
|
||||||
{
|
{
|
||||||
u32 s0 = in[0] ^ rdk[0];
|
u32 s0 = in[0] ^ rdk[0];
|
||||||
u32 s1 = in[1] ^ rdk[1];
|
u32 s1 = in[1] ^ rdk[1];
|
||||||
@ -844,7 +844,7 @@ void AES128_decrypt (const u32 *in, u32 *out, const u32 *rdk, __local u32 *s_td0
|
|||||||
^ rdk[43];
|
^ rdk[43];
|
||||||
}
|
}
|
||||||
|
|
||||||
void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
|
static void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[5])
|
||||||
{
|
{
|
||||||
u32 A = digest[0];
|
u32 A = digest[0];
|
||||||
u32 B = digest[1];
|
u32 B = digest[1];
|
||||||
@ -972,7 +972,7 @@ void sha1_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u3
|
|||||||
digest[4] += E;
|
digest[4] += E;
|
||||||
}
|
}
|
||||||
|
|
||||||
void hmac_sha1_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32 opad[5])
|
static void hmac_sha1_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32 opad[5])
|
||||||
{
|
{
|
||||||
w0[0] = w0[0] ^ 0x36363636;
|
w0[0] = w0[0] ^ 0x36363636;
|
||||||
w0[1] = w0[1] ^ 0x36363636;
|
w0[1] = w0[1] ^ 0x36363636;
|
||||||
@ -1025,7 +1025,7 @@ void hmac_sha1_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32
|
|||||||
sha1_transform (w0, w1, w2, w3, opad);
|
sha1_transform (w0, w1, w2, w3, opad);
|
||||||
}
|
}
|
||||||
|
|
||||||
void hmac_sha1_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32 opad[5], u32 digest[5])
|
static void hmac_sha1_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[5], u32 opad[5], u32 digest[5])
|
||||||
{
|
{
|
||||||
digest[0] = ipad[0];
|
digest[0] = ipad[0];
|
||||||
digest[1] = ipad[1];
|
digest[1] = ipad[1];
|
||||||
|
Loading…
Reference in New Issue
Block a user