From b66602f5f9511b3e057aa51281a4838d2b38b995 Mon Sep 17 00:00:00 2001
From: Jens Steube <jens.steube@gmail.com>
Date: Tue, 4 Jun 2019 11:20:32 +0200
Subject: [PATCH] Fix -m 16100 in optimized -a 3 mode

---
 OpenCL/m15400_a3-optimized.cl | 68 ++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/OpenCL/m15400_a3-optimized.cl b/OpenCL/m15400_a3-optimized.cl
index d2a6d962d..7f0782b71 100644
--- a/OpenCL/m15400_a3-optimized.cl
+++ b/OpenCL/m15400_a3-optimized.cl
@@ -207,6 +207,16 @@ DECLSPEC void chacha20_transform (const u32x *w0, const u32x *w1, const u32 *pos
 }
 
 KERNEL_FQ void m15400_m04 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
+{
+  // fixed size 32
+}
+
+KERNEL_FQ void m15400_m08 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
+{
+  // fixed size 32
+}
+
+KERNEL_FQ void m15400_m16 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
 {
   /**
    * modifier
@@ -227,28 +237,27 @@ KERNEL_FQ void m15400_m04 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
   w1[2] = pws[gid].i[6];
   w1[3] = pws[gid].i[7];
 
-  u32x out_len = pws[gid].pw_len;
-
   /**
    * Salt prep
    */
 
-  u32 iv[2]       = { 0 };
-  u32 plain[2]    = { 0 };
-  u32 position[2] = { 0 };
-  u32 offset      = 0;
-
-  position[0] = esalt_bufs[digests_offset].position[0];
-  position[1] = esalt_bufs[digests_offset].position[1];
-
-  offset = esalt_bufs[digests_offset].offset;
+  u32 iv[2];
 
   iv[0] = esalt_bufs[digests_offset].iv[0];
   iv[1] = esalt_bufs[digests_offset].iv[1];
 
+  u32 plain[2];
+
   plain[0] = esalt_bufs[digests_offset].plain[0];
   plain[1] = esalt_bufs[digests_offset].plain[1];
 
+  u32 position[2];
+
+  position[0] = esalt_bufs[digests_offset].position[0];
+  position[1] = esalt_bufs[digests_offset].position[1];
+
+  u32 offset = esalt_bufs[digests_offset].offset;
+
   /**
    * loop
    */
@@ -285,15 +294,17 @@ KERNEL_FQ void m15400_m04 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
   }
 }
 
-KERNEL_FQ void m15400_m08 (KERN_ATTR_ESALT (chacha20_t))
+KERNEL_FQ void m15400_s04 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
 {
+  // fixed size 32
 }
 
-KERNEL_FQ void m15400_m16 (KERN_ATTR_ESALT (chacha20_t))
+KERNEL_FQ void m15400_s08 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
 {
+  // fixed size 32
 }
 
-KERNEL_FQ void m15400_s04 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
+KERNEL_FQ void m15400_s16 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
 {
   /**
    * modifier
@@ -314,28 +325,27 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
   w1[2] = pws[gid].i[6];
   w1[3] = pws[gid].i[7];
 
-  u32 out_len = pws[gid].pw_len;
-
   /**
    * Salt prep
    */
 
-  u32 iv[2]       = { 0 };
-  u32 plain[2]    = { 0 };
-  u32 position[2] = { 0 };
-  u32 offset      = 0;
-
-  position[0] = esalt_bufs[digests_offset].position[0];
-  position[1] = esalt_bufs[digests_offset].position[1];
-
-  offset = esalt_bufs[digests_offset].offset;
+  u32 iv[2];
 
   iv[0] = esalt_bufs[digests_offset].iv[0];
   iv[1] = esalt_bufs[digests_offset].iv[1];
 
+  u32 plain[2];
+
   plain[0] = esalt_bufs[digests_offset].plain[0];
   plain[1] = esalt_bufs[digests_offset].plain[1];
 
+  u32 position[2];
+
+  position[0] = esalt_bufs[digests_offset].position[0];
+  position[1] = esalt_bufs[digests_offset].position[1];
+
+  u32 offset = esalt_bufs[digests_offset].offset;
+
   /**
    * digest
    */
@@ -383,11 +393,3 @@ KERNEL_FQ void m15400_s04 (KERN_ATTR_VECTOR_ESALT (chacha20_t))
     COMPARE_S_SIMD(r0, r1, r2, r3);
   }
 }
-
-KERNEL_FQ void m15400_s08 (KERN_ATTR_ESALT (chacha20_t))
-{
-}
-
-KERNEL_FQ void m15400_s16 (KERN_ATTR_ESALT (chacha20_t))
-{
-}