Merge pull request #2874 from hashcat/master

Backports from master

OpenCL/m17200_a0-pure.cl

@@ -152,7 +152,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17200_a1-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17200_a3-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17210_a0-pure.cl

@@ -152,7 +152,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17210_a1-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17210_a3-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17220_a0-pure.cl

@@ -152,7 +152,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17220_a1-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17220_a3-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17225_a0-pure.cl

@@ -152,7 +152,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17225_a1-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17225_a3-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17230_a0-pure.cl

@@ -152,7 +152,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17230_a1-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

OpenCL/m17230_a3-pure.cl

@@ -150,7 +150,7 @@ typedef struct pkzip pkzip_t;
 
 #pragma pack(pop)
 
-CONSTANT_AS u32a crc32tab[256] =
+CONSTANT_VK u32a crc32tab[256] =
 {
   0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
   0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,

include/thread.h

@@ -22,17 +22,17 @@
 #define hc_thread_exit(t)           ExitThread (t)
 #define hc_thread_detach(t)         CloseHandle (t)
 
-/*
+#define hc_thread_mutex_init(m)     InitializeCriticalSection (&m)
 #define hc_thread_mutex_lock(m)     EnterCriticalSection      (&m)
 #define hc_thread_mutex_unlock(m)   LeaveCriticalSection      (&m)
-#define hc_thread_mutex_init(m)     InitializeCriticalSection (&m)
 #define hc_thread_mutex_delete(m)   DeleteCriticalSection     (&m)
-*/
 
+/*
 #define hc_thread_mutex_init(m)     m = CreateMutex     (NULL, FALSE, NULL)
 #define hc_thread_mutex_lock(m)     WaitForSingleObject (m, INFINITE)
 #define hc_thread_mutex_unlock(m)   ReleaseMutex        (m)
 #define hc_thread_mutex_delete(m)   CloseHandle         (m)
+*/
 
 #define hc_thread_sem_init(s)       s = CreateSemaphore (NULL, 0, INT_MAX, NULL)
 #define hc_thread_sem_post(s)       ReleaseSemaphore    (s, 1, NULL)

include/types.h

@@ -81,13 +81,13 @@ typedef struct timespec   hc_timer_t;
 #endif
 
 #if defined (_WIN)
-typedef HANDLE          hc_thread_t;
-typedef HANDLE          hc_thread_mutex_t;
-typedef HANDLE          hc_thread_semaphore_t;
+typedef HANDLE           hc_thread_t;
+typedef CRITICAL_SECTION hc_thread_mutex_t;
+typedef HANDLE           hc_thread_semaphore_t;
 #else
-typedef pthread_t       hc_thread_t;
-typedef pthread_mutex_t hc_thread_mutex_t;
-typedef sem_t           hc_thread_semaphore_t;
+typedef pthread_t        hc_thread_t;
+typedef pthread_mutex_t  hc_thread_mutex_t;
+typedef sem_t            hc_thread_semaphore_t;
 #endif
 
 // enums