From 11295e467990e083f7eb765d48719a56e0cd5e18 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Wed, 14 Jul 2021 17:01:46 +0200 Subject: [PATCH] Fix missing OPTI_TYPE_USES_BITS_64 in several modules --- src/modules/module_09600.c | 1 + src/modules/module_10100.c | 1 + src/modules/module_10700.c | 1 + src/modules/module_11700.c | 3 ++- src/modules/module_11750.c | 3 ++- src/modules/module_11760.c | 3 ++- src/modules/module_11800.c | 3 ++- src/modules/module_11850.c | 3 ++- src/modules/module_11860.c | 3 ++- src/modules/module_19200.c | 3 ++- 10 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/modules/module_09600.c b/src/modules/module_09600.c index abfe9fdee..4d5cb0afd 100644 --- a/src/modules/module_09600.c +++ b/src/modules/module_09600.c @@ -20,6 +20,7 @@ static const u32 HASH_CATEGORY = HASH_CATEGORY_DOCUMENTS; static const char *HASH_NAME = "MS Office 2013"; static const u64 KERN_TYPE = 9600; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64 | OPTI_TYPE_SLOW_HASH_SIMD_LOOP; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_DEEP_COMP_KERNEL; diff --git a/src/modules/module_10100.c b/src/modules/module_10100.c index 092db5cf3..c5cafc8c9 100644 --- a/src/modules/module_10100.c +++ b/src/modules/module_10100.c @@ -21,6 +21,7 @@ static const char *HASH_NAME = "SipHash"; static const u64 KERN_TYPE = 10100; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_NOT_ITERATED + | OPTI_TYPE_USES_BITS_64 | OPTI_TYPE_RAW_HASH; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE; static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED; diff --git a/src/modules/module_10700.c b/src/modules/module_10700.c index 6b6317934..5c801b3c9 100644 --- a/src/modules/module_10700.c +++ b/src/modules/module_10700.c @@ -20,6 +20,7 @@ static const u32 HASH_CATEGORY = HASH_CATEGORY_DOCUMENTS; static const char *HASH_NAME = "PDF 1.7 Level 8 (Acrobat 10 - 11)"; static const u64 KERN_TYPE = 10700; static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64 | OPTI_TYPE_REGISTER_LIMIT; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_HASH_COPY; diff --git a/src/modules/module_11700.c b/src/modules/module_11700.c index eb872087c..ebf903a55 100644 --- a/src/modules/module_11700.c +++ b/src/modules/module_11700.c @@ -19,7 +19,8 @@ static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH; static const char *HASH_NAME = "GOST R 34.11-2012 (Streebog) 256-bit, big-endian"; static const u64 KERN_TYPE = 11700; -static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_PT_ADD01; static const u32 SALT_TYPE = SALT_TYPE_NONE; diff --git a/src/modules/module_11750.c b/src/modules/module_11750.c index 8ef88b63b..f2302db35 100644 --- a/src/modules/module_11750.c +++ b/src/modules/module_11750.c @@ -19,7 +19,8 @@ static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_AUTHENTICATED; static const char *HASH_NAME = "HMAC-Streebog-256 (key = $pass), big-endian"; static const u64 KERN_TYPE = 11750; -static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_PT_ADD01; static const u32 SALT_TYPE = SALT_TYPE_GENERIC; diff --git a/src/modules/module_11760.c b/src/modules/module_11760.c index d81290f24..5c574e469 100644 --- a/src/modules/module_11760.c +++ b/src/modules/module_11760.c @@ -19,7 +19,8 @@ static const u32 DGST_SIZE = DGST_SIZE_4_8; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_AUTHENTICATED; static const char *HASH_NAME = "HMAC-Streebog-256 (key = $salt), big-endian"; static const u64 KERN_TYPE = 11760; -static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_PT_ADD01; static const u32 SALT_TYPE = SALT_TYPE_GENERIC; diff --git a/src/modules/module_11800.c b/src/modules/module_11800.c index 89bd377d9..3c83bc0c0 100644 --- a/src/modules/module_11800.c +++ b/src/modules/module_11800.c @@ -19,7 +19,8 @@ static const u32 DGST_SIZE = DGST_SIZE_4_16; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH; static const char *HASH_NAME = "GOST R 34.11-2012 (Streebog) 512-bit, big-endian"; static const u64 KERN_TYPE = 11800; -static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_PT_ADD01; static const u32 SALT_TYPE = SALT_TYPE_NONE; diff --git a/src/modules/module_11850.c b/src/modules/module_11850.c index 18a993aa2..6bf1853b4 100644 --- a/src/modules/module_11850.c +++ b/src/modules/module_11850.c @@ -19,7 +19,8 @@ static const u32 DGST_SIZE = DGST_SIZE_4_16; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_AUTHENTICATED; static const char *HASH_NAME = "HMAC-Streebog-512 (key = $pass), big-endian"; static const u64 KERN_TYPE = 11850; -static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_PT_ADD01; static const u32 SALT_TYPE = SALT_TYPE_GENERIC; diff --git a/src/modules/module_11860.c b/src/modules/module_11860.c index ad29aa7a5..67a5ff618 100644 --- a/src/modules/module_11860.c +++ b/src/modules/module_11860.c @@ -19,7 +19,8 @@ static const u32 DGST_SIZE = DGST_SIZE_4_16; static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH_AUTHENTICATED; static const char *HASH_NAME = "HMAC-Streebog-512 (key = $salt), big-endian"; static const u64 KERN_TYPE = 11860; -static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_PT_ADD01; static const u32 SALT_TYPE = SALT_TYPE_GENERIC; diff --git a/src/modules/module_19200.c b/src/modules/module_19200.c index 165b66ec9..3dd7b46f6 100644 --- a/src/modules/module_19200.c +++ b/src/modules/module_19200.c @@ -21,7 +21,8 @@ static const u32 DGST_SIZE = DGST_SIZE_8_8; static const u32 HASH_CATEGORY = HASH_CATEGORY_OS; static const char *HASH_NAME = "QNX /etc/shadow (SHA512)"; static const u64 KERN_TYPE = 19200; -static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64; static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE; static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED; static const char *ST_PASS = "hashcat";