arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 16:18:09 +00:00
Code Issues Releases Wiki Activity

fixed size of tmp to be checked on static huffman inflate

Browse Source
This commit is contained in:
Sein Coray 2019-05-15 16:49:52 +02:00
parent 0ea676907a
commit cd7b3ed672
No known key found for this signature in database
GPG Key ID: 44C4180EA69758EC
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenCL/m17200_a0-pure.cl
View File

@ -570,9 +570,9 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
const u32 search[4] = const u32 search[4] =
{ {
digests_buf[digests_offset].digest_buf[DGST_R0], digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1], 0,
digests_buf[digests_offset].digest_buf[DGST_R2], 0,
digests_buf[digests_offset].digest_buf[DGST_R3] 0
}; };
/** /**
@ -725,7 +725,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key012 (key0, key1, key2, plain, l_crc32tab); 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; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue;
mz_stream infstream; 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); 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; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue;
mz_stream infstream; mz_stream infstream;

10
OpenCL/m17200_a1-pure.cl
View File

@ -568,9 +568,9 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t))
const u32 search[4] = const u32 search[4] =
{ {
digests_buf[digests_offset].digest_buf[DGST_R0], digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1], 0,
digests_buf[digests_offset].digest_buf[DGST_R2], 0,
digests_buf[digests_offset].digest_buf[DGST_R3] 0
}; };
/** /**
@ -727,7 +727,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_ESALT (pkzip_t))
update_key012 (key0, key1, key2, plain, l_crc32tab); 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; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue;
mz_stream infstream; 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); 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; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue;
mz_stream infstream; mz_stream infstream;

10
OpenCL/m17200_a3-pure.cl
View File

@ -569,9 +569,9 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
const u32 search[4] = const u32 search[4] =
{ {
digests_buf[digests_offset].digest_buf[DGST_R0], digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1], 0,
digests_buf[digests_offset].digest_buf[DGST_R2], 0,
digests_buf[digests_offset].digest_buf[DGST_R3] 0
}; };
/** /**
@ -740,7 +740,7 @@ KERNEL_FQ void m17200_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key012 (key0, key1, key2, plain, l_crc32tab); 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; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue;
mz_stream infstream; 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); 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; if (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) continue;
mz_stream infstream; mz_stream infstream;

6
OpenCL/m17210_a0-pure.cl
View File

@ -261,9 +261,9 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
const u32 search[4] = const u32 search[4] =
{ {
digests_buf[digests_offset].digest_buf[DGST_R0], digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1], 0,
digests_buf[digests_offset].digest_buf[DGST_R2], 0,
digests_buf[digests_offset].digest_buf[DGST_R3] 0
}; };
/** /**

6
OpenCL/m17210_a1-pure.cl
View File

@ -259,9 +259,9 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_ESALT (pkzip_t))
const u32 search[4] = const u32 search[4] =
{ {
digests_buf[digests_offset].digest_buf[DGST_R0], digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1], 0,
digests_buf[digests_offset].digest_buf[DGST_R2], 0,
digests_buf[digests_offset].digest_buf[DGST_R3] 0
}; };
/** /**

6
OpenCL/m17210_a3-pure.cl
View File

@ -259,9 +259,9 @@ KERNEL_FQ void m17210_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
const u32 search[4] = const u32 search[4] =
{ {
digests_buf[digests_offset].digest_buf[DGST_R0], digests_buf[digests_offset].digest_buf[DGST_R0],
digests_buf[digests_offset].digest_buf[DGST_R1], 0,
digests_buf[digests_offset].digest_buf[DGST_R2], 0,
digests_buf[digests_offset].digest_buf[DGST_R3] 0
}; };
/** /**

4
OpenCL/m17220_a0-pure.cl
View File

@ -721,7 +721,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_RULES_ESALT (pkzip_t))
update_key012 (key0, key1, key2, plain, l_crc32tab); 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 (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break;
if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) 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); 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 (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break;
if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)

4
OpenCL/m17220_a1-pure.cl
View File

@ -721,7 +721,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_ESALT (pkzip_t))
update_key012 (key0, key1, key2, plain, l_crc32tab); 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 (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break;
if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) 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); 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 (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break;
if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)

4
OpenCL/m17220_a3-pure.cl
View File

@ -733,7 +733,7 @@ KERNEL_FQ void m17220_sxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
update_key012 (key0, key1, key2, plain, l_crc32tab); 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 (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break;
if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) 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); 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 (((tmp[0]) & 6) == 4 && !check_inflate_code2 (tmp)) break;
if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1) if (esalt_bufs[digests_offset].hashes[idx].data_type_enum == 1)