From cd7b3ed67263a3d2304cfee9d731b016a190c2e5 Mon Sep 17 00:00:00 2001 From: Sein Coray Date: Wed, 15 May 2019 16:49:52 +0200 Subject: [PATCH] fixed size of tmp to be checked on static huffman inflate --- OpenCL/m17200_a0-pure.cl | 10 +++++----- OpenCL/m17200_a1-pure.cl | 10 +++++----- OpenCL/m17200_a3-pure.cl | 10 +++++----- OpenCL/m17210_a0-pure.cl | 6 +++--- OpenCL/m17210_a1-pure.cl | 6 +++--- OpenCL/m17210_a3-pure.cl | 6 +++--- OpenCL/m17220_a0-pure.cl | 4 ++-- OpenCL/m17220_a1-pure.cl | 4 ++-- OpenCL/m17220_a3-pure.cl | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/OpenCL/m17200_a0-pure.cl b/OpenCL/m17200_a0-pure.cl index bf212a813..e56ddc34b 100644 --- a/OpenCL/m17200_a0-pure.cl +++ b/OpenCL/m17200_a0-pure.cl @@ -570,9 +570,9 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) const u32 search[4] = { digests_buf[digests_offset].digest_buf[DGST_R0], - digests_buf[digests_offset].digest_buf[DGST_R1], - digests_buf[digests_offset].digest_buf[DGST_R2], - digests_buf[digests_offset].digest_buf[DGST_R3] + 0, + 0, + 0 }; /** @@ -725,7 +725,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) continue; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; @@ -951,7 +951,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) continue; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; diff --git a/OpenCL/m17200_a1-pure.cl b/OpenCL/m17200_a1-pure.cl index 08c4beeb1..fc506431e 100644 --- a/OpenCL/m17200_a1-pure.cl +++ b/OpenCL/m17200_a1-pure.cl @@ -568,9 +568,9 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t)) const u32 search[4] = { digests_buf[digests_offset].digest_buf[DGST_R0], - digests_buf[digests_offset].digest_buf[DGST_R1], - digests_buf[digests_offset].digest_buf[DGST_R2], - digests_buf[digests_offset].digest_buf[DGST_R3] + 0, + 0, + 0 }; /** @@ -727,7 +727,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) continue; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; @@ -957,7 +957,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) continue; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; diff --git a/OpenCL/m17200_a3-pure.cl b/OpenCL/m17200_a3-pure.cl index 60e01bfbc..000ec4c35 100644 --- a/OpenCL/m17200_a3-pure.cl +++ b/OpenCL/m17200_a3-pure.cl @@ -569,9 +569,9 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) const u32 search[4] = { digests_buf[digests_offset].digest_buf[DGST_R0], - digests_buf[digests_offset].digest_buf[DGST_R1], - digests_buf[digests_offset].digest_buf[DGST_R2], - digests_buf[digests_offset].digest_buf[DGST_R3] + 0, + 0, + 0 }; /** @@ -740,7 +740,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) continue; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; @@ -982,7 +982,7 @@ KERNEL_FQ void m17200_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) continue; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) continue; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue; mz_stream infstream; diff --git a/OpenCL/m17210_a0-pure.cl b/OpenCL/m17210_a0-pure.cl index e6f4515ad..086333702 100644 --- a/OpenCL/m17210_a0-pure.cl +++ b/OpenCL/m17210_a0-pure.cl @@ -261,9 +261,9 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) const u32 search[4] = { digests_buf[digests_offset].digest_buf[DGST_R0], - digests_buf[digests_offset].digest_buf[DGST_R1], - digests_buf[digests_offset].digest_buf[DGST_R2], - digests_buf[digests_offset].digest_buf[DGST_R3] + 0, + 0, + 0 }; /** diff --git a/OpenCL/m17210_a1-pure.cl b/OpenCL/m17210_a1-pure.cl index 4540b20b2..1573fd3a4 100644 --- a/OpenCL/m17210_a1-pure.cl +++ b/OpenCL/m17210_a1-pure.cl @@ -259,9 +259,9 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_ESALT (pkzip_t)) const u32 search[4] = { digests_buf[digests_offset].digest_buf[DGST_R0], - digests_buf[digests_offset].digest_buf[DGST_R1], - digests_buf[digests_offset].digest_buf[DGST_R2], - digests_buf[digests_offset].digest_buf[DGST_R3] + 0, + 0, + 0 }; /** diff --git a/OpenCL/m17210_a3-pure.cl b/OpenCL/m17210_a3-pure.cl index e5796ecab..5a2939533 100644 --- a/OpenCL/m17210_a3-pure.cl +++ b/OpenCL/m17210_a3-pure.cl @@ -259,9 +259,9 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) const u32 search[4] = { digests_buf[digests_offset].digest_buf[DGST_R0], - digests_buf[digests_offset].digest_buf[DGST_R1], - digests_buf[digests_offset].digest_buf[DGST_R2], - digests_buf[digests_offset].digest_buf[DGST_R3] + 0, + 0, + 0 }; /** diff --git a/OpenCL/m17220_a0-pure.cl b/OpenCL/m17220_a0-pure.cl index 4fd6631ee..4c7773186 100644 --- a/OpenCL/m17220_a0-pure.cl +++ b/OpenCL/m17220_a0-pure.cl @@ -721,7 +721,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) break; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) @@ -986,7 +986,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_RULES_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) break; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) diff --git a/OpenCL/m17220_a1-pure.cl b/OpenCL/m17220_a1-pure.cl index 177fa394d..a7b2d8508 100644 --- a/OpenCL/m17220_a1-pure.cl +++ b/OpenCL/m17220_a1-pure.cl @@ -721,7 +721,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) break; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) @@ -988,7 +988,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) break; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) diff --git a/OpenCL/m17220_a3-pure.cl b/OpenCL/m17220_a3-pure.cl index 3e581367a..e92712dbf 100644 --- a/OpenCL/m17220_a3-pure.cl +++ b/OpenCL/m17220_a3-pure.cl @@ -733,7 +733,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) break; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) @@ -1012,7 +1012,7 @@ KERNEL_FQ void m17220_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t)) update_key012 (key0, key1, key2, plain, l_crc32tab); } - if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 36)) break; + if (((tmp[0]) & 6) == 2 && !check_inflate_code1 (tmp, 24)) break; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break; if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)