mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 16:18:09 +00:00
Revert "Fix bsdicrypt for NV"
This reverts commit 284990e4d3.
Accidentially changed oclHashcat.c
This commit is contained in:
jsteube
parent
284990e4d3
commit
1d4bece384
136
OpenCL/m12400.cl
136
OpenCL/m12400.cl
@ -60,7 +60,7 @@
|
||||
|
||||
__constant u32 c_SPtrans[8][64] =
|
||||
{
|
||||
{
|
||||
/* nibble 0 */
|
||||
0x00820200, 0x00020000, 0x80800000, 0x80820200,
|
||||
0x00800000, 0x80020200, 0x80020000, 0x80800000,
|
||||
0x80020200, 0x00820200, 0x00820000, 0x80000200,
|
||||
@ -77,8 +77,7 @@ __constant u32 c_SPtrans[8][64] =
|
||||
0x00800000, 0x80000200, 0x80020000, 0x00000000,
|
||||
0x00020000, 0x00800000, 0x80800200, 0x00820200,
|
||||
0x80000000, 0x80820000, 0x00000200, 0x80020200,
|
||||
},
|
||||
{
|
||||
/* nibble 1 */
|
||||
0x10042004, 0x00000000, 0x00042000, 0x10040000,
|
||||
0x10000004, 0x00002004, 0x10002000, 0x00042000,
|
||||
0x00002000, 0x10040004, 0x00000004, 0x10002000,
|
||||
@ -95,8 +94,7 @@ __constant u32 c_SPtrans[8][64] =
|
||||
0x00000004, 0x10042004, 0x00042000, 0x10040000,
|
||||
0x10040004, 0x00040000, 0x00002004, 0x10002000,
|
||||
0x10002004, 0x00000004, 0x10040000, 0x00042000,
|
||||
},
|
||||
{
|
||||
/* nibble 2 */
|
||||
0x41000000, 0x01010040, 0x00000040, 0x41000040,
|
||||
0x40010000, 0x01000000, 0x41000040, 0x00010040,
|
||||
0x01000040, 0x00010000, 0x01010000, 0x40000000,
|
||||
@ -113,8 +111,7 @@ __constant u32 c_SPtrans[8][64] =
|
||||
0x00010000, 0x01000040, 0x41000040, 0x00010040,
|
||||
0x01000040, 0x00000000, 0x41010000, 0x40000040,
|
||||
0x41000000, 0x40010040, 0x00000040, 0x01010000,
|
||||
},
|
||||
{
|
||||
/* nibble 3 */
|
||||
0x00100402, 0x04000400, 0x00000002, 0x04100402,
|
||||
0x00000000, 0x04100000, 0x04000402, 0x00100002,
|
||||
0x04100400, 0x04000002, 0x04000000, 0x00000402,
|
||||
@ -131,8 +128,7 @@ __constant u32 c_SPtrans[8][64] =
|
||||
0x04100402, 0x00000002, 0x04000400, 0x00100402,
|
||||
0x00100002, 0x00100400, 0x04100000, 0x04000402,
|
||||
0x00000402, 0x04000000, 0x04000002, 0x04100400,
|
||||
},
|
||||
{
|
||||
/* nibble 4 */
|
||||
0x02000000, 0x00004000, 0x00000100, 0x02004108,
|
||||
0x02004008, 0x02000100, 0x00004108, 0x02004000,
|
||||
0x00004000, 0x00000008, 0x02000008, 0x00004100,
|
||||
@ -149,8 +145,7 @@ __constant u32 c_SPtrans[8][64] =
|
||||
0x02004008, 0x02004100, 0x00000108, 0x00004000,
|
||||
0x00004100, 0x02004008, 0x02000100, 0x00000108,
|
||||
0x00000008, 0x00004108, 0x02004000, 0x02000008,
|
||||
},
|
||||
{
|
||||
/* nibble 5 */
|
||||
0x20000010, 0x00080010, 0x00000000, 0x20080800,
|
||||
0x00080010, 0x00000800, 0x20000810, 0x00080000,
|
||||
0x00000810, 0x20080810, 0x00080800, 0x20000000,
|
||||
@ -167,8 +162,7 @@ __constant u32 c_SPtrans[8][64] =
|
||||
0x20000010, 0x20080000, 0x00080810, 0x00000000,
|
||||
0x00000800, 0x20000010, 0x20000810, 0x20080800,
|
||||
0x20080000, 0x00000810, 0x00000010, 0x20080010,
|
||||
},
|
||||
{
|
||||
/* nibble 6 */
|
||||
0x00001000, 0x00000080, 0x00400080, 0x00400001,
|
||||
0x00401081, 0x00001001, 0x00001080, 0x00000000,
|
||||
0x00400000, 0x00400081, 0x00000081, 0x00401000,
|
||||
@ -185,8 +179,7 @@ __constant u32 c_SPtrans[8][64] =
|
||||
0x00000081, 0x00001000, 0x00401081, 0x00400000,
|
||||
0x00401080, 0x00000001, 0x00001001, 0x00401081,
|
||||
0x00400001, 0x00401080, 0x00401000, 0x00001001,
|
||||
},
|
||||
{
|
||||
/* nibble 7 */
|
||||
0x08200020, 0x08208000, 0x00008020, 0x00000000,
|
||||
0x08008000, 0x00200020, 0x08200000, 0x08208020,
|
||||
0x00000020, 0x08000000, 0x00208000, 0x00008020,
|
||||
@ -203,12 +196,11 @@ __constant u32 c_SPtrans[8][64] =
|
||||
0x00208000, 0x00008020, 0x08008020, 0x08200000,
|
||||
0x00000020, 0x08208000, 0x00208020, 0x00000000,
|
||||
0x08000000, 0x08200020, 0x00008000, 0x00208020
|
||||
},
|
||||
};
|
||||
|
||||
__constant u32 c_skb[8][64] =
|
||||
{
|
||||
{
|
||||
/* for C bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
|
||||
0x00000000, 0x00000010, 0x20000000, 0x20000010,
|
||||
0x00010000, 0x00010010, 0x20010000, 0x20010010,
|
||||
0x00000800, 0x00000810, 0x20000800, 0x20000810,
|
||||
@ -225,8 +217,7 @@ __constant u32 c_skb[8][64] =
|
||||
0x00090020, 0x00090030, 0x20090020, 0x20090030,
|
||||
0x00080820, 0x00080830, 0x20080820, 0x20080830,
|
||||
0x00090820, 0x00090830, 0x20090820, 0x20090830,
|
||||
},
|
||||
{
|
||||
/* for C bits (numbered as per FIPS 46) 7 8 10 11 12 13 */
|
||||
0x00000000, 0x02000000, 0x00002000, 0x02002000,
|
||||
0x00200000, 0x02200000, 0x00202000, 0x02202000,
|
||||
0x00000004, 0x02000004, 0x00002004, 0x02002004,
|
||||
@ -243,8 +234,7 @@ __constant u32 c_skb[8][64] =
|
||||
0x10200400, 0x12200400, 0x10202400, 0x12202400,
|
||||
0x10000404, 0x12000404, 0x10002404, 0x12002404,
|
||||
0x10200404, 0x12200404, 0x10202404, 0x12202404,
|
||||
},
|
||||
{
|
||||
/* for C bits (numbered as per FIPS 46) 14 15 16 17 19 20 */
|
||||
0x00000000, 0x00000001, 0x00040000, 0x00040001,
|
||||
0x01000000, 0x01000001, 0x01040000, 0x01040001,
|
||||
0x00000002, 0x00000003, 0x00040002, 0x00040003,
|
||||
@ -261,8 +251,7 @@ __constant u32 c_skb[8][64] =
|
||||
0x09000200, 0x09000201, 0x09040200, 0x09040201,
|
||||
0x08000202, 0x08000203, 0x08040202, 0x08040203,
|
||||
0x09000202, 0x09000203, 0x09040202, 0x09040203,
|
||||
},
|
||||
{
|
||||
/* for C bits (numbered as per FIPS 46) 21 23 24 26 27 28 */
|
||||
0x00000000, 0x00100000, 0x00000100, 0x00100100,
|
||||
0x00000008, 0x00100008, 0x00000108, 0x00100108,
|
||||
0x00001000, 0x00101000, 0x00001100, 0x00101100,
|
||||
@ -279,8 +268,7 @@ __constant u32 c_skb[8][64] =
|
||||
0x04020008, 0x04120008, 0x04020108, 0x04120108,
|
||||
0x04021000, 0x04121000, 0x04021100, 0x04121100,
|
||||
0x04021008, 0x04121008, 0x04021108, 0x04121108,
|
||||
},
|
||||
{
|
||||
/* for D bits (numbered as per FIPS 46) 1 2 3 4 5 6 */
|
||||
0x00000000, 0x10000000, 0x00010000, 0x10010000,
|
||||
0x00000004, 0x10000004, 0x00010004, 0x10010004,
|
||||
0x20000000, 0x30000000, 0x20010000, 0x30010000,
|
||||
@ -297,8 +285,7 @@ __constant u32 c_skb[8][64] =
|
||||
0x00101004, 0x10101004, 0x00111004, 0x10111004,
|
||||
0x20101000, 0x30101000, 0x20111000, 0x30111000,
|
||||
0x20101004, 0x30101004, 0x20111004, 0x30111004,
|
||||
},
|
||||
{
|
||||
/* for D bits (numbered as per FIPS 46) 8 9 11 12 13 14 */
|
||||
0x00000000, 0x08000000, 0x00000008, 0x08000008,
|
||||
0x00000400, 0x08000400, 0x00000408, 0x08000408,
|
||||
0x00020000, 0x08020000, 0x00020008, 0x08020008,
|
||||
@ -315,8 +302,7 @@ __constant u32 c_skb[8][64] =
|
||||
0x02000401, 0x0A000401, 0x02000409, 0x0A000409,
|
||||
0x02020001, 0x0A020001, 0x02020009, 0x0A020009,
|
||||
0x02020401, 0x0A020401, 0x02020409, 0x0A020409,
|
||||
},
|
||||
{
|
||||
/* for D bits (numbered as per FIPS 46) 16 17 18 19 20 21 */
|
||||
0x00000000, 0x00000100, 0x00080000, 0x00080100,
|
||||
0x01000000, 0x01000100, 0x01080000, 0x01080100,
|
||||
0x00000010, 0x00000110, 0x00080010, 0x00080110,
|
||||
@ -333,8 +319,7 @@ __constant u32 c_skb[8][64] =
|
||||
0x01200200, 0x01200300, 0x01280200, 0x01280300,
|
||||
0x00200210, 0x00200310, 0x00280210, 0x00280310,
|
||||
0x01200210, 0x01200310, 0x01280210, 0x01280310,
|
||||
},
|
||||
{
|
||||
/* for D bits (numbered as per FIPS 46) 22 23 24 25 27 28 */
|
||||
0x00000000, 0x04000000, 0x00040000, 0x04040000,
|
||||
0x00000002, 0x04000002, 0x00040002, 0x04040002,
|
||||
0x00002000, 0x04002000, 0x00042000, 0x04042000,
|
||||
@ -351,7 +336,6 @@ __constant u32 c_skb[8][64] =
|
||||
0x00000822, 0x04000822, 0x00040822, 0x04040822,
|
||||
0x00002820, 0x04002820, 0x00042820, 0x04042820,
|
||||
0x00002822, 0x04002822, 0x00042822, 0x04042822
|
||||
},
|
||||
};
|
||||
|
||||
#define BOX(i,n,S) (S)[(n)][(i)]
|
||||
@ -377,16 +361,11 @@ static void _des_crypt_keysetup (u32 c, u32 d, u32 Kc[16], u32 Kd[16], __local u
|
||||
#pragma unroll
|
||||
for (u32 i = 0; i < 16; i++)
|
||||
{
|
||||
if ((i < 2) || (i == 8) || (i == 15))
|
||||
{
|
||||
c = ((c >> 1) | (c << 27));
|
||||
d = ((d >> 1) | (d << 27));
|
||||
}
|
||||
else
|
||||
{
|
||||
c = ((c >> 2) | (c << 26));
|
||||
d = ((d >> 2) | (d << 26));
|
||||
}
|
||||
const u32 shifts3s0[16] = { 1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1 };
|
||||
const u32 shifts3s1[16] = { 27, 27, 26, 26, 26, 26, 26, 26, 27, 26, 26, 26, 26, 26, 26, 27 };
|
||||
|
||||
c = c >> shifts3s0[i] | c << shifts3s1[i];
|
||||
d = d >> shifts3s0[i] | d << shifts3s1[i];
|
||||
|
||||
c = c & 0x0fffffff;
|
||||
d = d & 0x0fffffff;
|
||||
@ -438,54 +417,51 @@ static void _des_crypt_encrypt (u32 iv[2], u32 mask, u32 rounds, u32 Kc[16], u32
|
||||
|
||||
for (u32 i = 0; i < rounds; i++)
|
||||
{
|
||||
for (u32 j = 0; j < 16; j += 2)
|
||||
#pragma unroll
|
||||
for (u32 j = 0; j < 16; j++)
|
||||
{
|
||||
u32 t;
|
||||
u32 u;
|
||||
/* sbox */
|
||||
u32 t = r ^ (r >> 16);
|
||||
|
||||
u32 u = t;
|
||||
|
||||
// u
|
||||
u = u & E0;
|
||||
|
||||
tt = (u << 16);
|
||||
|
||||
t = r ^ (r >> 16);
|
||||
u = t & E0;
|
||||
t = t & E1;
|
||||
u = u ^ (u << 16);
|
||||
u = u ^ r;
|
||||
u = u ^ Kc[j + 0];
|
||||
t = t ^ (t << 16);
|
||||
t = t ^ r;
|
||||
t = rotl32 (t, 28u);
|
||||
t = t ^ Kd[j + 0];
|
||||
u = u ^ tt;
|
||||
u = u ^ Kc[j];
|
||||
|
||||
l ^= BOX (((u >> 0) & 0x3f), 0, s_SPtrans)
|
||||
| BOX (((u >> 8) & 0x3f), 2, s_SPtrans)
|
||||
| BOX (((u >> 16) & 0x3f), 4, s_SPtrans)
|
||||
| BOX (((u >> 24) & 0x3f), 6, s_SPtrans)
|
||||
| BOX (((t >> 0) & 0x3f), 1, s_SPtrans)
|
||||
| BOX (((t >> 8) & 0x3f), 3, s_SPtrans)
|
||||
| BOX (((t >> 16) & 0x3f), 5, s_SPtrans)
|
||||
| BOX (((t >> 24) & 0x3f), 7, s_SPtrans);
|
||||
// t
|
||||
|
||||
t = l ^ (l >> 16);
|
||||
u = t & E0;
|
||||
t = t & E1;
|
||||
u = u ^ (u << 16);
|
||||
u = u ^ l;
|
||||
u = u ^ Kc[j + 1];
|
||||
t = t ^ (t << 16);
|
||||
t = t ^ l;
|
||||
|
||||
tt = (t << 16);
|
||||
|
||||
t = t ^ r;
|
||||
t = t ^ tt;
|
||||
t = rotl32 (t, 28u);
|
||||
t = t ^ Kd[j + 1];
|
||||
t = t ^ Kd[j];
|
||||
|
||||
r ^= BOX (((u >> 0) & 0x3f), 0, s_SPtrans)
|
||||
| BOX (((u >> 8) & 0x3f), 2, s_SPtrans)
|
||||
| BOX (((u >> 16) & 0x3f), 4, s_SPtrans)
|
||||
| BOX (((u >> 24) & 0x3f), 6, s_SPtrans)
|
||||
| BOX (((t >> 0) & 0x3f), 1, s_SPtrans)
|
||||
| BOX (((t >> 8) & 0x3f), 3, s_SPtrans)
|
||||
| BOX (((t >> 16) & 0x3f), 5, s_SPtrans)
|
||||
| BOX (((t >> 24) & 0x3f), 7, s_SPtrans);
|
||||
const u32 um = u & 0x3f3f3f3f;
|
||||
const u32 tm = t & 0x3f3f3f3f;
|
||||
|
||||
l ^= BOX (((um >> 0) & 0xff), 0, s_SPtrans)
|
||||
| BOX (((um >> 8) & 0xff), 2, s_SPtrans)
|
||||
| BOX (((um >> 16) & 0xff), 4, s_SPtrans)
|
||||
| BOX (((um >> 24) & 0xff), 6, s_SPtrans)
|
||||
| BOX (((tm >> 0) & 0xff), 1, s_SPtrans)
|
||||
| BOX (((tm >> 8) & 0xff), 3, s_SPtrans)
|
||||
| BOX (((tm >> 16) & 0xff), 5, s_SPtrans)
|
||||
| BOX (((tm >> 24) & 0xff), 7, s_SPtrans);
|
||||
|
||||
tt = l;
|
||||
l = r;
|
||||
r = tt;
|
||||
}
|
||||
|
||||
u32 tt;
|
||||
|
||||
tt = l;
|
||||
l = r;
|
||||
r = tt;
|
||||
|
||||
@ -132,7 +132,7 @@ const uint RESTORE_MIN = 201;
|
||||
|
||||
#define MAX_DICTSTAT 10000
|
||||
|
||||
#define NUM_DEFAULT_BENCHMARK_ALGORITHMS 58
|
||||
#define NUM_DEFAULT_BENCHMARK_ALGORITHMS 128
|
||||
|
||||
#define global_free(attr) \
|
||||
{ \
|
||||
@ -150,6 +150,76 @@ const uint RESTORE_MIN = 201;
|
||||
|
||||
static uint default_benchmark_algorithms[NUM_DEFAULT_BENCHMARK_ALGORITHMS] =
|
||||
{
|
||||
900,
|
||||
0,
|
||||
5100,
|
||||
100,
|
||||
1400,
|
||||
10800,
|
||||
1700,
|
||||
5000,
|
||||
10100,
|
||||
6000,
|
||||
6100,
|
||||
6900,
|
||||
11700,
|
||||
11800,
|
||||
400,
|
||||
8900,
|
||||
11900,
|
||||
12000,
|
||||
10900,
|
||||
12100,
|
||||
23,
|
||||
2500,
|
||||
5300,
|
||||
5400,
|
||||
5500,
|
||||
5600,
|
||||
7300,
|
||||
7500,
|
||||
8300,
|
||||
11100,
|
||||
11200,
|
||||
11400,
|
||||
121,
|
||||
2611,
|
||||
2711,
|
||||
2811,
|
||||
8400,
|
||||
11,
|
||||
2612,
|
||||
7900,
|
||||
21,
|
||||
11000,
|
||||
124,
|
||||
10000,
|
||||
3711,
|
||||
7600,
|
||||
12,
|
||||
131,
|
||||
132,
|
||||
1731,
|
||||
200,
|
||||
300,
|
||||
3100,
|
||||
112,
|
||||
12300,
|
||||
8000,
|
||||
141,
|
||||
1441,
|
||||
1600,
|
||||
12600,
|
||||
1421,
|
||||
101,
|
||||
111,
|
||||
1711,
|
||||
3000,
|
||||
1000,
|
||||
1100,
|
||||
2100,
|
||||
12800,
|
||||
1500,
|
||||
12400,
|
||||
500,
|
||||
3200,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user