From d706d19b4fc73a83c9532bc69167eaa4c3172991 Mon Sep 17 00:00:00 2001
From: jsteube <jens.steube@gmail.com>
Date: Fri, 5 Apr 2019 22:25:28 +0200
Subject: [PATCH] Fix some uninitialized variables

---
 OpenCL/m00060_a0-optimized.cl |  4 ---
 OpenCL/m00060_a1-optimized.cl |  4 ---
 OpenCL/m00060_a3-optimized.cl |  4 ---
 OpenCL/m00160_a0-optimized.cl |  4 ---
 OpenCL/m00160_a1-optimized.cl |  4 ---
 OpenCL/m00160_a3-optimized.cl |  4 ---
 OpenCL/m00500-optimized.cl    | 24 ++++++-------
 OpenCL/m01460_a0-optimized.cl |  4 ---
 OpenCL/m01460_a1-optimized.cl |  4 ---
 OpenCL/m01460_a3-optimized.cl |  4 ---
 OpenCL/m01600-optimized.cl    | 24 ++++++-------
 OpenCL/m01760_a0-optimized.cl |  4 ---
 OpenCL/m01760_a1-optimized.cl |  4 ---
 OpenCL/m01760_a3-optimized.cl |  4 ---
 OpenCL/m02810_a0-optimized.cl |  4 ---
 OpenCL/m02810_a1-optimized.cl |  4 ---
 OpenCL/m02810_a3-optimized.cl |  4 ---
 OpenCL/m03910_a0-optimized.cl |  4 ---
 OpenCL/m03910_a1-optimized.cl |  4 ---
 OpenCL/m03910_a3-optimized.cl |  4 ---
 OpenCL/m04800_a3-optimized.cl |  4 ---
 OpenCL/m05800-optimized.cl    |  8 ++---
 OpenCL/m06300-optimized.cl    | 24 ++++++-------
 OpenCL/m07400-optimized.cl    | 32 ++++++++---------
 OpenCL/m07900-pure.cl         |  4 +--
 OpenCL/m08800-pure.cl         |  2 +-
 OpenCL/m09700_a0-optimized.cl |  4 ---
 OpenCL/m09700_a1-optimized.cl |  4 ---
 OpenCL/m09700_a3-optimized.cl |  8 -----
 OpenCL/m09710_a0-optimized.cl |  4 ---
 OpenCL/m09710_a1-optimized.cl |  4 ---
 OpenCL/m09710_a3-optimized.cl |  4 ---
 OpenCL/m09810_a0-optimized.cl |  4 ---
 OpenCL/m09810_a1-optimized.cl |  4 ---
 OpenCL/m09810_a3-optimized.cl |  4 ---
 OpenCL/m11300-pure.cl         | 67 +++++++++++++----------------------
 OpenCL/m11400_a3-pure.cl      |  8 ++---
 OpenCL/m11600-pure.cl         |  6 ++--
 OpenCL/m11750_a1-pure.cl      |  8 ++---
 OpenCL/m11750_a3-pure.cl      |  8 ++---
 OpenCL/m11760_a1-pure.cl      |  8 ++---
 OpenCL/m11760_a3-pure.cl      |  8 ++---
 OpenCL/m11850_a1-pure.cl      |  8 ++---
 OpenCL/m11850_a3-pure.cl      |  8 ++---
 OpenCL/m11860_a1-pure.cl      |  8 ++---
 OpenCL/m11860_a3-pure.cl      |  8 ++---
 OpenCL/m12400-pure.cl         |  2 --
 OpenCL/m13600-pure.cl         |  2 +-
 48 files changed, 123 insertions(+), 260 deletions(-)

