mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-25 17:38:23 +00:00
removed check for 00 bits for compressed hashes as it may be valid for certain zips
This commit is contained in:
parent
6bd5e6f03f
commit
3d70379c39
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user