From 3d70379c39b64d153b5455c191adc11db01b196b Mon Sep 17 00:00:00 2001 From: sein Date: Thu, 22 Dec 2022 22:32:12 +0100 Subject: [PATCH] removed check for 00 bits for compressed hashes as it may be valid for certain zips --- OpenCL/m17200_a0-pure.cl | 4 ++-- OpenCL/m17200_a1-pure.cl | 4 ++-- OpenCL/m17200_a3-pure.cl | 4 ++-- OpenCL/m17220_a0-pure.cl | 4 ++-- OpenCL/m17220_a1-pure.cl | 4 ++-- OpenCL/m17220_a3-pure.cl | 4 ++-- OpenCL/m17225_a0-pure.cl | 4 ++-- OpenCL/m17225_a1-pure.cl | 4 ++-- OpenCL/m17225_a3-pure.cl | 4 ++-- OpenCL/m17230_a0-pure.cl | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/OpenCL/m17200_a0-pure.cl b/OpenCL/m17200_a0-pure.cl index 80d6a6f1a..1fdc1c069 100644 --- a/OpenCL/m17200_a0-pure.cl +++ b/OpenCL/m17200_a0-pure.cl @@ -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); diff --git a/OpenCL/m17200_a1-pure.cl b/OpenCL/m17200_a1-pure.cl index 116304da2..c8ed0d5bc 100644 --- a/OpenCL/m17200_a1-pure.cl +++ b/OpenCL/m17200_a1-pure.cl @@ -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); diff --git a/OpenCL/m17200_a3-pure.cl b/OpenCL/m17200_a3-pure.cl index e34b8a106..1820c38e6 100644 --- a/OpenCL/m17200_a3-pure.cl +++ b/OpenCL/m17200_a3-pure.cl @@ -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); diff --git a/OpenCL/m17220_a0-pure.cl b/OpenCL/m17220_a0-pure.cl index 405b02d6f..a7300768d 100644 --- a/OpenCL/m17220_a0-pure.cl +++ b/OpenCL/m17220_a0-pure.cl @@ -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); diff --git a/OpenCL/m17220_a1-pure.cl b/OpenCL/m17220_a1-pure.cl index ea502dced..7755ee5a8 100644 --- a/OpenCL/m17220_a1-pure.cl +++ b/OpenCL/m17220_a1-pure.cl @@ -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); diff --git a/OpenCL/m17220_a3-pure.cl b/OpenCL/m17220_a3-pure.cl index ef64d3211..2145540af 100644 --- a/OpenCL/m17220_a3-pure.cl +++ b/OpenCL/m17220_a3-pure.cl @@ -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); diff --git a/OpenCL/m17225_a0-pure.cl b/OpenCL/m17225_a0-pure.cl index 21b3fbb16..868ffc8dd 100644 --- a/OpenCL/m17225_a0-pure.cl +++ b/OpenCL/m17225_a0-pure.cl @@ -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); diff --git a/OpenCL/m17225_a1-pure.cl b/OpenCL/m17225_a1-pure.cl index cea5bef24..a4f04f253 100644 --- a/OpenCL/m17225_a1-pure.cl +++ b/OpenCL/m17225_a1-pure.cl @@ -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); diff --git a/OpenCL/m17225_a3-pure.cl b/OpenCL/m17225_a3-pure.cl index be986f945..1704eb848 100644 --- a/OpenCL/m17225_a3-pure.cl +++ b/OpenCL/m17225_a3-pure.cl @@ -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); diff --git a/OpenCL/m17230_a0-pure.cl b/OpenCL/m17230_a0-pure.cl index f72a899d5..b9d8e60ed 100644 --- a/OpenCL/m17230_a0-pure.cl +++ b/OpenCL/m17230_a0-pure.cl @@ -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) {