From 22c25b3ea1cc70de848a3490281cd890b1c29c00 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Sun, 1 Jun 2025 06:39:55 +0200 Subject: [PATCH] Fix cross-compiler target in makefiles Do not show timeout patch warnings in virtualized mode --- src/Makefile | 6 ++++++ src/backend.c | 6 +++--- src/bridges/bridge_argon2id_reference.mk | 4 ++-- src/bridges/bridge_scrypt_jane.mk | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/Makefile b/src/Makefile index 2c18cd3b3..01b1eceb7 100644 --- a/src/Makefile +++ b/src/Makefile @@ -39,6 +39,12 @@ ifeq ($(DEBUG),1) $(info "## Detected Operating System : $(UNAME)") endif +BUILD_MODE := native + +ifneq ($(filter binaries linux host_linux modules_linux bridges_linux win host_win modules_win bridges_win,$(MAKECMDGOALS)),) + BUILD_MODE := cross +endif + ## ## Makefile flags ## diff --git a/src/backend.c b/src/backend.c index 1e15f8985..fcb5dce8f 100644 --- a/src/backend.c +++ b/src/backend.c @@ -5494,7 +5494,7 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) if (device_param->kernel_exec_timeout != 0) { - if (user_options->quiet == false) + if ((user_options->quiet == false) && (is_virtualized == false)) { event_log_advice (hashcat_ctx, "* Device #%u: WARNING! Kernel exec timeout is not disabled.", device_id + 1); event_log_advice (hashcat_ctx, " This may cause \"CL_OUT_OF_RESOURCES\" or related errors."); @@ -5930,7 +5930,7 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) if (device_param->kernel_exec_timeout != 0) { - if (user_options->quiet == false) + if ((user_options->quiet == false) && (is_virtualized == false)) { event_log_advice (hashcat_ctx, "* Device #%u: WARNING! Kernel exec timeout is not disabled.", device_id + 1); event_log_advice (hashcat_ctx, " This may cause \"CL_OUT_OF_RESOURCES\" or related errors."); @@ -7721,7 +7721,7 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) if (device_param->kernel_exec_timeout != 0) { - if (user_options->quiet == false) + if ((user_options->quiet == false) && (is_virtualized == false)) { event_log_warning (hashcat_ctx, "* Device #%u: WARNING! Kernel exec timeout is not disabled.", device_id + 1); event_log_warning (hashcat_ctx, " This may cause \"CL_OUT_OF_RESOURCES\" or related errors."); diff --git a/src/bridges/bridge_argon2id_reference.mk b/src/bridges/bridge_argon2id_reference.mk index 1ce6051ee..d55c5bc07 100644 --- a/src/bridges/bridge_argon2id_reference.mk +++ b/src/bridges/bridge_argon2id_reference.mk @@ -2,7 +2,7 @@ ARGON2_REFERENCE := deps/phc-winner-argon2-20190702 ARGON2_REFERENCE_CFLAGS := -I$(ARGON2_REFERENCE)/_hashcat/ -ifeq ($(MAKECMDGOALS),binaries) +ifeq ($(BUILD_MODE),cross) ARGON2_REFERENCE_CFLAGS += -mavx2 else ifeq ($(UNAME),Darwin) @@ -14,7 +14,7 @@ ARGON2_REFERENCE_CFLAGS += -march=native endif endif -ifeq ($(MAKECMDGOALS),binaries) +ifeq ($(BUILD_MODE),cross) bridges/bridge_argon2id_reference.so: src/bridges/bridge_argon2id_reference.c obj/combined.LINUX.a $(CC_LINUX) $(CCFLAGS) $(CFLAGS_CROSS_LINUX) $^ -o $@ $(LFLAGS_CROSS_LINUX) -shared -fPIC -D BRIDGE_INTERFACE_VERSION_CURRENT=$(BRIDGE_INTERFACE_VERSION) $(ARGON2_REFERENCE_CFLAGS) bridges/bridge_argon2id_reference.dll: src/bridges/bridge_argon2id_reference.c obj/combined.WIN.a diff --git a/src/bridges/bridge_scrypt_jane.mk b/src/bridges/bridge_scrypt_jane.mk index f423f7c15..ba1fc834c 100644 --- a/src/bridges/bridge_scrypt_jane.mk +++ b/src/bridges/bridge_scrypt_jane.mk @@ -2,7 +2,7 @@ SCRYPT_JANE := deps/scrypt-jane-master SCRYPT_JANE_CFLAGS := -I$(SCRYPT_JANE)/ -DSCRYPT_SHA256 -DSCRYPT_SALSA -DSCRYPT_CHOOSE_COMPILETIME -Wno-unused-function -Wno-unused-but-set-variable -ifeq ($(MAKECMDGOALS),binaries) +ifeq ($(BUILD_MODE),cross) SCRYPT_JANE_CFLAGS += -mavx2 else ifeq ($(UNAME),Darwin) @@ -14,7 +14,7 @@ SCRYPT_JANE_CFLAGS += -march=native endif endif -ifeq ($(MAKECMDGOALS),binaries) +ifeq ($(BUILD_MODE),cross) bridges/bridge_scrypt_jane.so: src/bridges/bridge_scrypt_jane.c obj/combined.LINUX.a $(CC_LINUX) $(CCFLAGS) $(CFLAGS_CROSS_LINUX) $^ -o $@ $(LFLAGS_CROSS_LINUX) -shared -fPIC -D BRIDGE_INTERFACE_VERSION_CURRENT=$(BRIDGE_INTERFACE_VERSION) $(SCRYPT_JANE_CFLAGS) bridges/bridge_scrypt_jane.dll: src/bridges/bridge_scrypt_jane.c obj/combined.WIN.a