From 62c660afe2f107dd7024dfb5a028463a12e7b248 Mon Sep 17 00:00:00 2001 From: jsteube Date: Sat, 2 Feb 2019 11:11:27 +0100 Subject: [PATCH] Add -m 14600 module --- include/interface_migrate.h | 131 ---------- include/modules.h | 2 +- include/types.h | 2 +- src/hashes.c | 12 - src/interface.c | 4 +- src/interface_migrate.c | 467 +----------------------------------- src/modules/module_00000.c | 2 +- src/modules/module_00010.c | 2 +- src/modules/module_00011.c | 2 +- src/modules/module_00012.c | 2 +- src/modules/module_00020.c | 2 +- src/modules/module_00021.c | 2 +- src/modules/module_00100.c | 2 +- src/modules/module_00101.c | 2 +- src/modules/module_00110.c | 2 +- src/modules/module_00200.c | 2 +- src/modules/module_00300.c | 2 +- src/modules/module_00400.c | 2 +- src/modules/module_00500.c | 2 +- src/modules/module_00501.c | 2 +- src/modules/module_00600.c | 2 +- src/modules/module_00900.c | 2 +- src/modules/module_01000.c | 2 +- src/modules/module_01300.c | 2 +- src/modules/module_01400.c | 2 +- src/modules/module_01500.c | 2 +- src/modules/module_01600.c | 2 +- src/modules/module_01700.c | 2 +- src/modules/module_01800.c | 2 +- src/modules/module_02400.c | 2 +- src/modules/module_02500.c | 2 +- src/modules/module_02501.c | 2 +- src/modules/module_03000.c | 2 +- src/modules/module_03200.c | 2 +- src/modules/module_05100.c | 2 +- src/modules/module_05500.c | 2 +- src/modules/module_05600.c | 2 +- src/modules/module_06211.c | 2 +- src/modules/module_06212.c | 2 +- src/modules/module_06213.c | 2 +- src/modules/module_06221.c | 2 +- src/modules/module_06222.c | 2 +- src/modules/module_06223.c | 2 +- src/modules/module_06231.c | 2 +- src/modules/module_06232.c | 2 +- src/modules/module_06233.c | 2 +- src/modules/module_06241.c | 2 +- src/modules/module_06242.c | 2 +- src/modules/module_06243.c | 2 +- src/modules/module_06300.c | 2 +- src/modules/module_06800.c | 2 +- src/modules/module_07100.c | 2 +- src/modules/module_07500.c | 2 +- src/modules/module_08900.c | 2 +- src/modules/module_09300.c | 2 +- src/modules/module_10800.c | 2 +- src/modules/module_11300.c | 2 +- src/modules/module_11500.c | 2 +- src/modules/module_11600.c | 2 +- src/modules/module_12000.c | 2 +- src/modules/module_12500.c | 2 +- src/modules/module_13000.c | 2 +- src/modules/module_13100.c | 2 +- src/modules/module_13400.c | 2 +- src/modules/module_13500.c | 2 +- src/modules/module_14000.c | 2 +- src/modules/module_14100.c | 2 +- src/modules/module_15300.c | 2 +- src/modules/module_15700.c | 2 +- src/modules/module_15900.c | 2 +- src/modules/module_16800.c | 2 +- src/modules/module_16801.c | 2 +- src/modules/module_17300.c | 2 +- src/modules/module_17400.c | 2 +- src/modules/module_17500.c | 2 +- src/modules/module_17600.c | 2 +- src/modules/module_17700.c | 2 +- src/modules/module_17800.c | 2 +- src/modules/module_17900.c | 2 +- src/modules/module_18000.c | 2 +- src/modules/module_18100.c | 2 +- src/modules/module_18200.c | 2 +- src/modules/module_18300.c | 2 +- src/modules/module_18400.c | 2 +- src/modules/module_18500.c | 2 +- src/modules/module_18600.c | 2 +- src/modules/module_99999.c | 2 +- src/opencl.c | 75 ++++-- 88 files changed, 138 insertions(+), 717 deletions(-) diff --git a/include/interface_migrate.h b/include/interface_migrate.h index b76caa098..fd292eb33 100644 --- a/include/interface_migrate.h +++ b/include/interface_migrate.h @@ -237,21 +237,7 @@ typedef struct electrum_wallet } electrum_wallet_t; -typedef struct luks_tmp -{ - u32 ipad32[8]; - u64 ipad64[8]; - u32 opad32[8]; - u64 opad64[8]; - - u32 dgst32[32]; - u64 dgst64[16]; - - u32 out32[32]; - u64 out64[16]; - -} luks_tmp_t; typedef struct pdf14_tmp { @@ -630,7 +616,6 @@ typedef enum hash_type HASH_TYPE_ORACLET = 48, HASH_TYPE_BSDICRYPT = 49, HASH_TYPE_PLAINTEXT = 54, - HASH_TYPE_LUKS = 55, HASH_TYPE_ITUNES_BACKUP_9 = 56, HASH_TYPE_ITUNES_BACKUP_10 = 57, HASH_TYPE_SKIP32 = 58, @@ -836,7 +821,6 @@ typedef enum rounds_count ROUNDS_AXCRYPT = 10000, ROUNDS_KEEPASS = 6000, ROUNDS_ZIP2 = 1000, - ROUNDS_LUKS = 163044, // this equal to jtr -test ROUNDS_ITUNES9_BACKUP = 10000, ROUNDS_ITUNES101_BACKUP = 10000000, // wtf, i mean, really? ROUNDS_ITUNES102_BACKUP = 10000, @@ -977,7 +961,6 @@ int win8phone_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_bu int opencart_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); int plaintext_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); int sha1cx_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); -int luks_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig, const int keyslot_idx); int itunes_backup_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); int skip32_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); int fortigate_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig); @@ -1011,117 +994,3 @@ typedef struct tc } tc_t; -static const u32 KERN_TYPE_LUKS_SHA1_AES = 14611; -static const u32 KERN_TYPE_LUKS_SHA1_SERPENT = 14612; -static const u32 KERN_TYPE_LUKS_SHA1_TWOFISH = 14613; -static const u32 KERN_TYPE_LUKS_SHA256_AES = 14621; -static const u32 KERN_TYPE_LUKS_SHA256_SERPENT = 14622; -static const u32 KERN_TYPE_LUKS_SHA256_TWOFISH = 14623; -static const u32 KERN_TYPE_LUKS_SHA512_AES = 14631; -static const u32 KERN_TYPE_LUKS_SHA512_SERPENT = 14632; -static const u32 KERN_TYPE_LUKS_SHA512_TWOFISH = 14633; -static const u32 KERN_TYPE_LUKS_RIPEMD160_AES = 14641; -static const u32 KERN_TYPE_LUKS_RIPEMD160_SERPENT = 14642; -static const u32 KERN_TYPE_LUKS_RIPEMD160_TWOFISH = 14643; -static const u32 KERN_TYPE_LUKS_WHIRLPOOL_AES = 14651; -static const u32 KERN_TYPE_LUKS_WHIRLPOOL_SERPENT = 14652; -static const u32 KERN_TYPE_LUKS_WHIRLPOOL_TWOFISH = 14653; - -// original headers from luks.h - -#define LUKS_CIPHERNAME_L 32 -#define LUKS_CIPHERMODE_L 32 -#define LUKS_HASHSPEC_L 32 -#define LUKS_DIGESTSIZE 20 // since SHA1 -#define LUKS_HMACSIZE 32 -#define LUKS_SALTSIZE 32 -#define LUKS_NUMKEYS 8 -// Minimal number of iterations -#define LUKS_MKD_ITERATIONS_MIN 1000 -#define LUKS_SLOT_ITERATIONS_MIN 1000 -#define LUKS_KEY_DISABLED_OLD 0 -#define LUKS_KEY_ENABLED_OLD 0xCAFE -#define LUKS_KEY_DISABLED 0x0000DEAD -#define LUKS_KEY_ENABLED 0x00AC71F3 -#define LUKS_STRIPES 4000 -// partition header starts with magic -#define LUKS_MAGIC {'L','U','K','S', 0xba, 0xbe}; -#define LUKS_MAGIC_L 6 -/* Actually we need only 37, but we don't want struct autoaligning to kick in */ -#define UUID_STRING_L 40 -/* Offset to keyslot area [in bytes] */ -#define LUKS_ALIGN_KEYSLOTS 4096 - -struct luks_phdr { - char magic[LUKS_MAGIC_L]; - uint16_t version; - char cipherName[LUKS_CIPHERNAME_L]; - char cipherMode[LUKS_CIPHERMODE_L]; - char hashSpec[LUKS_HASHSPEC_L]; - uint32_t payloadOffset; - uint32_t keyBytes; - char mkDigest[LUKS_DIGESTSIZE]; - char mkDigestSalt[LUKS_SALTSIZE]; - uint32_t mkDigestIterations; - char uuid[UUID_STRING_L]; - struct { - uint32_t active; - /* parameters used for password processing */ - uint32_t passwordIterations; - char passwordSalt[LUKS_SALTSIZE]; - /* parameters used for AF store/load */ - uint32_t keyMaterialOffset; - uint32_t stripes; - } keyblock[LUKS_NUMKEYS]; - /* Align it to 512 sector size */ - char _padding[432]; -}; - -// not from original headers start with hc_ - -typedef enum hc_luks_hash_type -{ - HC_LUKS_HASH_TYPE_SHA1 = 1, - HC_LUKS_HASH_TYPE_SHA256 = 2, - HC_LUKS_HASH_TYPE_SHA512 = 3, - HC_LUKS_HASH_TYPE_RIPEMD160 = 4, - HC_LUKS_HASH_TYPE_WHIRLPOOL = 5, - -} hc_luks_hash_type_t; - -typedef enum hc_luks_key_size -{ - HC_LUKS_KEY_SIZE_128 = 128, - HC_LUKS_KEY_SIZE_256 = 256, - HC_LUKS_KEY_SIZE_512 = 512, - -} hc_luks_key_size_t; - -typedef enum hc_luks_cipher_type -{ - HC_LUKS_CIPHER_TYPE_AES = 1, - HC_LUKS_CIPHER_TYPE_SERPENT = 2, - HC_LUKS_CIPHER_TYPE_TWOFISH = 3, - -} hc_luks_cipher_type_t; - -typedef enum hc_luks_cipher_mode -{ - HC_LUKS_CIPHER_MODE_CBC_ESSIV = 1, - HC_LUKS_CIPHER_MODE_CBC_PLAIN = 2, - HC_LUKS_CIPHER_MODE_XTS_PLAIN = 3, - -} hc_luks_cipher_mode_t; - -typedef struct luks -{ - int hash_type; // hc_luks_hash_type_t - int key_size; // hc_luks_key_size_t - int cipher_type; // hc_luks_cipher_type_t - int cipher_mode; // hc_luks_cipher_mode_t - - u32 ct_buf[128]; - - u32 af_src_buf[((HC_LUKS_KEY_SIZE_512 / 8) * LUKS_STRIPES) / 4]; - -} luks_t; diff --git a/include/modules.h b/include/modules.h index 1ec16a8b5..d681a08e7 100644 --- a/include/modules.h +++ b/include/modules.h @@ -55,7 +55,6 @@ bool module_warmup_disable (MAYBE_UNUSED const hashconfig_t *ha int module_hash_binary_count (MAYBE_UNUSED const hashes_t *hashes); int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, hashes_t *hashes); int module_hash_binary_save (MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED const u32 salt_pos, MAYBE_UNUSED const u32 digest_pos, char **buf); -bool module_hash_binary_verify (MAYBE_UNUSED const hashes_t *hashes); int module_hash_decode_outfile (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len); int module_hash_decode_zero_hash (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info); @@ -63,6 +62,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *ha int module_hash_encode_status (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size); int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size); +u64 module_kern_type_dynamic (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info); u64 module_extra_buffer_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED const hc_device_param_t *device_param); u64 module_extra_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, MAYBE_UNUSED const hashes_t *hashes); char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED const hc_device_param_t *device_param); diff --git a/include/types.h b/include/types.h index 2022995a9..3b15de933 100644 --- a/include/types.h +++ b/include/types.h @@ -2323,7 +2323,6 @@ typedef struct module_ctx int (*module_hash_binary_count) (const hashes_t *); int (*module_hash_binary_parse) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *, hashes_t *); int (*module_hash_binary_save) (const hashes_t *, const u32, const u32, char **); - bool (*module_hash_binary_verify) (const hashes_t *); int (*module_hash_decode_outfile) (const hashconfig_t *, void *, salt_t *, void *, void *, hashinfo_t *, const char *, const int); int (*module_hash_decode_zero_hash) (const hashconfig_t *, void *, salt_t *, void *, void *, hashinfo_t *); @@ -2331,6 +2330,7 @@ typedef struct module_ctx int (*module_hash_encode_status) (const hashconfig_t *, const void *, const salt_t *, const void *, const void *, const hashinfo_t *, char *, int); int (*module_hash_encode) (const hashconfig_t *, const void *, const salt_t *, const void *, const void *, const hashinfo_t *, char *, int); + u64 (*module_kern_type_dynamic) (const hashconfig_t *, const void *, const salt_t *, const void *, const void *, const hashinfo_t *); u64 (*module_extra_buffer_size) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *, const hashes_t *, const hc_device_param_t *); u64 (*module_extra_tmp_size) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *, const hashes_t *); char *(*module_jit_build_options) (const hashconfig_t *, const user_options_t *, const user_options_extra_t *, const hashes_t *, const hc_device_param_t *); diff --git a/src/hashes.c b/src/hashes.c index e3832f632..3b9f5075b 100644 --- a/src/hashes.c +++ b/src/hashes.c @@ -560,18 +560,6 @@ int hashes_init_stage1 (hashcat_ctx_t *hashcat_ctx) return -1; } - if (module_ctx->module_hash_binary_verify != MODULE_DEFAULT) - { - const bool rc_verify = module_ctx->module_hash_binary_verify (hashes); - - if (rc_verify == false) - { - event_log_error (hashcat_ctx, "%s: %s", hashes->hashfile, strerror (errno)); - - return -1; - } - } - if (module_ctx->module_hash_binary_count != MODULE_DEFAULT) { const int binary_count = module_ctx->module_hash_binary_count (hashes); diff --git a/src/interface.c b/src/interface.c index 3eb6d167a..980c09111 100644 --- a/src/interface.c +++ b/src/interface.c @@ -316,6 +316,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) CHECK_DEFINED (module_ctx->module_kernel_threads_min); CHECK_DEFINED (module_ctx->module_kernel_threads_max); CHECK_DEFINED (module_ctx->module_kern_type); + CHECK_DEFINED (module_ctx->module_kern_type_dynamic); CHECK_DEFINED (module_ctx->module_opti_type); CHECK_DEFINED (module_ctx->module_opts_type); CHECK_DEFINED (module_ctx->module_outfile_check_disable); @@ -337,7 +338,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) CHECK_DEFINED (module_ctx->module_hash_binary_count); CHECK_DEFINED (module_ctx->module_hash_binary_parse); CHECK_DEFINED (module_ctx->module_hash_binary_save); - CHECK_DEFINED (module_ctx->module_hash_binary_verify); CHECK_DEFINED (module_ctx->module_hash_decode_outfile); CHECK_DEFINED (module_ctx->module_hash_decode_zero_hash); CHECK_DEFINED (module_ctx->module_hash_decode); @@ -456,7 +456,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) hashconfig->has_optimized_kernel = false; hashconfig->has_pure_kernel = false; - if (hashconfig->kern_type == (u32) -1) + if (module_ctx->module_kern_type_dynamic != MODULE_DEFAULT) { // some hash modes tell hashcat about their exact hash-mode inside the parser (eg. luks and jwt) } diff --git a/src/interface_migrate.c b/src/interface_migrate.c index eb338be1e..007123a90 100644 --- a/src/interface_migrate.c +++ b/src/interface_migrate.c @@ -161,7 +161,6 @@ " Y | 2 = XTS 1024 bit cascaded Serpent-AES | Full-Disk Encryption (FDE)", " Y | 2 = XTS 1024 bit cascaded Twofish-Serpent | Full-Disk Encryption (FDE)", " Y | 3 = XTS 1536 bit all | Full-Disk Encryption (FDE)", - " 14600 | LUKS | Full-Disk Encryption (FDE)", " 16700 | FileVault 2 | Full-Disk Encryption (FDE)", " 9700 | MS Office <= 2003 $0/$1, MD5 + RC4 | Documents", " 9710 | MS Office <= 2003 $0/$1, MD5 + RC4, collider #1 | Documents", @@ -207,7 +206,6 @@ static const char *ST_PASS_BIN_10410 = "\x6a\x8a\xed\xcc\xb7"; * * ST_HASH_1374x missing example hash * ST_HASH_1376x missing example hash - * ST_HASH_14600 multi-hash-mode algorithm, unlikely to match self-test hash settings * ST_HASH_16500 multi-hash-mode algorithm, unlikely to match self-test hash settings */ @@ -510,7 +508,6 @@ static const char *HT_13600 = "WinZip"; static const char *HT_13800 = "Windows Phone 8+ PIN/password"; static const char *HT_13900 = "OpenCart"; static const char *HT_14400 = "sha1(CX)"; -static const char *HT_14600 = "LUKS"; static const char *HT_14700 = "iTunes backup < 10.0"; static const char *HT_14800 = "iTunes backup >= 10.0"; static const char *HT_14900 = "Skip32 (PT = $salt, key = $pass)"; @@ -1831,392 +1828,6 @@ static void drupal7_encode (const u8 digest[64], u8 buf[43]) //buf[43] = int_to_itoa64 (l & 0x3f); } - - - - -int luks_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig, const int keyslot_idx) -{ - u32 *digest = (u32 *) hash_buf->digest; - - salt_t *salt = hash_buf->salt; - - luks_t *luks = (luks_t *) hash_buf->esalt; - - if (input_len == 0) return (PARSER_HASH_LENGTH); - - FILE *fp = fopen ((const char *) input_buf, "rb"); - - if (fp == NULL) return (PARSER_HASH_FILE); - - struct luks_phdr hdr; - - const size_t nread = hc_fread (&hdr, sizeof (hdr), 1, fp); - - if (nread != 1) - { - fclose (fp); - - return (PARSER_LUKS_FILE_SIZE); - } - - // copy digest which we're not using ;) - - u32 *mkDigest_ptr = (u32 *) hdr.mkDigest; - - digest[0] = mkDigest_ptr[0]; - digest[1] = mkDigest_ptr[1]; - digest[2] = mkDigest_ptr[2]; - digest[3] = mkDigest_ptr[3]; - digest[4] = mkDigest_ptr[4]; - digest[5] = 0; - digest[6] = 0; - digest[7] = 0; - - // verify the content - - char luks_magic[6] = LUKS_MAGIC; - - if (memcmp (hdr.magic, luks_magic, LUKS_MAGIC_L) != 0) - { - fclose (fp); - - return (PARSER_LUKS_MAGIC); - } - - if (byte_swap_16 (hdr.version) != 1) - { - fclose (fp); - - return (PARSER_LUKS_VERSION); - } - - if (strcmp (hdr.cipherName, "aes") == 0) - { - luks->cipher_type = HC_LUKS_CIPHER_TYPE_AES; - } - else if (strcmp (hdr.cipherName, "serpent") == 0) - { - luks->cipher_type = HC_LUKS_CIPHER_TYPE_SERPENT; - } - else if (strcmp (hdr.cipherName, "twofish") == 0) - { - luks->cipher_type = HC_LUKS_CIPHER_TYPE_TWOFISH; - } - else - { - fclose (fp); - - return (PARSER_LUKS_CIPHER_TYPE); - } - - if (strcmp (hdr.cipherMode, "cbc-essiv:sha256") == 0) - { - luks->cipher_mode = HC_LUKS_CIPHER_MODE_CBC_ESSIV; - } - else if (strcmp (hdr.cipherMode, "cbc-plain") == 0) - { - luks->cipher_mode = HC_LUKS_CIPHER_MODE_CBC_PLAIN; - } - else if (strcmp (hdr.cipherMode, "cbc-plain64") == 0) - { - luks->cipher_mode = HC_LUKS_CIPHER_MODE_CBC_PLAIN; - } - else if (strcmp (hdr.cipherMode, "xts-plain") == 0) - { - luks->cipher_mode = HC_LUKS_CIPHER_MODE_XTS_PLAIN; - } - else if (strcmp (hdr.cipherMode, "xts-plain64") == 0) - { - luks->cipher_mode = HC_LUKS_CIPHER_MODE_XTS_PLAIN; - } - else - { - fclose (fp); - - return (PARSER_LUKS_CIPHER_MODE); - } - - if (strcmp (hdr.hashSpec, "sha1") == 0) - { - luks->hash_type = HC_LUKS_HASH_TYPE_SHA1; - } - else if (strcmp (hdr.hashSpec, "sha256") == 0) - { - luks->hash_type = HC_LUKS_HASH_TYPE_SHA256; - } - else if (strcmp (hdr.hashSpec, "sha512") == 0) - { - luks->hash_type = HC_LUKS_HASH_TYPE_SHA512; - } - else if (strcmp (hdr.hashSpec, "ripemd160") == 0) - { - luks->hash_type = HC_LUKS_HASH_TYPE_RIPEMD160; - } - else if (strcmp (hdr.hashSpec, "whirlpool") == 0) - { - luks->hash_type = HC_LUKS_HASH_TYPE_WHIRLPOOL; - } - else - { - fclose (fp); - - return (PARSER_LUKS_HASH_TYPE); - } - - const u32 keyBytes = byte_swap_32 (hdr.keyBytes); - - if (keyBytes == 16) - { - luks->key_size = HC_LUKS_KEY_SIZE_128; - } - else if (keyBytes == 32) - { - luks->key_size = HC_LUKS_KEY_SIZE_256; - } - else if (keyBytes == 64) - { - luks->key_size = HC_LUKS_KEY_SIZE_512; - } - else - { - fclose (fp); - - return (PARSER_LUKS_KEY_SIZE); - } - - // find the correct kernel based on hash and cipher - - // we need to do this kind of check, otherwise an eventual matching hash from the potfile overwrites the kern_type with an eventual invalid one - - if (hashconfig->kern_type == (u32) -1) - { - if ((luks->hash_type == HC_LUKS_HASH_TYPE_SHA1) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_SHA1_AES; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_SHA1) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_SHA1_SERPENT; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_SHA1) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_SHA1_TWOFISH; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_SHA256) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_SHA256_AES; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_SHA256) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_SHA256_SERPENT; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_SHA256) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_SHA256_TWOFISH; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_SHA512) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_SHA512_AES; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_SHA512) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_SHA512_SERPENT; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_SHA512) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_SHA512_TWOFISH; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_RIPEMD160) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_RIPEMD160_AES; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_RIPEMD160) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_RIPEMD160_SERPENT; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_RIPEMD160) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_RIPEMD160_TWOFISH; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_WHIRLPOOL) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_WHIRLPOOL_AES; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_WHIRLPOOL) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_WHIRLPOOL_SERPENT; - } - else if ((luks->hash_type == HC_LUKS_HASH_TYPE_WHIRLPOOL) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - hashconfig->kern_type = KERN_TYPE_LUKS_WHIRLPOOL_TWOFISH; - } - else - { - fclose (fp); - - return (PARSER_LUKS_HASH_CIPHER); - } - } - else - { - if ((hashconfig->kern_type == KERN_TYPE_LUKS_SHA1_AES) && (luks->hash_type == HC_LUKS_HASH_TYPE_SHA1) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_SHA1_SERPENT) && (luks->hash_type == HC_LUKS_HASH_TYPE_SHA1) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_SHA1_TWOFISH) && (luks->hash_type == HC_LUKS_HASH_TYPE_SHA1) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_SHA256_AES) && (luks->hash_type == HC_LUKS_HASH_TYPE_SHA256) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_SHA256_SERPENT) && (luks->hash_type == HC_LUKS_HASH_TYPE_SHA256) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_SHA256_TWOFISH) && (luks->hash_type == HC_LUKS_HASH_TYPE_SHA256) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_SHA512_AES) && (luks->hash_type == HC_LUKS_HASH_TYPE_SHA512) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_SHA512_SERPENT) && (luks->hash_type == HC_LUKS_HASH_TYPE_SHA512) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_SHA512_TWOFISH) && (luks->hash_type == HC_LUKS_HASH_TYPE_SHA512) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_RIPEMD160_AES) && (luks->hash_type == HC_LUKS_HASH_TYPE_RIPEMD160) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_RIPEMD160_SERPENT) && (luks->hash_type == HC_LUKS_HASH_TYPE_RIPEMD160) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_RIPEMD160_TWOFISH) && (luks->hash_type == HC_LUKS_HASH_TYPE_RIPEMD160) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_WHIRLPOOL_AES) && (luks->hash_type == HC_LUKS_HASH_TYPE_WHIRLPOOL) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_AES)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_WHIRLPOOL_SERPENT) && (luks->hash_type == HC_LUKS_HASH_TYPE_WHIRLPOOL) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_SERPENT)) - { - // OK - } - else if ((hashconfig->kern_type == KERN_TYPE_LUKS_WHIRLPOOL_TWOFISH) && (luks->hash_type == HC_LUKS_HASH_TYPE_WHIRLPOOL) && (luks->cipher_type == HC_LUKS_CIPHER_TYPE_TWOFISH)) - { - // OK - } - else - { - fclose (fp); - - return (PARSER_LUKS_HASH_CIPHER); - } - } - - // verify the selected keyslot informations - - const u32 active = byte_swap_32 (hdr.keyblock[keyslot_idx].active); - const u32 stripes = byte_swap_32 (hdr.keyblock[keyslot_idx].stripes); - - if (active != LUKS_KEY_ENABLED) - { - fclose (fp); - - return (PARSER_LUKS_KEY_DISABLED); - } - - if (stripes != LUKS_STRIPES) - { - fclose (fp); - - return (PARSER_LUKS_KEY_STRIPES); - } - - // configure the salt (not esalt) - - u32 *passwordSalt_ptr = (u32 *) hdr.keyblock[keyslot_idx].passwordSalt; - - salt->salt_buf[0] = passwordSalt_ptr[0]; - salt->salt_buf[1] = passwordSalt_ptr[1]; - salt->salt_buf[2] = passwordSalt_ptr[2]; - salt->salt_buf[3] = passwordSalt_ptr[3]; - salt->salt_buf[4] = passwordSalt_ptr[4]; - salt->salt_buf[5] = passwordSalt_ptr[5]; - salt->salt_buf[6] = passwordSalt_ptr[6]; - salt->salt_buf[7] = passwordSalt_ptr[7]; - - salt->salt_len = LUKS_SALTSIZE; - - const u32 passwordIterations = byte_swap_32 (hdr.keyblock[keyslot_idx].passwordIterations); - - salt->salt_iter = passwordIterations - 1; - - // Load AF data for this keyslot into esalt - - const u32 keyMaterialOffset = byte_swap_32 (hdr.keyblock[keyslot_idx].keyMaterialOffset); - - const int rc_seek1 = fseeko (fp, keyMaterialOffset * 512, SEEK_SET); - - if (rc_seek1 == -1) - { - fclose (fp); - - return (PARSER_LUKS_FILE_SIZE); - } - - const size_t nread2 = hc_fread (luks->af_src_buf, keyBytes, stripes, fp); - - if (nread2 != stripes) - { - fclose (fp); - - return (PARSER_LUKS_FILE_SIZE); - } - - // finally, copy some encrypted payload data for entropy check - - const u32 payloadOffset = byte_swap_32 (hdr.payloadOffset); - - const int rc_seek2 = fseeko (fp, payloadOffset * 512, SEEK_SET); - - if (rc_seek2 == -1) - { - fclose (fp); - - return (PARSER_LUKS_FILE_SIZE); - } - - const size_t nread3 = hc_fread (luks->ct_buf, sizeof (u32), 128, fp); - - if (nread3 != 128) - { - fclose (fp); - - return (PARSER_LUKS_FILE_SIZE); - } - - // that should be it, close the fp - - fclose (fp); - - return (PARSER_OK); -} - int cisco4_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED hashconfig_t *hashconfig) { u32 *digest = (u32 *) hash_buf->digest; @@ -13614,8 +13225,6 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo break; case 12600: salt->salt_len = 64; break; - case 14600: salt->salt_len = LUKS_SALTSIZE; - break; case 14700: salt->salt_len = 20; break; case 14800: salt->salt_len = 20; @@ -13677,11 +13286,6 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo ((zip2_t *) esalt)->data_len = 32; ((zip2_t *) esalt)->mode = 3; break; - case 14600: hashconfig->kern_type = KERN_TYPE_LUKS_SHA1_AES; - ((luks_t *) esalt)->key_size = HC_LUKS_KEY_SIZE_256; - ((luks_t *) esalt)->cipher_type = HC_LUKS_CIPHER_TYPE_AES; - ((luks_t *) esalt)->cipher_mode = HC_LUKS_CIPHER_MODE_XTS_PLAIN; - break; case 16300: ((ethereum_presale_t *) esalt)->enc_seed_len = 608; break; case 16500: hashconfig->kern_type = KERN_TYPE_JWT_HS256; @@ -13806,8 +13410,6 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo break; case 13773: salt->salt_iter = ROUNDS_VERACRYPT_500000; break; - case 14600: salt->salt_iter = ROUNDS_LUKS; - break; case 14700: salt->salt_iter = ROUNDS_ITUNES9_BACKUP - 1; break; case 14800: salt->salt_iter = ROUNDS_ITUNES101_BACKUP - 1; @@ -15636,10 +15238,6 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const int out_size, byte_swap_32 (digest_buf[3]), byte_swap_32 (digest_buf[4])); } - else if (hash_mode == 14600) - { - snprintf (out_buf, out_size, "%s", hashfile); - } else if (hash_mode == 14700) { // WPKY @@ -19606,24 +19204,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN; break; - case 14600: hashconfig->hash_type = HASH_TYPE_LUKS; - hashconfig->salt_type = SALT_TYPE_EMBEDDED; - hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL; - hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE - | OPTS_TYPE_BINARY_HASHFILE; - hashconfig->kern_type = (u32) -1; // this gets overwritten from within parser - hashconfig->dgst_size = DGST_SIZE_4_16; - hashconfig->parse_func = NULL; // luks_parse_hash is kind of unconvetional - hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE - | OPTI_TYPE_SLOW_HASH_SIMD_LOOP; - hashconfig->dgst_pos0 = 0; - hashconfig->dgst_pos1 = 1; - hashconfig->dgst_pos2 = 2; - hashconfig->dgst_pos3 = 3; - hashconfig->st_hash = NULL; - hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN; - break; - case 14700: hashconfig->hash_type = HASH_TYPE_ITUNES_BACKUP_9; hashconfig->salt_type = SALT_TYPE_EMBEDDED; hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL; @@ -20004,7 +19584,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) case 13772: hashconfig->esalt_size = sizeof (tc_t); break; case 13773: hashconfig->esalt_size = sizeof (tc_t); break; case 13800: hashconfig->esalt_size = sizeof (win8phone_t); break; - case 14600: hashconfig->esalt_size = sizeof (luks_t); break; case 14700: hashconfig->esalt_size = sizeof (itunes_backup_t); break; case 14800: hashconfig->esalt_size = sizeof (itunes_backup_t); break; case 15400: hashconfig->esalt_size = sizeof (chacha20_t); break; @@ -20078,7 +19657,6 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx) case 13771: hashconfig->tmp_size = sizeof (vc64_sbog_tmp_t); break; case 13772: hashconfig->tmp_size = sizeof (vc64_sbog_tmp_t); break; case 13773: hashconfig->tmp_size = sizeof (vc64_sbog_tmp_t); break; - case 14600: hashconfig->tmp_size = sizeof (luks_tmp_t); break; case 14700: hashconfig->tmp_size = sizeof (pbkdf2_sha1_tmp_t); break; case 14800: hashconfig->tmp_size = sizeof (pbkdf2_sha256_tmp_t); break; case 15100: hashconfig->tmp_size = sizeof (pbkdf1_sha1_tmp_t); break; @@ -20362,7 +19940,7 @@ bool outfile_check_disable if ((hashconfig->hash_mode == 5200) || (hashconfig->hash_mode == 9000) || ((hashconfig->hash_mode >= 13700) && (hashconfig->hash_mode <= 13799)) || - (hashconfig->hash_mode == 14600)) return 0; + } bool potfile_disable @@ -20372,7 +19950,7 @@ bool potfile_disable if (hashconfig->hash_mode == 9000) return 0; if ((hashconfig->hash_mode >= 13700) && (hashconfig->hash_mode <= 13799)) return 0; - if (hashconfig->hash_mode == 14600) return 0; + } int build_plain_postprocess (const u32 *src_buf, MAYBE_UNUSED const size_t src_sz, const int src_len, u32 *dst_buf, MAYBE_UNUSED const size_t dst_sz) @@ -20422,49 +20000,8 @@ u32 module_deep_comp_kernel (MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED c } -int module_hash_binary_count (MAYBE_UNUSED const hashes_t *hashes) -{ - - else if (hashconfig->hash_mode == 14600) - { - return LUKS_NUMKEYS; - } -} -int module_hash_binary_parse () -{ - - else if (hashconfig->hash_mode == 14600) - { - hashes->hashlist_mode = HL_MODE_FILE; - - for (int keyslot_idx = 0; keyslot_idx < LUKS_NUMKEYS; keyslot_idx++) - { - parser_status = luks_parse_hash ((u8 *) hash_buf, (const int) hash_len, &hashes_buf[hashes_cnt], hashconfig, keyslot_idx); - - if (parser_status != PARSER_OK) - { - if (parser_status != PARSER_LUKS_KEY_DISABLED) continue; - } - - hashes_cnt++; - } - } - - return hashes_cnt; -} - -bool module_hash_binary_verify (MAYBE_UNUSED const hashes_t *hashes) -{ - - else if (hashconfig->hash_mode == 14600) - { - - } - - return true; -} void decoder_apply_optimizer (const hashconfig_t *hashconfig, void *data) { diff --git a/src/modules/module_00000.c b/src/modules/module_00000.c index 92d3be916..aa355fc2e 100644 --- a/src/modules/module_00000.c +++ b/src/modules/module_00000.c @@ -138,7 +138,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -162,6 +161,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00010.c b/src/modules/module_00010.c index f03646cdc..0be9817f0 100644 --- a/src/modules/module_00010.c +++ b/src/modules/module_00010.c @@ -166,7 +166,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -190,6 +189,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00011.c b/src/modules/module_00011.c index afbd74cd0..f78ec700a 100644 --- a/src/modules/module_00011.c +++ b/src/modules/module_00011.c @@ -166,7 +166,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -190,6 +189,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00012.c b/src/modules/module_00012.c index 08332baf5..8de7b75a9 100644 --- a/src/modules/module_00012.c +++ b/src/modules/module_00012.c @@ -157,7 +157,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -181,6 +180,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00020.c b/src/modules/module_00020.c index 2abaa60dc..3a26ba6ed 100644 --- a/src/modules/module_00020.c +++ b/src/modules/module_00020.c @@ -165,7 +165,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -189,6 +188,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00021.c b/src/modules/module_00021.c index 0a5d2e4af..9be21c83d 100644 --- a/src/modules/module_00021.c +++ b/src/modules/module_00021.c @@ -156,7 +156,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -180,6 +179,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00100.c b/src/modules/module_00100.c index 769be2952..5dc2417a0 100644 --- a/src/modules/module_00100.c +++ b/src/modules/module_00100.c @@ -140,7 +140,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -164,6 +163,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00101.c b/src/modules/module_00101.c index 5bd68d768..872680b72 100644 --- a/src/modules/module_00101.c +++ b/src/modules/module_00101.c @@ -146,7 +146,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -170,6 +169,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00110.c b/src/modules/module_00110.c index e0a86545d..160662bfc 100644 --- a/src/modules/module_00110.c +++ b/src/modules/module_00110.c @@ -168,7 +168,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -192,6 +191,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00200.c b/src/modules/module_00200.c index 6d329a4b3..d3afdcf8d 100644 --- a/src/modules/module_00200.c +++ b/src/modules/module_00200.c @@ -126,7 +126,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -150,6 +149,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00300.c b/src/modules/module_00300.c index 6f7279c3a..7a444397b 100644 --- a/src/modules/module_00300.c +++ b/src/modules/module_00300.c @@ -139,7 +139,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -163,6 +162,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00400.c b/src/modules/module_00400.c index 6d7ad2afb..8dc73281e 100644 --- a/src/modules/module_00400.c +++ b/src/modules/module_00400.c @@ -247,7 +247,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -271,6 +270,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00500.c b/src/modules/module_00500.c index d1f5d221b..a151f5ce2 100644 --- a/src/modules/module_00500.c +++ b/src/modules/module_00500.c @@ -264,7 +264,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -288,6 +287,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00501.c b/src/modules/module_00501.c index ed66b2527..47098a959 100644 --- a/src/modules/module_00501.c +++ b/src/modules/module_00501.c @@ -305,7 +305,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -329,6 +328,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00600.c b/src/modules/module_00600.c index 90b11eff3..de784ffbe 100644 --- a/src/modules/module_00600.c +++ b/src/modules/module_00600.c @@ -173,7 +173,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -197,6 +196,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_00900.c b/src/modules/module_00900.c index b023a6e48..0295dc5f6 100644 --- a/src/modules/module_00900.c +++ b/src/modules/module_00900.c @@ -138,7 +138,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -162,6 +161,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_01000.c b/src/modules/module_01000.c index 6bd2cade3..371c28d89 100644 --- a/src/modules/module_01000.c +++ b/src/modules/module_01000.c @@ -141,7 +141,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -165,6 +164,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_01300.c b/src/modules/module_01300.c index 8f321fbee..2ce3a398c 100644 --- a/src/modules/module_01300.c +++ b/src/modules/module_01300.c @@ -146,7 +146,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -170,6 +169,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_01400.c b/src/modules/module_01400.c index c597221b1..568b913e1 100644 --- a/src/modules/module_01400.c +++ b/src/modules/module_01400.c @@ -149,7 +149,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -173,6 +172,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_01500.c b/src/modules/module_01500.c index 1d9c6d8ed..cfda1764e 100644 --- a/src/modules/module_01500.c +++ b/src/modules/module_01500.c @@ -225,7 +225,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -249,6 +248,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_01600.c b/src/modules/module_01600.c index e4ef2646c..4239952c9 100644 --- a/src/modules/module_01600.c +++ b/src/modules/module_01600.c @@ -264,7 +264,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -288,6 +287,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_01700.c b/src/modules/module_01700.c index 7d8742148..e6962f2e8 100644 --- a/src/modules/module_01700.c +++ b/src/modules/module_01700.c @@ -150,7 +150,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -174,6 +173,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_01800.c b/src/modules/module_01800.c index 992c81007..817883257 100644 --- a/src/modules/module_01800.c +++ b/src/modules/module_01800.c @@ -529,7 +529,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -553,6 +552,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_02400.c b/src/modules/module_02400.c index 3b04c8e07..da72d399d 100644 --- a/src/modules/module_02400.c +++ b/src/modules/module_02400.c @@ -164,7 +164,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -188,6 +187,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_02500.c b/src/modules/module_02500.c index 7f7962033..2a6ec45ca 100644 --- a/src/modules/module_02500.c +++ b/src/modules/module_02500.c @@ -807,7 +807,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = module_hash_binary_count; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = module_hash_binary_save; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = module_hash_decode_outfile; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -831,6 +830,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_02501.c b/src/modules/module_02501.c index 6a07ca0ba..500b79d35 100644 --- a/src/modules/module_02501.c +++ b/src/modules/module_02501.c @@ -807,7 +807,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = module_hash_binary_count; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = module_hash_binary_save; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = module_hash_decode_outfile; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -831,6 +830,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_03000.c b/src/modules/module_03000.c index 9e61603ff..0aca093f0 100644 --- a/src/modules/module_03000.c +++ b/src/modules/module_03000.c @@ -203,7 +203,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = module_hash_decode_zero_hash; module_ctx->module_hash_decode = module_hash_decode; @@ -227,6 +226,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_03200.c b/src/modules/module_03200.c index 48a039531..71f7f0a5f 100644 --- a/src/modules/module_03200.c +++ b/src/modules/module_03200.c @@ -235,7 +235,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -259,6 +258,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = module_kernel_threads_max; module_ctx->module_kernel_threads_min = module_kernel_threads_min; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_05100.c b/src/modules/module_05100.c index 591fe0666..bf9bef292 100644 --- a/src/modules/module_05100.c +++ b/src/modules/module_05100.c @@ -122,7 +122,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -146,6 +145,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_05500.c b/src/modules/module_05500.c index 11f6327a5..4a03af80f 100644 --- a/src/modules/module_05500.c +++ b/src/modules/module_05500.c @@ -414,7 +414,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -438,6 +437,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_05600.c b/src/modules/module_05600.c index e60b0be61..a533feb7e 100644 --- a/src/modules/module_05600.c +++ b/src/modules/module_05600.c @@ -323,7 +323,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -347,6 +346,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_06211.c b/src/modules/module_06211.c index 3224a9040..d9a92c31c 100644 --- a/src/modules/module_06211.c +++ b/src/modules/module_06211.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06212.c b/src/modules/module_06212.c index 53e2eacb4..3ec91f3d5 100644 --- a/src/modules/module_06212.c +++ b/src/modules/module_06212.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06213.c b/src/modules/module_06213.c index effded071..b77a2c02d 100644 --- a/src/modules/module_06213.c +++ b/src/modules/module_06213.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06221.c b/src/modules/module_06221.c index 9ac16d034..f4f2bd0df 100644 --- a/src/modules/module_06221.c +++ b/src/modules/module_06221.c @@ -259,7 +259,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -283,6 +282,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06222.c b/src/modules/module_06222.c index f3ed5e48a..6b1e611b2 100644 --- a/src/modules/module_06222.c +++ b/src/modules/module_06222.c @@ -259,7 +259,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -283,6 +282,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06223.c b/src/modules/module_06223.c index bcdd09b9d..3499af1a5 100644 --- a/src/modules/module_06223.c +++ b/src/modules/module_06223.c @@ -259,7 +259,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -283,6 +282,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06231.c b/src/modules/module_06231.c index 9fa4e9796..18bc1b425 100644 --- a/src/modules/module_06231.c +++ b/src/modules/module_06231.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06232.c b/src/modules/module_06232.c index 8a9b77919..212006e00 100644 --- a/src/modules/module_06232.c +++ b/src/modules/module_06232.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06233.c b/src/modules/module_06233.c index c2cbc60bf..6cbc1d05f 100644 --- a/src/modules/module_06233.c +++ b/src/modules/module_06233.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06241.c b/src/modules/module_06241.c index ac63a77f2..c6b1300e2 100644 --- a/src/modules/module_06241.c +++ b/src/modules/module_06241.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06242.c b/src/modules/module_06242.c index b5fb0b52b..1b54b0d1c 100644 --- a/src/modules/module_06242.c +++ b/src/modules/module_06242.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06243.c b/src/modules/module_06243.c index 85d9ba768..8a3b666ea 100644 --- a/src/modules/module_06243.c +++ b/src/modules/module_06243.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = module_hash_binary_parse; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = module_outfile_check_disable; diff --git a/src/modules/module_06300.c b/src/modules/module_06300.c index a94ef617d..ae6ba49fd 100644 --- a/src/modules/module_06300.c +++ b/src/modules/module_06300.c @@ -255,7 +255,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -279,6 +278,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_06800.c b/src/modules/module_06800.c index e8e6a597d..f2734c821 100644 --- a/src/modules/module_06800.c +++ b/src/modules/module_06800.c @@ -163,7 +163,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -187,6 +186,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_07100.c b/src/modules/module_07100.c index 4d82debd7..5e5a060db 100644 --- a/src/modules/module_07100.c +++ b/src/modules/module_07100.c @@ -235,7 +235,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -259,6 +258,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_07500.c b/src/modules/module_07500.c index a555ce7da..2bfb9a6d1 100644 --- a/src/modules/module_07500.c +++ b/src/modules/module_07500.c @@ -253,7 +253,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -277,6 +276,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = module_kernel_threads_max; module_ctx->module_kernel_threads_min = module_kernel_threads_min; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_08900.c b/src/modules/module_08900.c index be60dc555..95b248848 100644 --- a/src/modules/module_08900.c +++ b/src/modules/module_08900.c @@ -403,7 +403,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -427,6 +426,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = module_kernel_threads_max; module_ctx->module_kernel_threads_min = module_kernel_threads_min; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_09300.c b/src/modules/module_09300.c index 8d7915ff7..d8963ad38 100644 --- a/src/modules/module_09300.c +++ b/src/modules/module_09300.c @@ -356,7 +356,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -380,6 +379,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = module_kernel_threads_max; module_ctx->module_kernel_threads_min = module_kernel_threads_min; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_10800.c b/src/modules/module_10800.c index 95220cdd2..eb0723f5a 100644 --- a/src/modules/module_10800.c +++ b/src/modules/module_10800.c @@ -148,7 +148,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -172,6 +171,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_11300.c b/src/modules/module_11300.c index b2a012810..9681cc3e4 100644 --- a/src/modules/module_11300.c +++ b/src/modules/module_11300.c @@ -318,7 +318,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -342,6 +341,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_11500.c b/src/modules/module_11500.c index 65c314945..1e409654e 100644 --- a/src/modules/module_11500.c +++ b/src/modules/module_11500.c @@ -124,7 +124,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -148,6 +147,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_11600.c b/src/modules/module_11600.c index 7a4bee690..1168d2869 100644 --- a/src/modules/module_11600.c +++ b/src/modules/module_11600.c @@ -658,7 +658,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -682,6 +681,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_12000.c b/src/modules/module_12000.c index fa5687864..963a8e16c 100644 --- a/src/modules/module_12000.c +++ b/src/modules/module_12000.c @@ -212,7 +212,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -236,6 +235,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_12500.c b/src/modules/module_12500.c index 0f3347f6c..f95179709 100644 --- a/src/modules/module_12500.c +++ b/src/modules/module_12500.c @@ -215,7 +215,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -239,6 +238,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_13000.c b/src/modules/module_13000.c index 5a69fcaae..115711b5a 100644 --- a/src/modules/module_13000.c +++ b/src/modules/module_13000.c @@ -250,7 +250,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -274,6 +273,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_13100.c b/src/modules/module_13100.c index 186bdb240..df6c91540 100644 --- a/src/modules/module_13100.c +++ b/src/modules/module_13100.c @@ -262,7 +262,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -286,6 +285,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = module_kernel_threads_max; module_ctx->module_kernel_threads_min = module_kernel_threads_min; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_13400.c b/src/modules/module_13400.c index b8a69391d..9db399774 100644 --- a/src/modules/module_13400.c +++ b/src/modules/module_13400.c @@ -671,7 +671,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -695,6 +694,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_13500.c b/src/modules/module_13500.c index 94a8a7caf..a0c4dd882 100644 --- a/src/modules/module_13500.c +++ b/src/modules/module_13500.c @@ -225,7 +225,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -249,6 +248,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_14000.c b/src/modules/module_14000.c index 46bd46148..01c01696d 100644 --- a/src/modules/module_14000.c +++ b/src/modules/module_14000.c @@ -236,7 +236,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -260,6 +259,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_14100.c b/src/modules/module_14100.c index be6e4fb59..def18c019 100644 --- a/src/modules/module_14100.c +++ b/src/modules/module_14100.c @@ -235,7 +235,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -259,6 +258,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_15300.c b/src/modules/module_15300.c index 70b7b863f..12124c22a 100644 --- a/src/modules/module_15300.c +++ b/src/modules/module_15300.c @@ -402,7 +402,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -426,6 +425,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_15700.c b/src/modules/module_15700.c index 340849859..e07d652b8 100644 --- a/src/modules/module_15700.c +++ b/src/modules/module_15700.c @@ -476,7 +476,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -500,6 +499,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = module_kernel_threads_max; module_ctx->module_kernel_threads_min = module_kernel_threads_min; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_15900.c b/src/modules/module_15900.c index 22ede5451..10e46cb45 100644 --- a/src/modules/module_15900.c +++ b/src/modules/module_15900.c @@ -398,7 +398,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -422,6 +421,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_16800.c b/src/modules/module_16800.c index df240a0b2..ec6d330bb 100644 --- a/src/modules/module_16800.c +++ b/src/modules/module_16800.c @@ -292,7 +292,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -316,6 +315,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_16801.c b/src/modules/module_16801.c index 1a015ea62..618ff003d 100644 --- a/src/modules/module_16801.c +++ b/src/modules/module_16801.c @@ -348,7 +348,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -372,6 +371,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_17300.c b/src/modules/module_17300.c index aa8b8385c..e8f0e42f0 100644 --- a/src/modules/module_17300.c +++ b/src/modules/module_17300.c @@ -132,7 +132,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -156,6 +155,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_17400.c b/src/modules/module_17400.c index 959f075ed..f5b1750af 100644 --- a/src/modules/module_17400.c +++ b/src/modules/module_17400.c @@ -123,7 +123,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -147,6 +146,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_17500.c b/src/modules/module_17500.c index 87b25e08e..483d345f9 100644 --- a/src/modules/module_17500.c +++ b/src/modules/module_17500.c @@ -129,7 +129,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -153,6 +152,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_17600.c b/src/modules/module_17600.c index 9ed92700a..6782aa039 100644 --- a/src/modules/module_17600.c +++ b/src/modules/module_17600.c @@ -135,7 +135,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -159,6 +158,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_17700.c b/src/modules/module_17700.c index e317aed68..f9573f913 100644 --- a/src/modules/module_17700.c +++ b/src/modules/module_17700.c @@ -132,7 +132,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -156,6 +155,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_17800.c b/src/modules/module_17800.c index def061324..d30a00b70 100644 --- a/src/modules/module_17800.c +++ b/src/modules/module_17800.c @@ -123,7 +123,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -147,6 +146,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_17900.c b/src/modules/module_17900.c index 96ee5826a..a9e73fb79 100644 --- a/src/modules/module_17900.c +++ b/src/modules/module_17900.c @@ -129,7 +129,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -153,6 +152,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_18000.c b/src/modules/module_18000.c index 7282aa738..4a70f1b26 100644 --- a/src/modules/module_18000.c +++ b/src/modules/module_18000.c @@ -135,7 +135,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -159,6 +158,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_18100.c b/src/modules/module_18100.c index 4925fb13b..ab9491800 100644 --- a/src/modules/module_18100.c +++ b/src/modules/module_18100.c @@ -150,7 +150,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_category = module_hash_category; module_ctx->module_hash_decode = module_hash_decode; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; @@ -174,6 +173,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_18200.c b/src/modules/module_18200.c index 64cd1cb3e..36343c6af 100644 --- a/src/modules/module_18200.c +++ b/src/modules/module_18200.c @@ -224,7 +224,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -248,6 +247,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = module_kernel_threads_max; module_ctx->module_kernel_threads_min = module_kernel_threads_min; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_18300.c b/src/modules/module_18300.c index 5d5aa12a2..f00ec1a3f 100644 --- a/src/modules/module_18300.c +++ b/src/modules/module_18300.c @@ -258,7 +258,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_category = module_hash_category; module_ctx->module_hash_decode = module_hash_decode; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; @@ -282,6 +281,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_18400.c b/src/modules/module_18400.c index b33cb26f0..c0e31a730 100644 --- a/src/modules/module_18400.c +++ b/src/modules/module_18400.c @@ -305,7 +305,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -329,6 +328,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_18500.c b/src/modules/module_18500.c index f959f72b2..2561a083c 100644 --- a/src/modules/module_18500.c +++ b/src/modules/module_18500.c @@ -140,7 +140,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -164,6 +163,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_18600.c b/src/modules/module_18600.c index 1787478ee..7dd1370e1 100644 --- a/src/modules/module_18600.c +++ b/src/modules/module_18600.c @@ -313,7 +313,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT; module_ctx->module_hash_decode = module_hash_decode; @@ -337,6 +336,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = module_kernel_threads_max; module_ctx->module_kernel_threads_min = module_kernel_threads_min; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/modules/module_99999.c b/src/modules/module_99999.c index e35912479..037346923 100644 --- a/src/modules/module_99999.c +++ b/src/modules/module_99999.c @@ -145,7 +145,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_hash_binary_count = MODULE_DEFAULT; module_ctx->module_hash_binary_parse = MODULE_DEFAULT; module_ctx->module_hash_binary_save = MODULE_DEFAULT; - module_ctx->module_hash_binary_verify = MODULE_DEFAULT; module_ctx->module_hash_category = module_hash_category; module_ctx->module_hash_decode = module_hash_decode; module_ctx->module_hash_decode_outfile = MODULE_DEFAULT; @@ -169,6 +168,7 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_kernel_threads_max = MODULE_DEFAULT; module_ctx->module_kernel_threads_min = MODULE_DEFAULT; module_ctx->module_kern_type = module_kern_type; + module_ctx->module_kern_type_dynamic = MODULE_DEFAULT; module_ctx->module_opti_type = module_opti_type; module_ctx->module_opts_type = module_opts_type; module_ctx->module_outfile_check_disable = MODULE_DEFAULT; diff --git a/src/opencl.c b/src/opencl.c index 0c97c2275..a45e4e2fd 100644 --- a/src/opencl.c +++ b/src/opencl.c @@ -4814,6 +4814,33 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) } #endif + // kern type + + u32 kern_type = (u32) hashconfig->kern_type; + + if (module_ctx->module_kern_type_dynamic != MODULE_DEFAULT) + { + if (user_options->benchmark == true) + { + } + else + { + void *digests_buf = hashes->digests_buf; + salt_t *salts_buf = hashes->salts_buf; + void *esalts_buf = hashes->esalts_buf; + void *hook_salts_buf = hashes->hook_salts_buf; + hashinfo_t **hash_info = hashes->hash_info; + + hashinfo_t *hash_info_ptr = NULL; + + if (hash_info) hash_info_ptr = hash_info[0]; + + kern_type = (u32) module_ctx->module_kern_type_dynamic (hashconfig, digests_buf, salts_buf, esalts_buf, hook_salts_buf, hash_info_ptr); + } + } + + // built options + char build_opts_base[1024] = { 0 }; #if defined (_WIN) @@ -4827,9 +4854,9 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) char build_opts[2048] = { 0 }; #if defined (DEBUG) - snprintf (build_opts, sizeof (build_opts), "%s -D LOCAL_MEM_TYPE=%u -D VENDOR_ID=%u -D CUDA_ARCH=%u -D AMD_ROCM=%u -D VECT_SIZE=%u -D DEVICE_TYPE=%u -D DGST_R0=%u -D DGST_R1=%u -D DGST_R2=%u -D DGST_R3=%u -D DGST_ELEM=%u -D KERN_TYPE=%u -D _unroll", build_opts_base, device_param->device_local_mem_type, device_param->platform_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->is_rocm, device_param->vector_width, (u32) device_param->device_type, hashconfig->dgst_pos0, hashconfig->dgst_pos1, hashconfig->dgst_pos2, hashconfig->dgst_pos3, hashconfig->dgst_size / 4, hashconfig->kern_type); + snprintf (build_opts, sizeof (build_opts), "%s -D LOCAL_MEM_TYPE=%u -D VENDOR_ID=%u -D CUDA_ARCH=%u -D AMD_ROCM=%u -D VECT_SIZE=%u -D DEVICE_TYPE=%u -D DGST_R0=%u -D DGST_R1=%u -D DGST_R2=%u -D DGST_R3=%u -D DGST_ELEM=%u -D KERN_TYPE=%u -D _unroll", build_opts_base, device_param->device_local_mem_type, device_param->platform_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->is_rocm, device_param->vector_width, (u32) device_param->device_type, hashconfig->dgst_pos0, hashconfig->dgst_pos1, hashconfig->dgst_pos2, hashconfig->dgst_pos3, hashconfig->dgst_size / 4, kern_type); #else - snprintf (build_opts, sizeof (build_opts), "%s -D LOCAL_MEM_TYPE=%u -D VENDOR_ID=%u -D CUDA_ARCH=%u -D AMD_ROCM=%u -D VECT_SIZE=%u -D DEVICE_TYPE=%u -D DGST_R0=%u -D DGST_R1=%u -D DGST_R2=%u -D DGST_R3=%u -D DGST_ELEM=%u -D KERN_TYPE=%u -D _unroll -w", build_opts_base, device_param->device_local_mem_type, device_param->platform_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->is_rocm, device_param->vector_width, (u32) device_param->device_type, hashconfig->dgst_pos0, hashconfig->dgst_pos1, hashconfig->dgst_pos2, hashconfig->dgst_pos3, hashconfig->dgst_size / 4, hashconfig->kern_type); + snprintf (build_opts, sizeof (build_opts), "%s -D LOCAL_MEM_TYPE=%u -D VENDOR_ID=%u -D CUDA_ARCH=%u -D AMD_ROCM=%u -D VECT_SIZE=%u -D DEVICE_TYPE=%u -D DGST_R0=%u -D DGST_R1=%u -D DGST_R2=%u -D DGST_R3=%u -D DGST_ELEM=%u -D KERN_TYPE=%u -D _unroll -w", build_opts_base, device_param->device_local_mem_type, device_param->platform_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->is_rocm, device_param->vector_width, (u32) device_param->device_type, hashconfig->dgst_pos0, hashconfig->dgst_pos1, hashconfig->dgst_pos2, hashconfig->dgst_pos3, hashconfig->dgst_size / 4, kern_type); #endif /* @@ -4890,7 +4917,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) char source_file[256] = { 0 }; - generate_source_kernel_filename (user_options->slow_candidates, hashconfig->attack_exec, user_options_extra->attack_kern, hashconfig->kern_type, hashconfig->opti_type, folder_config->shared_dir, source_file); + generate_source_kernel_filename (user_options->slow_candidates, hashconfig->attack_exec, user_options_extra->attack_kern, kern_type, hashconfig->opti_type, folder_config->shared_dir, source_file); if (hc_path_read (source_file) == false) { @@ -4905,7 +4932,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) char cached_file[256] = { 0 }; - generate_cached_kernel_filename (user_options->slow_candidates, hashconfig->attack_exec, user_options_extra->attack_kern, hashconfig->kern_type, hashconfig->opti_type, folder_config->profile_dir, device_name_chksum, cached_file); + generate_cached_kernel_filename (user_options->slow_candidates, hashconfig->attack_exec, user_options_extra->attack_kern, kern_type, hashconfig->opti_type, folder_config->profile_dir, device_name_chksum, cached_file); bool cached = true; @@ -5662,7 +5689,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) { // kernel1 - snprintf (kernel_name, sizeof (kernel_name), "m%05u_s%02d", hashconfig->kern_type, 4); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_s%02d", kern_type, 4); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel1); @@ -5682,7 +5709,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) // kernel2 - snprintf (kernel_name, sizeof (kernel_name), "m%05u_s%02d", hashconfig->kern_type, 8); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_s%02d", kern_type, 8); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel2); @@ -5702,7 +5729,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) // kernel3 - snprintf (kernel_name, sizeof (kernel_name), "m%05u_s%02d", hashconfig->kern_type, 16); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_s%02d", kern_type, 16); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel3); @@ -5722,7 +5749,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) } else { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_sxx", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_sxx", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel4); @@ -5747,7 +5774,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) { // kernel1 - snprintf (kernel_name, sizeof (kernel_name), "m%05u_m%02d", hashconfig->kern_type, 4); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_m%02d", kern_type, 4); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel1); @@ -5767,7 +5794,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) // kernel2 - snprintf (kernel_name, sizeof (kernel_name), "m%05u_m%02d", hashconfig->kern_type, 8); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_m%02d", kern_type, 8); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel2); @@ -5787,7 +5814,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) // kernel3 - snprintf (kernel_name, sizeof (kernel_name), "m%05u_m%02d", hashconfig->kern_type, 16); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_m%02d", kern_type, 16); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel3); @@ -5807,7 +5834,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) } else { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_mxx", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_mxx", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel4); @@ -5836,7 +5863,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) { if (hashconfig->opts_type & OPTS_TYPE_PT_BITSLICE) { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_tm", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_tm", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel_tm); @@ -5861,7 +5888,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) { // kernel1 - snprintf (kernel_name, sizeof (kernel_name), "m%05u_init", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_init", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel1); @@ -5881,7 +5908,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) // kernel2 - snprintf (kernel_name, sizeof (kernel_name), "m%05u_loop", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_loop", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel2); @@ -5901,7 +5928,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) // kernel3 - snprintf (kernel_name, sizeof (kernel_name), "m%05u_comp", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_comp", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel3); @@ -5923,7 +5950,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) if (hashconfig->opts_type & OPTS_TYPE_HOOK12) { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_hook12", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_hook12", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel12); @@ -5946,7 +5973,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) if (hashconfig->opts_type & OPTS_TYPE_HOOK23) { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_hook23", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_hook23", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel23); @@ -5969,7 +5996,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) if (hashconfig->opts_type & OPTS_TYPE_INIT2) { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_init2", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_init2", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel_init2); @@ -5992,7 +6019,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) if (hashconfig->opts_type & OPTS_TYPE_LOOP2) { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_loop2", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_loop2", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel_loop2); @@ -6015,7 +6042,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) if (hashconfig->opts_type & OPTS_TYPE_AUX1) { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_aux1", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_aux1", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel_aux1); @@ -6038,7 +6065,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) if (hashconfig->opts_type & OPTS_TYPE_AUX2) { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_aux2", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_aux2", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel_aux2); @@ -6061,7 +6088,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) if (hashconfig->opts_type & OPTS_TYPE_AUX3) { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_aux3", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_aux3", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel_aux3); @@ -6084,7 +6111,7 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) if (hashconfig->opts_type & OPTS_TYPE_AUX4) { - snprintf (kernel_name, sizeof (kernel_name), "m%05u_aux4", hashconfig->kern_type); + snprintf (kernel_name, sizeof (kernel_name), "m%05u_aux4", kern_type); CL_rc = hc_clCreateKernel (hashcat_ctx, device_param->program, kernel_name, &device_param->kernel_aux4);