arno
/
hashcat
mirror of https://github.com/hashcat/hashcat.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Addressed comments and added 15400 to benchmark.c and tab_completion

Browse Source
pull/1237/head
DoZ10 7 years ago
parent 5683df2e17
commit 6ced398c3c
5 changed files with 66 additions and 86 deletions
Show Stats Download Patch File Download Diff File

45
OpenCL/m15400_a0.cl
Unescape View File

@ -177,24 +177,19 @@ void chacha20_transform (const u32x w0[4], const u32x w1[4], const u32 position[
* Encrypt plaintext with keystream
*/
u32 index = offset / 4;
u32 remain = offset % 4;
const u32 index = offset / 4;
const u32 remain = offset % 4;
digest[0] = plain[1];
digest[1] = plain[0];
if (remain > 0)
{
u32x tmp[3];
tmp[0] = x[index + 0];
tmp[1] = x[index + 1];
tmp[2] = x[index + 2];
digest[1] ^= x[index + 0] >> ( 0 + remain * 8);
digest[1] ^= x[index + 1] << (32 - remain * 8);
digest[1] ^= tmp[0] >> (remain * 8);
digest[1] ^= tmp[1] << (32 - remain * 8);
digest[0] ^= tmp[1] >> (remain * 8);
digest[0] ^= tmp[2] << (32 - remain * 8);
digest[0] ^= x[index + 1] >> ( 0 + remain * 8);
digest[0] ^= x[index + 2] << (32 - remain * 8);
}
else
{
@ -230,10 +225,10 @@ __kernel void m15400_m04 (__global pw_t *pws, __global const kernel_rule_t *rule
* Salt prep
*/
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 position[2] = { 0 };
u32 offset = 0;
u32 offset = 0;
position[0] = esalt_bufs[digests_offset].position[0];
position[1] = esalt_bufs[digests_offset].position[1];
@ -308,21 +303,21 @@ __kernel void m15400_s04 (__global pw_t *pws, __global const kernel_rule_t *rule
* Salt prep
*/
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 position[2] = { 0 };
u32 offset = 0;
u32 offset = 0;
position[0] = esalt_bufs->position[0];
position[1] = esalt_bufs->position[1];
position[0] = esalt_bufs[digests_offset].position[0];
position[1] = esalt_bufs[digests_offset].position[1];
offset = esalt_bufs->offset;
offset = esalt_bufs[digests_offset].offset;
iv[0] = esalt_bufs->iv[0];
iv[1] = esalt_bufs->iv[1];
iv[0] = esalt_bufs[digests_offset].iv[0];
iv[1] = esalt_bufs[digests_offset].iv[1];
plain[0] = esalt_bufs->plain[0];
plain[1] = esalt_bufs->plain[1];
plain[0] = esalt_bufs[digests_offset].plain[0];
plain[1] = esalt_bufs[digests_offset].plain[1];
/**
* digest
@ -344,8 +339,6 @@ __kernel void m15400_s04 (__global pw_t *pws, __global const kernel_rule_t *rule
{
u32x w0[4] = { 0 };
u32x w1[4] = { 0 };
u32x w2[4] = { 0 };
u32x w3[4] = { 0 };
const u32x out_len = apply_rules_vect(pw_buf0, pw_buf1, pw_len, rules_buf, il_pos, w0, w1);

43
OpenCL/m15400_a1.cl
Unescape View File

@ -177,24 +177,19 @@ void chacha20_transform (const u32x w0[4], const u32x w1[4], const u32 position[
* Encrypt plaintext with keystream
*/
u32 index = offset / 4;
u32 remain = offset % 4;
const u32 index = offset / 4;
const u32 remain = offset % 4;
digest[0] = plain[1];
digest[1] = plain[0];
if (remain > 0)
{
u32x tmp[3];
tmp[0] = x[index + 0];
tmp[1] = x[index + 1];
tmp[2] = x[index + 2];
digest[1] ^= x[index + 0] >> ( 0 + remain * 8);
digest[1] ^= x[index + 1] << (32 - remain * 8);
digest[1] ^= tmp[0] >> (remain * 8);
digest[1] ^= tmp[1] << (32 - remain * 8);
digest[0] ^= tmp[1] >> (remain * 8);
digest[0] ^= tmp[2] << (32 - remain * 8);
digest[0] ^= x[index + 1] >> ( 0 + remain * 8);
digest[0] ^= x[index + 2] << (32 - remain * 8);
}
else
{
@ -230,10 +225,10 @@ __kernel void m15400_m04 (__global pw_t *pws, __global const kernel_rule_t *rule
* Salt prep
*/
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 position[2] = { 0 };
u32 offset = 0;
u32 offset = 0;
position[0] = esalt_bufs[digests_offset].position[0];
position[1] = esalt_bufs[digests_offset].position[1];
@ -360,21 +355,21 @@ __kernel void m15400_s04 (__global pw_t *pws, __global const kernel_rule_t *rule
* Salt prep
*/
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 position[2] = { 0 };
u32 offset = 0;
u32 offset = 0;
position[0] = esalt_bufs->position[0];
position[1] = esalt_bufs->position[1];
position[0] = esalt_bufs[digests_offset].position[0];
position[1] = esalt_bufs[digests_offset].position[1];
offset = esalt_bufs->offset;
offset = esalt_bufs[digests_offset].offset;
iv[0] = esalt_bufs->iv[0];
iv[1] = esalt_bufs->iv[1];
iv[0] = esalt_bufs[digests_offset].iv[0];
iv[1] = esalt_bufs[digests_offset].iv[1];
plain[0] = esalt_bufs->plain[0];
plain[1] = esalt_bufs->plain[1];
plain[0] = esalt_bufs[digests_offset].plain[0];
plain[1] = esalt_bufs[digests_offset].plain[1];
/**
* digest

57
OpenCL/m15400_a3.cl
Unescape View File

@ -175,24 +175,19 @@ void chacha20_transform (const u32x w0[4], const u32x w1[4], const u32 position[
* Encrypt plaintext with keystream
*/
u32 index = offset / 4;
u32 remain = offset % 4;
const u32 index = offset / 4;
const u32 remain = offset % 4;
digest[0] = plain[1];
digest[1] = plain[0];
if (remain > 0)
{
u32x tmp[3];
tmp[0] = x[index + 0];
tmp[1] = x[index + 1];
tmp[2] = x[index + 2];
digest[1] ^= x[index + 0] >> ( 0 + remain * 8);
digest[1] ^= x[index + 1] << (32 - remain * 8);
digest[1] ^= tmp[0] >> (remain * 8);
digest[1] ^= tmp[1] << (32 - remain * 8);
digest[0] ^= tmp[1] >> (remain * 8);
digest[0] ^= tmp[2] << (32 - remain * 8);
digest[0] ^= x[index + 1] >> ( 0 + remain * 8);
digest[0] ^= x[index + 2] << (32 - remain * 8);
}
else
{
@ -210,10 +205,8 @@ __kernel void m15400_m04 (__global pw_t *pws, __global const kernel_rule_t *rule
const u32 gid = get_global_id (0);
const u32 lid = get_local_id (0);
u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
u32 w0[4];
u32 w1[4];
w0[0] = pws[gid].i[0];
w0[1] = pws[gid].i[1];
@ -230,10 +223,10 @@ __kernel void m15400_m04 (__global pw_t *pws, __global const kernel_rule_t *rule
* Salt prep
*/
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 position[2] = { 0 };
u32 offset = 0;
u32 offset = 0;
position[0] = esalt_bufs[digests_offset].position[0];
position[1] = esalt_bufs[digests_offset].position[1];
@ -299,10 +292,8 @@ __kernel void m15400_s04 (__global pw_t *pws, __global const kernel_rule_t *rule
const u32 gid = get_global_id (0);
const u32 lid = get_local_id (0);
u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
u32 w0[4];
u32 w1[4];
w0[0] = pws[gid].i[0];
w0[1] = pws[gid].i[1];
@ -313,27 +304,27 @@ __kernel void m15400_s04 (__global pw_t *pws, __global const kernel_rule_t *rule
w1[2] = pws[gid].i[6];
w1[3] = pws[gid].i[7];
u32x out_len = pws[gid].pw_len;
u32 out_len = pws[gid].pw_len;
/**
* Salt prep
*/
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 iv[2] = { 0 };
u32 plain[2] = { 0 };
u32 position[2] = { 0 };
u32 offset = 0;
u32 offset = 0;
position[0] = esalt_bufs->position[0];
position[1] = esalt_bufs->position[1];
position[0] = esalt_bufs[digests_offset].position[0];
position[1] = esalt_bufs[digests_offset].position[1];
offset = esalt_bufs->offset;
offset = esalt_bufs[digests_offset].offset;
iv[0] = esalt_bufs->iv[0];
iv[1] = esalt_bufs->iv[1];
iv[0] = esalt_bufs[digests_offset].iv[0];
iv[1] = esalt_bufs[digests_offset].iv[1];
plain[0] = esalt_bufs->plain[0];
plain[1] = esalt_bufs->plain[1];
plain[0] = esalt_bufs[digests_offset].plain[0];
plain[1] = esalt_bufs[digests_offset].plain[1];
/**
* digest

2
extra/tab_completion/hashcat.sh
Unescape View File

@ -176,7 +176,7 @@ _hashcat ()
{
local VERSION=3.5.0
local HASH_MODES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 124 130 131 132 133 140 141 150 160 200 300 400 500 501 600 900 1000 1100 1400 1410 1411 1420 1421 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 3910 4010 4110 4300 4400 4500 4520 4521 4522 4700 4800 4900 5000 5100 5200 5300 5400 5500 5600 5700 5800 6000 6100 6211 6212 6213 6221 6222 6223 6231 6232 6233 6241 6242 6243 6300 6400 6500 6600 6700 6800 6900 7000 7100 7200 7300 7400 7500 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8800 8900 9000 9100 9200 9300 9400 9500 9600 9700 9710 9720 9800 9810 9820 9900 10000 10100 10200 10300 10400 10410 10420 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11700 11800 11900 12000 12001 12100 12200 12300 12400 12500 12600 12700 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 13900 14000 14100 14700 14800 14900 15000 15100 15200 15300"
local HASH_MODES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 124 130 131 132 133 140 141 150 160 200 300 400 500 501 600 900 1000 1100 1400 1410 1411 1420 1421 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 3910 4010 4110 4300 4400 4500 4520 4521 4522 4700 4800 4900 5000 5100 5200 5300 5400 5500 5600 5700 5800 6000 6100 6211 6212 6213 6221 6222 6223 6231 6232 6233 6241 6242 6243 6300 6400 6500 6600 6700 6800 6900 7000 7100 7200 7300 7400 7500 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8800 8900 9000 9100 9200 9300 9400 9500 9600 9700 9710 9720 9800 9810 9820 9900 10000 10100 10200 10300 10400 10410 10420 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11700 11800 11900 12000 12001 12100 12200 12300 12400 12500 12600 12700 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 13900 14000 14100 14700 14800 14900 15000 15100 15200 15300 15400"
local ATTACK_MODES="0 1 3 6 7"
local HCCAPX_MESSAGE_PAIR="0 1 2 3 4 5"
local OUTFILE_FORMATS="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"

5
src/benchmark.c
Unescape View File

@ -6,7 +6,7 @@
#include "common.h"
#include "benchmark.h"
const unsigned int DEFAULT_BENCHMARK_ALGORITHMS_CNT = 151;
const unsigned int DEFAULT_BENCHMARK_ALGORITHMS_CNT = 152;
const unsigned int DEFAULT_BENCHMARK_ALGORITHMS_BUF[] =
{
@ -160,5 +160,6 @@ const unsigned int DEFAULT_BENCHMARK_ALGORITHMS_BUF[] =
12700,
15200,
13400,
125
125,
15400
};

Write Preview
Loading…
Cancel
Save