From 640d95a00f09a47b7d34ec0ae7f20e59dd1a5191 Mon Sep 17 00:00:00 2001 From: Jens Steube Date: Sat, 24 Jul 2021 16:01:30 +0200 Subject: [PATCH] Vendor Detection: Add "Intel" as a valid vendor name for GPU on macOS --- include/backend.h | 25 +++++++++++++------------ src/backend.c | 4 ++++ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/include/backend.h b/include/backend.h index 957ac229d..2e41f43c8 100644 --- a/include/backend.h +++ b/include/backend.h @@ -9,18 +9,19 @@ #include #include -static const char CL_VENDOR_AMD1[] = "Advanced Micro Devices, Inc."; -static const char CL_VENDOR_AMD2[] = "AuthenticAMD"; -static const char CL_VENDOR_AMD_USE_INTEL[] = "GenuineIntel"; -static const char CL_VENDOR_APPLE[] = "Apple"; -static const char CL_VENDOR_APPLE_USE_AMD[] = "AMD"; -static const char CL_VENDOR_APPLE_USE_NV[] = "NVIDIA"; -static const char CL_VENDOR_APPLE_USE_INTEL[] = "Intel Inc."; -static const char CL_VENDOR_INTEL_BEIGNET[] = "Intel"; -static const char CL_VENDOR_INTEL_SDK[] = "Intel(R) Corporation"; -static const char CL_VENDOR_MESA[] = "Mesa"; -static const char CL_VENDOR_NV[] = "NVIDIA Corporation"; -static const char CL_VENDOR_POCL[] = "The pocl project"; +static const char CL_VENDOR_AMD1[] = "Advanced Micro Devices, Inc."; +static const char CL_VENDOR_AMD2[] = "AuthenticAMD"; +static const char CL_VENDOR_AMD_USE_INTEL[] = "GenuineIntel"; +static const char CL_VENDOR_APPLE[] = "Apple"; +static const char CL_VENDOR_APPLE_USE_AMD[] = "AMD"; +static const char CL_VENDOR_APPLE_USE_NV[] = "NVIDIA"; +static const char CL_VENDOR_APPLE_USE_INTEL[] = "Intel"; +static const char CL_VENDOR_APPLE_USE_INTEL2[] = "Intel Inc."; +static const char CL_VENDOR_INTEL_BEIGNET[] = "Intel"; +static const char CL_VENDOR_INTEL_SDK[] = "Intel(R) Corporation"; +static const char CL_VENDOR_MESA[] = "Mesa"; +static const char CL_VENDOR_NV[] = "NVIDIA Corporation"; +static const char CL_VENDOR_POCL[] = "The pocl project"; int cuda_init (hashcat_ctx_t *hashcat_ctx); void cuda_close (hashcat_ctx_t *hashcat_ctx); diff --git a/src/backend.c b/src/backend.c index 31d6bade1..a41012cd6 100644 --- a/src/backend.c +++ b/src/backend.c @@ -8844,6 +8844,10 @@ int backend_ctx_devices_init (hashcat_ctx_t *hashcat_ctx, const int comptime) { opencl_device_vendor_id = VENDOR_ID_INTEL_SDK; } + else if (strcmp (opencl_device_vendor, CL_VENDOR_APPLE_USE_INTEL2) == 0) + { + opencl_device_vendor_id = VENDOR_ID_INTEL_SDK; + } else if (strcmp (opencl_device_vendor, CL_VENDOR_INTEL_BEIGNET) == 0) { opencl_device_vendor_id = VENDOR_ID_INTEL_BEIGNET;