mirror of
https://github.com/hashcat/hashcat.git
synced 2025-01-03 20:31:08 +00:00
Mark some hash-modes for Apple Metal as unstable
This commit is contained in:
parent
6aa3e0882d
commit
653f34e9a2
@ -64,6 +64,17 @@ typedef struct pbkdf2_sha256_tmp
|
|||||||
static const char *SIGNATURE_ETHEREUM_PRESALE = "$ethereum$w";
|
static const char *SIGNATURE_ETHEREUM_PRESALE = "$ethereum$w";
|
||||||
static const int ROUNDS_ETHEREUM_PRESALE = 2000;
|
static const int ROUNDS_ETHEREUM_PRESALE = 2000;
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
// AMD Radeon Pro W5700X, Metal.Version.: 261.13, compiler hangs
|
||||||
|
if (device_param->is_metal == true)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
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)
|
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)
|
||||||
{
|
{
|
||||||
char *jit_build_options = NULL;
|
char *jit_build_options = NULL;
|
||||||
@ -339,6 +350,6 @@ void module_init (module_ctx_t *module_ctx)
|
|||||||
module_ctx->module_st_hash = module_st_hash;
|
module_ctx->module_st_hash = module_st_hash;
|
||||||
module_ctx->module_st_pass = module_st_pass;
|
module_ctx->module_st_pass = module_st_pass;
|
||||||
module_ctx->module_tmp_size = module_tmp_size;
|
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;
|
module_ctx->module_warmup_disable = MODULE_DEFAULT;
|
||||||
}
|
}
|
||||||
|
@ -69,10 +69,7 @@ bool module_unstable_warning (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
|
|||||||
// AMD Radeon Pro W5700X Compute Engine; 1.2 (Apr 22 2021 21:54:44); 11.3.1; 20E241
|
// AMD Radeon Pro W5700X Compute Engine; 1.2 (Apr 22 2021 21:54:44); 11.3.1; 20E241
|
||||||
if ((device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE) && (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU))
|
if ((device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE) && (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU))
|
||||||
{
|
{
|
||||||
if (device_param->is_metal == false)
|
return true;
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -69,10 +69,7 @@ bool module_unstable_warning (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
|
|||||||
// AMD Radeon Pro W5700X Compute Engine; 1.2 (Apr 22 2021 21:54:44); 11.3.1; 20E241
|
// AMD Radeon Pro W5700X Compute Engine; 1.2 (Apr 22 2021 21:54:44); 11.3.1; 20E241
|
||||||
if ((device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE) && (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU))
|
if ((device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE) && (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU))
|
||||||
{
|
{
|
||||||
if (device_param->is_metal == false)
|
return true;
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -69,10 +69,7 @@ bool module_unstable_warning (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
|
|||||||
// AMD Radeon Pro W5700X Compute Engine; 1.2 (Apr 22 2021 21:54:44); 11.3.1; 20E241
|
// AMD Radeon Pro W5700X Compute Engine; 1.2 (Apr 22 2021 21:54:44); 11.3.1; 20E241
|
||||||
if ((device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE) && (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU))
|
if ((device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE) && (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU))
|
||||||
{
|
{
|
||||||
if (device_param->is_metal == false)
|
return true;
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -61,6 +61,12 @@ bool module_unstable_warning (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AMD Radeon Pro W5700X, Metal.Version.: 261.13, compiler hangs
|
||||||
|
if (device_param->is_metal == true)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -66,6 +66,36 @@ typedef struct electrum_tmp
|
|||||||
|
|
||||||
static const char *SIGNATURE_ELECTRUM = "$electrum$4*";
|
static const char *SIGNATURE_ELECTRUM = "$electrum$4*";
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
// AMD Radeon Pro W5700X, Metal.Version.: 261.13, compiler hangs
|
||||||
|
if (device_param->is_metal == true)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
char *jit_build_options = NULL;
|
||||||
|
|
||||||
|
// Extra treatment for Apple systems
|
||||||
|
if (device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE)
|
||||||
|
{
|
||||||
|
// Metal
|
||||||
|
if (device_param->is_metal == true)
|
||||||
|
{
|
||||||
|
hc_asprintf (&jit_build_options, "-D _unroll");
|
||||||
|
}
|
||||||
|
|
||||||
|
return jit_build_options;
|
||||||
|
}
|
||||||
|
|
||||||
|
return jit_build_options;
|
||||||
|
}
|
||||||
|
|
||||||
u64 module_esalt_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)
|
u64 module_esalt_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)
|
||||||
{
|
{
|
||||||
const u64 esalt_size = (const u64) sizeof (electrum_t);
|
const u64 esalt_size = (const u64) sizeof (electrum_t);
|
||||||
@ -296,7 +326,7 @@ void module_init (module_ctx_t *module_ctx)
|
|||||||
module_ctx->module_hook23 = MODULE_DEFAULT;
|
module_ctx->module_hook23 = MODULE_DEFAULT;
|
||||||
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
|
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
|
||||||
module_ctx->module_hook_size = MODULE_DEFAULT;
|
module_ctx->module_hook_size = MODULE_DEFAULT;
|
||||||
module_ctx->module_jit_build_options = MODULE_DEFAULT;
|
module_ctx->module_jit_build_options = module_jit_build_options;
|
||||||
module_ctx->module_jit_cache_disable = MODULE_DEFAULT;
|
module_ctx->module_jit_cache_disable = MODULE_DEFAULT;
|
||||||
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
|
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
|
||||||
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
|
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
|
||||||
@ -323,6 +353,6 @@ void module_init (module_ctx_t *module_ctx)
|
|||||||
module_ctx->module_st_hash = module_st_hash;
|
module_ctx->module_st_hash = module_st_hash;
|
||||||
module_ctx->module_st_pass = module_st_pass;
|
module_ctx->module_st_pass = module_st_pass;
|
||||||
module_ctx->module_tmp_size = module_tmp_size;
|
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;
|
module_ctx->module_warmup_disable = MODULE_DEFAULT;
|
||||||
}
|
}
|
||||||
|
@ -102,6 +102,12 @@ bool module_unstable_warning (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
|
|||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AMD Radeon Pro W5700X, Metal.Version.: 261.13, compiler hangs
|
||||||
|
if (device_param->is_metal == true)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -58,6 +58,12 @@ bool module_unstable_warning (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE
|
|||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// AMD Radeon Pro W5700X, Metal.Version.: 261.13, compiler hangs
|
||||||
|
if (device_param->is_metal == true)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -68,6 +68,17 @@ typedef struct axcrypt2_tmp
|
|||||||
|
|
||||||
static const char *SIGNATURE_AXCRYPT2 = "$axcrypt$";
|
static const char *SIGNATURE_AXCRYPT2 = "$axcrypt$";
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
// AMD Radeon Pro W5700X, Metal.Version.: 261.13, compiler hangs
|
||||||
|
if (device_param->is_metal == true)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
u64 module_esalt_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)
|
u64 module_esalt_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)
|
||||||
{
|
{
|
||||||
const u64 esalt_size = (const u64) sizeof (axcrypt2_t);
|
const u64 esalt_size = (const u64) sizeof (axcrypt2_t);
|
||||||
@ -355,6 +366,6 @@ void module_init (module_ctx_t *module_ctx)
|
|||||||
module_ctx->module_st_hash = module_st_hash;
|
module_ctx->module_st_hash = module_st_hash;
|
||||||
module_ctx->module_st_pass = module_st_pass;
|
module_ctx->module_st_pass = module_st_pass;
|
||||||
module_ctx->module_tmp_size = module_tmp_size;
|
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;
|
module_ctx->module_warmup_disable = MODULE_DEFAULT;
|
||||||
}
|
}
|
||||||
|
@ -68,6 +68,17 @@ typedef struct axcrypt2_tmp
|
|||||||
|
|
||||||
static const char *SIGNATURE_AXCRYPT2 = "$axcrypt$";
|
static const char *SIGNATURE_AXCRYPT2 = "$axcrypt$";
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
// AMD Radeon Pro W5700X, Metal.Version.: 261.13, compiler hangs
|
||||||
|
if (device_param->is_metal == true)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
u64 module_esalt_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)
|
u64 module_esalt_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)
|
||||||
{
|
{
|
||||||
const u64 esalt_size = (const u64) sizeof (axcrypt2_t);
|
const u64 esalt_size = (const u64) sizeof (axcrypt2_t);
|
||||||
@ -355,6 +366,6 @@ void module_init (module_ctx_t *module_ctx)
|
|||||||
module_ctx->module_st_hash = module_st_hash;
|
module_ctx->module_st_hash = module_st_hash;
|
||||||
module_ctx->module_st_pass = module_st_pass;
|
module_ctx->module_st_pass = module_st_pass;
|
||||||
module_ctx->module_tmp_size = module_tmp_size;
|
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;
|
module_ctx->module_warmup_disable = MODULE_DEFAULT;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user