From c1622d659385883d13687fd767566537d45aa98e Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Sat, 21 Jul 2018 11:52:54 +0200
Subject: [PATCH] Fixed detection of AMD_GCN version in case the rocm driver is
 used

---
 OpenCL/inc_vendor.cl | 21 ++++++++++++---------
 docs/changes.txt     | 11 ++++++-----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/OpenCL/inc_vendor.cl b/OpenCL/inc_vendor.cl
index cbaa063d4..0e35b6198 100644
--- a/OpenCL/inc_vendor.cl
+++ b/OpenCL/inc_vendor.cl
@@ -38,22 +38,25 @@
  */
 
 #if   VENDOR_ID == (1 << 0)
-#if   AMD_ROCM == 0
 #define IS_AMD
 #define AMD_GCN 0
-#else
-#define IS_AMD
-#if   defined __gfx600__ || defined __gfx601__
+#if AMD_ROCM == 1
+#if defined __gfx600__ || defined __gfx601__
+#undef  AMD_GCN
 #define AMD_GCN 1
-#elif defined __gfx700__ || defined __gfx701__ || defined __gfx702__ || defined __gfx703__
+#endif
+#if defined __gfx700__ || defined __gfx701__ || defined __gfx702__ || defined __gfx703__
+#undef  AMD_GCN
 #define AMD_GCN 2
-#elif defined __gfx800__ || defined __gfx801__ || defined __gfx802__ || defined __gfx803__ || defined __gfx804__ || defined __gfx810__
+#endif
+#if defined __gfx800__ || defined __gfx801__ || defined __gfx802__ || defined __gfx803__ || defined __gfx804__ || defined __gfx810__
+#undef  AMD_GCN
 #define AMD_GCN 3
 // According to AMD docs, GCN 3 and 4 are the same
-#elif defined __gfx900__ || defined __gfx901__ || defined __gfx902__ || defined __gfx903__
+#endif
+#if defined __gfx900__ || defined __gfx901__ || defined __gfx902__ || defined __gfx903__
+#undef  AMD_GCN
 #define AMD_GCN 5
-#else
-#define AMD_GCN 0
 #endif
 #endif
 #elif VENDOR_ID == (1 << 1)
diff --git a/docs/changes.txt b/docs/changes.txt
index d094507e0..ab8b07a66 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,4 +1,4 @@
-* changes v4.1.0 -> v4.1.1
+* changes v4.1.0 -> v4.2.0
 
 ##
 ## Algorithms
@@ -10,21 +10,22 @@
 ## Improvements
 ##
 
+- Added JtR-compatible support for hex notation in rules engine
+- Added OpenCL device utilization to the status information in machine-readable output
 - HCCAPX management: Use advanced hints in message_pair stored by hcxtools about endian bitness of replay counter
 - OpenCL kernels: Abort session if kernel self-test fails
 - OpenCL kernels: Add '-pure' prefix to kernel filenames to avoid problems caused by reusing existing hashcat installation folder
-- Added JtR-compatible support for hex notation in rules engine
-- Added OpenCL device utilization to the status information in machine-readable output
 
 ##
 ## Bugs
 ##
 
 - Fixed a function declaration attribute in -m 8900 kernel leading to unusable -m 9300 which shares kernel code with -m 8900
-- Fixed a missing kernel in -m 5600 in combination with -a 3 and -O if mask is >= 16 characters
 - Fixed a miscalculation in --progress-only mode output for extremely slow kernels like -m 14800
-- Fixed missing code section in -m 2500 and -m 2501 to crack corrupted handshakes with a LE endian bitness base
 - Fixed a missing check for errors on OpenCL devices leading to invalid removal of restore file
+- Fixed a missing kernel in -m 5600 in combination with -a 3 and -O if mask is >= 16 characters
+- Fixed detection of AMD_GCN version in case the rocm driver is used
+- Fixed missing code section in -m 2500 and -m 2501 to crack corrupted handshakes with a LE endian bitness base
 
 * changes v4.0.1 -> v4.1.0