diff --git a/OpenCL/m00060_a0-optimized.cl b/OpenCL/m00060_a0-optimized.cl
index 901c196ae..433de961e 100644
--- a/OpenCL/m00060_a0-optimized.cl
+++ b/OpenCL/m00060_a0-optimized.cl
@@ -156,8 +156,6 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_RULES ())
   salt_buf3[2] = salt_bufs[salt_pos].salt_buf[14];
   salt_buf3[3] = salt_bufs[salt_pos].salt_buf[15];
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -293,8 +291,6 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_RULES ())
   salt_buf3[2] = salt_bufs[salt_pos].salt_buf[14];
   salt_buf3[3] = salt_bufs[salt_pos].salt_buf[15];
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m00060_a1-optimized.cl b/OpenCL/m00060_a1-optimized.cl
index 46589fcfc..f15837866 100644
--- a/OpenCL/m00060_a1-optimized.cl
+++ b/OpenCL/m00060_a1-optimized.cl
@@ -154,8 +154,6 @@ KERNEL_FQ void m00060_m04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = salt_bufs[salt_pos].salt_buf[14];
   salt_buf3[3] = salt_bufs[salt_pos].salt_buf[15];
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -332,8 +330,6 @@ KERNEL_FQ void m00060_s04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = salt_bufs[salt_pos].salt_buf[14];
   salt_buf3[3] = salt_bufs[salt_pos].salt_buf[15];
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m00060_a3-optimized.cl b/OpenCL/m00060_a3-optimized.cl
index 7df8ae8b7..44bae8951 100644
--- a/OpenCL/m00060_a3-optimized.cl
+++ b/OpenCL/m00060_a3-optimized.cl
@@ -133,8 +133,6 @@ DECLSPEC static void m00060m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = salt_bufs[salt_pos].salt_buf[14];
   salt_buf3[3] = salt_bufs[salt_pos].salt_buf[15];
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -238,8 +236,6 @@ DECLSPEC static void m00060s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = salt_bufs[salt_pos].salt_buf[14];
   salt_buf3[3] = salt_bufs[salt_pos].salt_buf[15];
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m00160_a0-optimized.cl b/OpenCL/m00160_a0-optimized.cl
index 880e302aa..3c53e06e5 100644
--- a/OpenCL/m00160_a0-optimized.cl
+++ b/OpenCL/m00160_a0-optimized.cl
@@ -160,8 +160,6 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_RULES ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -297,8 +295,6 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_RULES ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m00160_a1-optimized.cl b/OpenCL/m00160_a1-optimized.cl
index 461c829b8..847c24c11 100644
--- a/OpenCL/m00160_a1-optimized.cl
+++ b/OpenCL/m00160_a1-optimized.cl
@@ -158,8 +158,6 @@ KERNEL_FQ void m00160_m04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -355,8 +353,6 @@ KERNEL_FQ void m00160_s04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m00160_a3-optimized.cl b/OpenCL/m00160_a3-optimized.cl
index 43be43ed2..b629a7750 100644
--- a/OpenCL/m00160_a3-optimized.cl
+++ b/OpenCL/m00160_a3-optimized.cl
@@ -137,8 +137,6 @@ DECLSPEC static void m00160m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -242,8 +240,6 @@ DECLSPEC static void m00160s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m00500-optimized.cl b/OpenCL/m00500-optimized.cl
index ead723f43..b77246986 100644
--- a/OpenCL/m00500-optimized.cl
+++ b/OpenCL/m00500-optimized.cl
@@ -31,10 +31,6 @@ DECLSPEC static void memcat16 (u32 *block0, u32 *block1, u32 *block2, u32 *block
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -49,6 +45,10 @@ DECLSPEC static void memcat16 (u32 *block0, u32 *block1, u32 *block2, u32 *block
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
@@ -138,10 +138,6 @@ DECLSPEC static void memcat16_x80 (u32 *block0, u32 *block1, u32 *block2, u32 *b
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -157,6 +153,10 @@ DECLSPEC static void memcat16_x80 (u32 *block0, u32 *block1, u32 *block2, u32 *b
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
@@ -245,10 +245,6 @@ DECLSPEC static void memcat8 (u32 *block0, u32 *block1, u32 *block2, u32 *block3
   u32 tmp1;
   u32 tmp2;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -259,6 +255,10 @@ DECLSPEC static void memcat8 (u32 *block0, u32 *block1, u32 *block2, u32 *block3
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
diff --git a/OpenCL/m01460_a0-optimized.cl b/OpenCL/m01460_a0-optimized.cl
index a6cb18ac4..426f2cf68 100644
--- a/OpenCL/m01460_a0-optimized.cl
+++ b/OpenCL/m01460_a0-optimized.cl
@@ -172,8 +172,6 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_RULES ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -309,8 +307,6 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_RULES ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m01460_a1-optimized.cl b/OpenCL/m01460_a1-optimized.cl
index e4029a96c..195e21b17 100644
--- a/OpenCL/m01460_a1-optimized.cl
+++ b/OpenCL/m01460_a1-optimized.cl
@@ -170,8 +170,6 @@ KERNEL_FQ void m01460_m04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -367,8 +365,6 @@ KERNEL_FQ void m01460_s04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m01460_a3-optimized.cl b/OpenCL/m01460_a3-optimized.cl
index 6fa92e751..9f2306fa9 100644
--- a/OpenCL/m01460_a3-optimized.cl
+++ b/OpenCL/m01460_a3-optimized.cl
@@ -149,8 +149,6 @@ DECLSPEC static void m01460m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -254,8 +252,6 @@ DECLSPEC static void m01460s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m01600-optimized.cl b/OpenCL/m01600-optimized.cl
index f8cb63715..7731073e3 100644
--- a/OpenCL/m01600-optimized.cl
+++ b/OpenCL/m01600-optimized.cl
@@ -30,10 +30,6 @@ DECLSPEC static void memcat16 (u32 *block0, u32 *block1, u32 *block2, u32 *block
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -48,6 +44,10 @@ DECLSPEC static void memcat16 (u32 *block0, u32 *block1, u32 *block2, u32 *block
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
@@ -137,10 +137,6 @@ DECLSPEC static void memcat16_x80 (u32 *block0, u32 *block1, u32 *block2, u32 *b
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -156,6 +152,10 @@ DECLSPEC static void memcat16_x80 (u32 *block0, u32 *block1, u32 *block2, u32 *b
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
@@ -244,10 +244,6 @@ DECLSPEC static void memcat8 (u32 *block0, u32 *block1, u32 *block2, u32 *block3
   u32 tmp1;
   u32 tmp2;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -258,6 +254,10 @@ DECLSPEC static void memcat8 (u32 *block0, u32 *block1, u32 *block2, u32 *block3
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
diff --git a/OpenCL/m01760_a0-optimized.cl b/OpenCL/m01760_a0-optimized.cl
index b1777da28..7c01f8bfe 100644
--- a/OpenCL/m01760_a0-optimized.cl
+++ b/OpenCL/m01760_a0-optimized.cl
@@ -246,8 +246,6 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_RULES ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -388,8 +386,6 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_RULES ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m01760_a1-optimized.cl b/OpenCL/m01760_a1-optimized.cl
index a29104fb4..2374c0d47 100644
--- a/OpenCL/m01760_a1-optimized.cl
+++ b/OpenCL/m01760_a1-optimized.cl
@@ -244,8 +244,6 @@ KERNEL_FQ void m01760_m04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -446,8 +444,6 @@ KERNEL_FQ void m01760_s04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m01760_a3-optimized.cl b/OpenCL/m01760_a3-optimized.cl
index 333ae3764..7a9097140 100644
--- a/OpenCL/m01760_a3-optimized.cl
+++ b/OpenCL/m01760_a3-optimized.cl
@@ -223,8 +223,6 @@ DECLSPEC static void m01760m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
@@ -333,8 +331,6 @@ DECLSPEC static void m01760s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[14]);
   salt_buf3[3] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[15]);
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * pads
    */
diff --git a/OpenCL/m02810_a0-optimized.cl b/OpenCL/m02810_a0-optimized.cl
index dfd045591..25757ed87 100644
--- a/OpenCL/m02810_a0-optimized.cl
+++ b/OpenCL/m02810_a0-optimized.cl
@@ -100,8 +100,6 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_RULES ())
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * loop
    */
@@ -470,8 +468,6 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_RULES ())
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * digest
    */
diff --git a/OpenCL/m02810_a1-optimized.cl b/OpenCL/m02810_a1-optimized.cl
index f8d95a707..081e75270 100644
--- a/OpenCL/m02810_a1-optimized.cl
+++ b/OpenCL/m02810_a1-optimized.cl
@@ -98,8 +98,6 @@ KERNEL_FQ void m02810_m04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * loop
    */
@@ -527,8 +525,6 @@ KERNEL_FQ void m02810_s04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * digest
    */
diff --git a/OpenCL/m02810_a3-optimized.cl b/OpenCL/m02810_a3-optimized.cl
index f92efaeef..30cbe1710 100644
--- a/OpenCL/m02810_a3-optimized.cl
+++ b/OpenCL/m02810_a3-optimized.cl
@@ -60,8 +60,6 @@ DECLSPEC static void m02810m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * loop
    */
@@ -404,8 +402,6 @@ DECLSPEC static void m02810s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * digest
    */
diff --git a/OpenCL/m03910_a0-optimized.cl b/OpenCL/m03910_a0-optimized.cl
index f8d699026..38346dea8 100644
--- a/OpenCL/m03910_a0-optimized.cl
+++ b/OpenCL/m03910_a0-optimized.cl
@@ -100,8 +100,6 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_RULES ())
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * loop
    */
@@ -470,8 +468,6 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_RULES ())
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * digest
    */
diff --git a/OpenCL/m03910_a1-optimized.cl b/OpenCL/m03910_a1-optimized.cl
index 9e0a4b377..d27fbdd63 100644
--- a/OpenCL/m03910_a1-optimized.cl
+++ b/OpenCL/m03910_a1-optimized.cl
@@ -98,8 +98,6 @@ KERNEL_FQ void m03910_m04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * loop
    */
@@ -527,8 +525,6 @@ KERNEL_FQ void m03910_s04 (KERN_ATTR_BASIC ())
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * digest
    */
diff --git a/OpenCL/m03910_a3-optimized.cl b/OpenCL/m03910_a3-optimized.cl
index 4abf7558f..c4f68d8e6 100644
--- a/OpenCL/m03910_a3-optimized.cl
+++ b/OpenCL/m03910_a3-optimized.cl
@@ -60,8 +60,6 @@ DECLSPEC static void m03910m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * loop
    */
@@ -404,8 +402,6 @@ DECLSPEC static void m03910s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   salt_buf3[2] = 0;
   salt_buf3[3] = 0;
 
-  const u32 salt_len = salt_bufs[salt_pos].salt_len;
-
   /**
    * digest
    */
diff --git a/OpenCL/m04800_a3-optimized.cl b/OpenCL/m04800_a3-optimized.cl
index ac016d69f..995f5a679 100644
--- a/OpenCL/m04800_a3-optimized.cl
+++ b/OpenCL/m04800_a3-optimized.cl
@@ -97,8 +97,6 @@ DECLSPEC static void m04800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   {
     const u32x w0r = ix_create_bft (bfs_buf, il_pos);
 
-    const u32x w0lr = w0l | w0r;
-
     u32x w0_t = w0l | (w0r <<  8);
     u32x w1_t = w1l | (w0r >> 24);
     u32x w2_t = w0[2];
@@ -295,8 +293,6 @@ DECLSPEC static void m04800s (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_l
   {
     const u32x w0r = ix_create_bft (bfs_buf, il_pos);
 
-    const u32x w0lr = w0l | w0r;
-
     u32x w0_t = w0l | (w0r <<  8);
     u32x w1_t = w1l | (w0r >> 24);
     u32x w2_t = w0[2];
diff --git a/OpenCL/m05800-optimized.cl b/OpenCL/m05800-optimized.cl
index 851493198..6f811a977 100644
--- a/OpenCL/m05800-optimized.cl
+++ b/OpenCL/m05800-optimized.cl
@@ -2118,10 +2118,6 @@ DECLSPEC static void append_salt (u32 *w0, u32 *w1, u32 *w2, const u32 *append,
   u32 tmp4;
   u32 tmp5;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -2138,6 +2134,10 @@ DECLSPEC static void append_salt (u32 *w0, u32 *w1, u32 *w2, const u32 *append,
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
diff --git a/OpenCL/m06300-optimized.cl b/OpenCL/m06300-optimized.cl
index ea7e38dfe..ff088da80 100644
--- a/OpenCL/m06300-optimized.cl
+++ b/OpenCL/m06300-optimized.cl
@@ -27,10 +27,6 @@ DECLSPEC static void memcat16 (u32 *block0, u32 *block1, u32 *block2, u32 *block
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -45,6 +41,10 @@ DECLSPEC static void memcat16 (u32 *block0, u32 *block1, u32 *block2, u32 *block
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
@@ -134,10 +134,6 @@ DECLSPEC static void memcat16_x80 (u32 *block0, u32 *block1, u32 *block2, u32 *b
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -153,6 +149,10 @@ DECLSPEC static void memcat16_x80 (u32 *block0, u32 *block1, u32 *block2, u32 *b
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
@@ -241,10 +241,6 @@ DECLSPEC static void memcat8 (u32 *block0, u32 *block1, u32 *block2, u32 *block3
   u32 tmp1;
   u32 tmp2;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -255,6 +251,10 @@ DECLSPEC static void memcat8 (u32 *block0, u32 *block1, u32 *block2, u32 *block3
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
diff --git a/OpenCL/m07400-optimized.cl b/OpenCL/m07400-optimized.cl
index 586763df8..e98f60304 100644
--- a/OpenCL/m07400-optimized.cl
+++ b/OpenCL/m07400-optimized.cl
@@ -102,10 +102,6 @@ DECLSPEC static u32 memcat16 (u32 *block, const u32 offset, const u32 *append, c
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -120,6 +116,10 @@ DECLSPEC static u32 memcat16 (u32 *block, const u32 offset, const u32 *append, c
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
@@ -237,10 +237,6 @@ DECLSPEC static u32 memcat16c (u32 *block, const u32 offset, const u32 *append,
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -255,6 +251,10 @@ DECLSPEC static u32 memcat16c (u32 *block, const u32 offset, const u32 *append,
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
@@ -398,10 +398,6 @@ DECLSPEC static u32 memcat20 (u32 *block, const u32 offset, const u32 *append, c
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -416,6 +412,10 @@ DECLSPEC static u32 memcat20 (u32 *block, const u32 offset, const u32 *append, c
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
@@ -541,10 +541,6 @@ DECLSPEC static u32 memcat20_x80 (u32 *block, const u32 offset, const u32 *appen
   u32 tmp3;
   u32 tmp4;
 
-  const int offset_mod_4 = offset & 3;
-
-  const int offset_minus_4 = 4 - offset_mod_4;
-
   #if defined IS_AMD || defined IS_GENERIC
   u32 in0 = append[0];
   u32 in1 = append[1];
@@ -560,6 +556,10 @@ DECLSPEC static u32 memcat20_x80 (u32 *block, const u32 offset, const u32 *appen
   #endif
 
   #ifdef IS_NV
+  const int offset_mod_4 = offset & 3;
+
+  const int offset_minus_4 = 4 - offset_mod_4;
+
   const int selector = (0x76543210 >> (offset_minus_4 * 4)) & 0xffff;
 
   u32 in0 = append[0];
diff --git a/OpenCL/m07900-pure.cl b/OpenCL/m07900-pure.cl
index b3f51a246..a6eed5cb5 100644
--- a/OpenCL/m07900-pure.cl
+++ b/OpenCL/m07900-pure.cl
@@ -67,12 +67,12 @@ KERNEL_FQ void m07900_loop (KERN_ATTR_TMPS (drupal7_tmp_t))
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = hc_swap32_S (w[idx]);
   }
diff --git a/OpenCL/m08800-pure.cl b/OpenCL/m08800-pure.cl
index e5e3f2715..75de4d055 100644
--- a/OpenCL/m08800-pure.cl
+++ b/OpenCL/m08800-pure.cl
@@ -404,7 +404,7 @@ KERNEL_FQ void m08800_comp (KERN_ATTR_TMPS_ESALT (androidfde_tmp_t, androidfde_t
     u32 r0 = out[0] ^ iv[0];
     u32 r1 = out[1] ^ iv[1];
     u32 r2 = out[2] ^ iv[2];
-    u32 r3 = out[3] ^ iv[3];
+    //u32 r3 = out[3] ^ iv[3];
 
     // rotate 3 byte (in fat!)
 
diff --git a/OpenCL/m09700_a0-optimized.cl b/OpenCL/m09700_a0-optimized.cl
index ba6f11d11..7f02f574e 100644
--- a/OpenCL/m09700_a0-optimized.cl
+++ b/OpenCL/m09700_a0-optimized.cl
@@ -545,8 +545,6 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
@@ -734,8 +732,6 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
diff --git a/OpenCL/m09700_a1-optimized.cl b/OpenCL/m09700_a1-optimized.cl
index 49b570a9a..861cf7586 100644
--- a/OpenCL/m09700_a1-optimized.cl
+++ b/OpenCL/m09700_a1-optimized.cl
@@ -543,8 +543,6 @@ KERNEL_FQ void m09700_m04 (KERN_ATTR_ESALT (oldoffice01_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
@@ -790,8 +788,6 @@ KERNEL_FQ void m09700_s04 (KERN_ATTR_ESALT (oldoffice01_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
diff --git a/OpenCL/m09700_a3-optimized.cl b/OpenCL/m09700_a3-optimized.cl
index d67bd8764..ccc34be24 100644
--- a/OpenCL/m09700_a3-optimized.cl
+++ b/OpenCL/m09700_a3-optimized.cl
@@ -193,14 +193,10 @@ DECLSPEC static void m09700m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32
   salt_buf_t3[3] = salt_buf_t0[2] >>  8 | salt_buf_t0[3] << 24;
   salt_buf_t3[4] = salt_buf_t0[3] >>  8;
 
-  const u32 salt_len = 16;
-
   /**
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
@@ -603,14 +599,10 @@ DECLSPEC static void m09700s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32
   salt_buf_t3[3] = salt_buf_t0[2] >>  8 | salt_buf_t0[3] << 24;
   salt_buf_t3[4] = salt_buf_t0[3] >>  8;
 
-  const u32 salt_len = 16;
-
   /**
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
diff --git a/OpenCL/m09710_a0-optimized.cl b/OpenCL/m09710_a0-optimized.cl
index bc0d12b5f..e9c84d410 100644
--- a/OpenCL/m09710_a0-optimized.cl
+++ b/OpenCL/m09710_a0-optimized.cl
@@ -190,8 +190,6 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
@@ -330,8 +328,6 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_RULES_ESALT (oldoffice01_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
diff --git a/OpenCL/m09710_a1-optimized.cl b/OpenCL/m09710_a1-optimized.cl
index 95535efb0..f86f4a2f6 100644
--- a/OpenCL/m09710_a1-optimized.cl
+++ b/OpenCL/m09710_a1-optimized.cl
@@ -188,8 +188,6 @@ KERNEL_FQ void m09710_m04 (KERN_ATTR_ESALT (oldoffice01_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
@@ -374,8 +372,6 @@ KERNEL_FQ void m09710_s04 (KERN_ATTR_ESALT (oldoffice01_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
diff --git a/OpenCL/m09710_a3-optimized.cl b/OpenCL/m09710_a3-optimized.cl
index 8457107d3..746f032bb 100644
--- a/OpenCL/m09710_a3-optimized.cl
+++ b/OpenCL/m09710_a3-optimized.cl
@@ -165,8 +165,6 @@ DECLSPEC static void m09710m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
@@ -276,8 +274,6 @@ DECLSPEC static void m09710s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
diff --git a/OpenCL/m09810_a0-optimized.cl b/OpenCL/m09810_a0-optimized.cl
index ba12a2d53..0940a5246 100644
--- a/OpenCL/m09810_a0-optimized.cl
+++ b/OpenCL/m09810_a0-optimized.cl
@@ -190,8 +190,6 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_RULES_ESALT (oldoffice34_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
@@ -317,8 +315,6 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_RULES_ESALT (oldoffice34_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
diff --git a/OpenCL/m09810_a1-optimized.cl b/OpenCL/m09810_a1-optimized.cl
index 9621c2046..28095f638 100644
--- a/OpenCL/m09810_a1-optimized.cl
+++ b/OpenCL/m09810_a1-optimized.cl
@@ -188,8 +188,6 @@ KERNEL_FQ void m09810_m04 (KERN_ATTR_ESALT (oldoffice34_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
@@ -361,8 +359,6 @@ KERNEL_FQ void m09810_s04 (KERN_ATTR_ESALT (oldoffice34_t))
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
diff --git a/OpenCL/m09810_a3-optimized.cl b/OpenCL/m09810_a3-optimized.cl
index 224cfeb03..9c4ec2895 100644
--- a/OpenCL/m09810_a3-optimized.cl
+++ b/OpenCL/m09810_a3-optimized.cl
@@ -165,8 +165,6 @@ DECLSPEC static void m09810m (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
@@ -261,8 +259,6 @@ DECLSPEC static void m09810s (LOCAL_AS RC4_KEY *rc4_keys, u32 *w0, u32 *w1, u32
    * esalt
    */
 
-  const u32 version = esalt_bufs[digests_offset].version;
-
   u32 encryptedVerifier[4];
 
   encryptedVerifier[0] = esalt_bufs[digests_offset].encryptedVerifier[0];
diff --git a/OpenCL/m11300-pure.cl b/OpenCL/m11300-pure.cl
index 6db8e74ec..d0e8cb721 100644
--- a/OpenCL/m11300-pure.cl
+++ b/OpenCL/m11300-pure.cl
@@ -130,50 +130,17 @@ KERNEL_FQ void m11300_loop (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_
   u64x t6 = pack64v (tmps, dgst, gid, 6);
   u64x t7 = pack64v (tmps, dgst, gid, 7);
 
-  u32x w0[4];
-  u32x w1[4];
-  u32x w2[4];
-  u32x w3[4];
-  u32x w4[4];
-  u32x w5[4];
-  u32x w6[4];
-  u32x w7[4];
-
-  w0[0] = 0;
-  w0[1] = 0;
-  w0[2] = 0;
-  w0[3] = 0;
-  w1[0] = 0;
-  w1[1] = 0;
-  w1[2] = 0;
-  w1[3] = 0;
-  w2[0] = 0;
-  w2[1] = 0;
-  w2[2] = 0;
-  w2[3] = 0;
-  w3[0] = 0;
-  w3[1] = 0;
-  w3[2] = 0;
-  w3[3] = 0;
-  w4[0] = 0x80000000;
-  w4[1] = 0;
-  w4[2] = 0;
-  w4[3] = 0;
-  w5[0] = 0;
-  w5[1] = 0;
-  w5[2] = 0;
-  w5[3] = 0;
-  w6[0] = 0;
-  w6[1] = 0;
-  w6[2] = 0;
-  w6[3] = 0;
-  w7[0] = 0;
-  w7[1] = 0;
-  w7[2] = 0;
-  w7[3] = 64 * 8;
-
   for (u32 i = 0, j = loop_pos; i < loop_cnt; i++, j++)
   {
+    u32x w0[4];
+    u32x w1[4];
+    u32x w2[4];
+    u32x w3[4];
+    u32x w4[4];
+    u32x w5[4];
+    u32x w6[4];
+    u32x w7[4];
+
     w0[0] = h32_from_64 (t0);
     w0[1] = l32_from_64 (t0);
     w0[2] = h32_from_64 (t1);
@@ -190,6 +157,22 @@ KERNEL_FQ void m11300_loop (KERN_ATTR_TMPS_ESALT (bitcoin_wallet_tmp_t, bitcoin_
     w3[1] = l32_from_64 (t6);
     w3[2] = h32_from_64 (t7);
     w3[3] = l32_from_64 (t7);
+    w4[0] = 0x80000000;
+    w4[1] = 0;
+    w4[2] = 0;
+    w4[3] = 0;
+    w5[0] = 0;
+    w5[1] = 0;
+    w5[2] = 0;
+    w5[3] = 0;
+    w6[0] = 0;
+    w6[1] = 0;
+    w6[2] = 0;
+    w6[3] = 0;
+    w7[0] = 0;
+    w7[1] = 0;
+    w7[2] = 0;
+    w7[3] = 64 * 8;
 
     u64x digest[8];
 
diff --git a/OpenCL/m11400_a3-pure.cl b/OpenCL/m11400_a3-pure.cl
index 809181cea..a98a3f6ce 100644
--- a/OpenCL/m11400_a3-pure.cl
+++ b/OpenCL/m11400_a3-pure.cl
@@ -72,7 +72,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t))
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -81,7 +81,7 @@ KERNEL_FQ void m11400_mxx (KERN_ATTR_VECTOR_ESALT (sip_t))
 
   u32x esalt_buf[256] = { 0 };
 
-  for (int i = 0, idx = 0; i < esalt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < esalt_len; i += 4, idx += 1)
   {
     esalt_buf[idx] = esalt_bufs[digests_offset].esalt_buf[idx];
   }
@@ -204,7 +204,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t))
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -213,7 +213,7 @@ KERNEL_FQ void m11400_sxx (KERN_ATTR_VECTOR_ESALT (sip_t))
 
   u32x esalt_buf[256] = { 0 };
 
-  for (int i = 0, idx = 0; i < esalt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < esalt_len; i += 4, idx += 1)
   {
     esalt_buf[idx] = esalt_bufs[digests_offset].esalt_buf[idx];
   }
diff --git a/OpenCL/m11600-pure.cl b/OpenCL/m11600-pure.cl
index df408f753..5be47a067 100644
--- a/OpenCL/m11600-pure.cl
+++ b/OpenCL/m11600-pure.cl
@@ -35,7 +35,7 @@ DECLSPEC static void memcat8c_be (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32
 {
   const u32 func_len = len & 63;
 
-  const u32 mod = func_len & 3;
+  //const u32 mod = func_len & 3;
   const u32 div = func_len / 4;
 
   u32 tmp0;
@@ -193,7 +193,7 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -281,8 +281,6 @@ KERNEL_FQ void m11600_loop (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hoo
 KERNEL_FQ void m11600_hook23 (KERN_ATTR_TMPS_HOOKS (seven_zip_tmp_t, seven_zip_hook_t))
 {
   const u64 gid = get_global_id (0);
-  const u64 lid = get_local_id (0);
-  const u64 lsz = get_local_size (0);
 
   if (gid >= gid_max) return;
 
diff --git a/OpenCL/m11750_a1-pure.cl b/OpenCL/m11750_a1-pure.cl
index 6b3e5deb5..954a20ccb 100644
--- a/OpenCL/m11750_a1-pure.cl
+++ b/OpenCL/m11750_a1-pure.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_BASIC ())
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = hc_swap32_S (pws[gid].i[idx]);
   }
@@ -70,7 +70,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_BASIC ())
 
   u32 s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
@@ -180,7 +180,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_BASIC ())
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = hc_swap32_S (pws[gid].i[idx]);
   }
@@ -189,7 +189,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_BASIC ())
 
   u32 s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
diff --git a/OpenCL/m11750_a3-pure.cl b/OpenCL/m11750_a3-pure.cl
index 0e07521eb..8517501e6 100644
--- a/OpenCL/m11750_a3-pure.cl
+++ b/OpenCL/m11750_a3-pure.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_VECTOR ())
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -70,7 +70,7 @@ KERNEL_FQ void m11750_mxx (KERN_ATTR_VECTOR ())
 
   u32x s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
@@ -166,7 +166,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_VECTOR ())
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -175,7 +175,7 @@ KERNEL_FQ void m11750_sxx (KERN_ATTR_VECTOR ())
 
   u32x s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
diff --git a/OpenCL/m11760_a1-pure.cl b/OpenCL/m11760_a1-pure.cl
index 268573853..64a81967e 100644
--- a/OpenCL/m11760_a1-pure.cl
+++ b/OpenCL/m11760_a1-pure.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_BASIC ())
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = hc_swap32_S (pws[gid].i[idx]);
   }
@@ -70,7 +70,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_BASIC ())
 
   u32 s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
@@ -182,7 +182,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_BASIC ())
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = hc_swap32_S (pws[gid].i[idx]);
   }
@@ -191,7 +191,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_BASIC ())
 
   u32 s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
diff --git a/OpenCL/m11760_a3-pure.cl b/OpenCL/m11760_a3-pure.cl
index 847dcb9a2..76d3507a0 100644
--- a/OpenCL/m11760_a3-pure.cl
+++ b/OpenCL/m11760_a3-pure.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_VECTOR ())
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -70,7 +70,7 @@ KERNEL_FQ void m11760_mxx (KERN_ATTR_VECTOR ())
 
   u32x s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
@@ -168,7 +168,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_VECTOR ())
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -177,7 +177,7 @@ KERNEL_FQ void m11760_sxx (KERN_ATTR_VECTOR ())
 
   u32x s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
diff --git a/OpenCL/m11850_a1-pure.cl b/OpenCL/m11850_a1-pure.cl
index e8849c126..618cb3a94 100644
--- a/OpenCL/m11850_a1-pure.cl
+++ b/OpenCL/m11850_a1-pure.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_BASIC ())
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = hc_swap32_S (pws[gid].i[idx]);
   }
@@ -70,7 +70,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_BASIC ())
 
   u32 s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
@@ -180,7 +180,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_BASIC ())
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = hc_swap32_S (pws[gid].i[idx]);
   }
@@ -189,7 +189,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_BASIC ())
 
   u32 s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
diff --git a/OpenCL/m11850_a3-pure.cl b/OpenCL/m11850_a3-pure.cl
index 1daaceac9..7bd413120 100644
--- a/OpenCL/m11850_a3-pure.cl
+++ b/OpenCL/m11850_a3-pure.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_VECTOR ())
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -70,7 +70,7 @@ KERNEL_FQ void m11850_mxx (KERN_ATTR_VECTOR ())
 
   u32x s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
@@ -166,7 +166,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_VECTOR ())
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -175,7 +175,7 @@ KERNEL_FQ void m11850_sxx (KERN_ATTR_VECTOR ())
 
   u32x s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
diff --git a/OpenCL/m11860_a1-pure.cl b/OpenCL/m11860_a1-pure.cl
index aaa1cdc08..ee937f9a3 100644
--- a/OpenCL/m11860_a1-pure.cl
+++ b/OpenCL/m11860_a1-pure.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_BASIC ())
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = hc_swap32_S (pws[gid].i[idx]);
   }
@@ -70,7 +70,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_BASIC ())
 
   u32 s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
@@ -182,7 +182,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_BASIC ())
 
   u32 w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = hc_swap32_S (pws[gid].i[idx]);
   }
@@ -191,7 +191,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_BASIC ())
 
   u32 s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
diff --git a/OpenCL/m11860_a3-pure.cl b/OpenCL/m11860_a3-pure.cl
index 11b4f7e90..1e421adc6 100644
--- a/OpenCL/m11860_a3-pure.cl
+++ b/OpenCL/m11860_a3-pure.cl
@@ -61,7 +61,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_VECTOR ())
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -70,7 +70,7 @@ KERNEL_FQ void m11860_mxx (KERN_ATTR_VECTOR ())
 
   u32x s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
@@ -168,7 +168,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_VECTOR ())
 
   u32x w[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < pw_len; i += 4, idx += 1)
   {
     w[idx] = pws[gid].i[idx];
   }
@@ -177,7 +177,7 @@ KERNEL_FQ void m11860_sxx (KERN_ATTR_VECTOR ())
 
   u32x s[64] = { 0 };
 
-  for (int i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
+  for (u32 i = 0, idx = 0; i < salt_len; i += 4, idx += 1)
   {
     s[idx] = hc_swap32_S (salt_bufs[salt_pos].salt_buf[idx]);
   }
diff --git a/OpenCL/m12400-pure.cl b/OpenCL/m12400-pure.cl
index b30066f53..241c0d2af 100644
--- a/OpenCL/m12400-pure.cl
+++ b/OpenCL/m12400-pure.cl
@@ -428,8 +428,6 @@ DECLSPEC static void _des_crypt_keysetup (u32 c, u32 d, u32 *Kc, u32 *Kd, LOCAL_
 
 DECLSPEC static void _des_crypt_encrypt (u32 *iv, u32 mask, u32 rounds, u32 *Kc, u32 *Kd, LOCAL_AS u32 (*s_SPtrans)[64])
 {
-  u32 tt;
-
   const u32 E0 = ((mask >>  0) & 0x003f)
                | ((mask >>  4) & 0x3f00);
   const u32 E1 = ((mask >>  2) & 0x03f0)
diff --git a/OpenCL/m13600-pure.cl b/OpenCL/m13600-pure.cl
index 87539eaa4..e1958863c 100644
--- a/OpenCL/m13600-pure.cl
+++ b/OpenCL/m13600-pure.cl
@@ -332,7 +332,7 @@ KERNEL_FQ void m13600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t))
 
   u32 key[8] = { 0 };
 
-  for (int i = iter_start, j = 0; i < iter_stop; i++, j++)
+  for (u32 i = iter_start, j = 0; i < iter_stop; i++, j++)
   {
     key[j] = tmps[gid].out[i];
   }