arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-11 08:10:59 +00:00
Code Issues Releases Wiki Activity

adding support to 17230 kernel to allow compression types 0 and 8

Browse Source
This commit is contained in:
Sein Coray 2019-05-20 19:54:16 +02:00
parent 90ad225a8c
commit e08fc096cd
No known key found for this signature in database
GPG Key ID: 44C4180EA69758EC
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenCL/m17230_a0-pure.cl
View File

@ -363,7 +363,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key3 (key2, key3); update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3; plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break; if (esalt_bufs[digests_offset].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (idx + 1 == esalt_bufs[digests_offset].hash_count) if (idx + 1 == esalt_bufs[digests_offset].hash_count)
{ {
@ -533,7 +533,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key3 (key2, key3); update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3; plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break; if (esalt_bufs[digests_offset].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (idx + 1 == esalt_bufs[digests_offset].hash_count) if (idx + 1 == esalt_bufs[digests_offset].hash_count)
{ {

4
OpenCL/m17230_a1-pure.cl
View File

@ -363,7 +363,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_ESALT (pkzip_t))
update_key3 (key2, key3); update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3; plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break; if (esalt_bufs[digests_offset].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (idx + 1 == esalt_bufs[digests_offset].hash_count) if (idx + 1 == esalt_bufs[digests_offset].hash_count)
{ {
@ -535,7 +535,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_ESALT (pkzip_t))
update_key3 (key2, key3); update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3; plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break; if (esalt_bufs[digests_offset].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (idx + 1 == esalt_bufs[digests_offset].hash_count) if (idx + 1 == esalt_bufs[digests_offset].hash_count)
{ {

4
OpenCL/m17230_a3-pure.cl
View File

@ -377,7 +377,7 @@ KERNEL_FQ void m17230_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key3 (key2, key3); update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3; plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break; if (esalt_bufs[digests_offset].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (idx + 1 == hash_count) if (idx + 1 == hash_count)
{ {
@ -563,7 +563,7 @@ KERNEL_FQ void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key3 (key2, key3); update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3; plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break; if (esalt_bufs[digests_offset].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (idx + 1 == esalt_bufs[digests_offset].hash_count) if (idx + 1 == esalt_bufs[digests_offset].hash_count)
{ {

2
src/modules/module_17230.c
View File

@ -251,7 +251,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
p = strtok(NULL, "*"); p = strtok(NULL, "*");
if (p == NULL) return PARSER_HASH_LENGTH; if (p == NULL) return PARSER_HASH_LENGTH;
pkzip->hashes[i].compression_type = atoi(p); pkzip->hashes[i].compression_type = atoi(p);
if (pkzip->hashes[i].compression_type != 8) return PARSER_PKZIP_CT_UNMATCHED; if (pkzip->hashes[i].compression_type != 8 && pkzip->hashes[i].compression_type != 0) return PARSER_PKZIP_CT_UNMATCHED;
p = strtok(NULL, "*"); p = strtok(NULL, "*");
if (p == NULL) return PARSER_HASH_LENGTH; if (p == NULL) return PARSER_HASH_LENGTH;