From 460153d818b6133787f86a697478848193682b86 Mon Sep 17 00:00:00 2001 From: jsteube Date: Mon, 4 Mar 2019 15:25:32 +0100 Subject: [PATCH] Fix -m 6211,6221,6232,6233 module_unstable_warning settings --- src/modules/module_06211.c | 14 +------------- src/modules/module_06221.c | 14 +------------- src/modules/module_06232.c | 14 +++++++++++++- src/modules/module_06233.c | 7 +++++++ 4 files changed, 22 insertions(+), 27 deletions(-) diff --git a/src/modules/module_06211.c b/src/modules/module_06211.c index 9922757d5..c5969384a 100644 --- a/src/modules/module_06211.c +++ b/src/modules/module_06211.c @@ -196,18 +196,6 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE return 1; } -bool module_unstable_warning (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 hc_device_param_t *device_param) -{ - // l_opencl_p_18.1.0.013: self-test failed - // note that opencl_runtime_16.1.2_x64_rh_6.4.0.37 works fine - if (device_param->device_vendor_id == VENDOR_ID_INTEL_SDK) - { - return true; - } - - return false; -} - int module_hash_decode (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) { u32 *digest = (u32 *) digest_buf; @@ -300,6 +288,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_st_hash = module_st_hash; module_ctx->module_st_pass = module_st_pass; module_ctx->module_tmp_size = module_tmp_size; - module_ctx->module_unstable_warning = module_unstable_warning; + module_ctx->module_unstable_warning = MODULE_DEFAULT; module_ctx->module_warmup_disable = MODULE_DEFAULT; } diff --git a/src/modules/module_06221.c b/src/modules/module_06221.c index 72865f6a4..8dce93780 100644 --- a/src/modules/module_06221.c +++ b/src/modules/module_06221.c @@ -197,18 +197,6 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE return 1; } -bool module_unstable_warning (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 hc_device_param_t *device_param) -{ - // l_opencl_p_18.1.0.013: self-test failed - // note that opencl_runtime_16.1.2_x64_rh_6.4.0.37 works fine - if (device_param->device_vendor_id == VENDOR_ID_INTEL_SDK) - { - return true; - } - - return false; -} - int module_hash_decode (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) { u32 *digest = (u32 *) digest_buf; @@ -301,6 +289,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_st_hash = module_st_hash; module_ctx->module_st_pass = module_st_pass; module_ctx->module_tmp_size = module_tmp_size; - module_ctx->module_unstable_warning = module_unstable_warning; + module_ctx->module_unstable_warning = MODULE_DEFAULT; module_ctx->module_warmup_disable = MODULE_DEFAULT; } diff --git a/src/modules/module_06232.c b/src/modules/module_06232.c index 6b8103306..b5d90d671 100644 --- a/src/modules/module_06232.c +++ b/src/modules/module_06232.c @@ -196,6 +196,18 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE return 1; } +bool module_unstable_warning (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 hc_device_param_t *device_param) +{ + // l_opencl_p_18.1.0.013: self-test failed + // note that opencl_runtime_16.1.2_x64_rh_6.4.0.37 works fine + if (device_param->device_vendor_id == VENDOR_ID_INTEL_SDK) + { + return true; + } + + return false; +} + int module_hash_decode (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) { u32 *digest = (u32 *) digest_buf; @@ -288,6 +300,6 @@ void module_init (module_ctx_t *module_ctx) module_ctx->module_st_hash = module_st_hash; module_ctx->module_st_pass = module_st_pass; module_ctx->module_tmp_size = module_tmp_size; - module_ctx->module_unstable_warning = MODULE_DEFAULT; + module_ctx->module_unstable_warning = module_unstable_warning; module_ctx->module_warmup_disable = MODULE_DEFAULT; } diff --git a/src/modules/module_06233.c b/src/modules/module_06233.c index 9cffdf934..7e7f2d472 100644 --- a/src/modules/module_06233.c +++ b/src/modules/module_06233.c @@ -198,6 +198,13 @@ int module_hash_binary_parse (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE bool module_unstable_warning (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 hc_device_param_t *hc_device_param) { + // l_opencl_p_18.1.0.013: self-test failed + // note that opencl_runtime_16.1.2_x64_rh_6.4.0.37 works fine + if (hc_device_param->device_vendor_id == VENDOR_ID_INTEL_SDK) + { + return true; + } + // amdgpu-pro-18.50-708488-ubuntu-18.04: Segmentation fault if ((hc_device_param->device_vendor_id == VENDOR_ID_AMD) && (hc_device_param->has_vperm == false)) {