arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-21 23:58:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3549 from s3inlc/pkzip-fix

Browse Source 
Remove check which may lead to false negatives on pkzip in rare cases
This commit is contained in:
Jens Steube 2022-12-25 23:26:05 +01:00 committed by GitHub
commit 5989de470b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenCL/m17200_a0-pure.cl
View File

@ -681,7 +681,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) continue;
if ((plain & 6) == 6) continue;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);
@ -907,7 +907,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) continue;
if ((plain & 6) == 6) continue;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);

4
OpenCL/m17200_a1-pure.cl
View File

@ -683,7 +683,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) continue;
if ((plain & 6) == 6) continue;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);
@ -913,7 +913,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) continue;
if ((plain & 6) == 6) continue;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);

4
OpenCL/m17200_a3-pure.cl
View File

@ -696,7 +696,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) continue;
if ((plain & 6) == 6) continue;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);
@ -938,7 +938,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) continue;
if ((plain & 6) == 6) continue;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);

4
OpenCL/m17220_a0-pure.cl
View File

@ -676,7 +676,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break;
if ((plain & 6) == 6) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);
@ -941,7 +941,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break;
if ((plain & 6) == 6) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);

4
OpenCL/m17220_a1-pure.cl
View File

@ -676,7 +676,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break;
if ((plain & 6) == 6) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);
@ -943,7 +943,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break;
if ((plain & 6) == 6) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);

4
OpenCL/m17220_a3-pure.cl
View File

@ -688,7 +688,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break;
if ((plain & 6) == 6) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);
@ -967,7 +967,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if ((plain & 6) == 0 || (plain & 6) == 6) break;
if ((plain & 6) == 6) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);

4
OpenCL/m17225_a0-pure.cl
View File

@ -681,7 +681,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 6)) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);
@ -1009,7 +1009,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 6)) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);

4
OpenCL/m17225_a1-pure.cl
View File

@ -681,7 +681,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 6)) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);
@ -1010,7 +1010,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 6)) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);

4
OpenCL/m17225_a3-pure.cl
View File

@ -693,7 +693,7 @@ KERNEL_FQ void m17225_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 6)) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);
@ -1034,7 +1034,7 @@ KERNEL_FQ void m17225_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key3 (key2, key3);
plain = unpack_v8a_from_v32_S (next) ^ key3;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 0 || (plain & 6) == 6)) break;
if (esalt_bufs[DIGESTS_OFFSET_HOST].hashes[idx].compression_type == 8 && ((plain & 6) == 6)) break;
tmp[0] = plain;
update_key012 (key0, key1, key2, plain, l_crc32tab);

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