From 798f026e3a9dbfbfe71e15e591dcfed04defa7e1 Mon Sep 17 00:00:00 2001
From: Sein Coray <s3inlc@hashes.org>
Date: Mon, 25 Mar 2019 10:57:18 +0100
Subject: [PATCH] adjusted kernels to newest refactoring

---
 OpenCL/inc_zip_inflate.cl | 6 ++----
 OpenCL/m17210_a0-pure.cl  | 8 +++-----
 OpenCL/m17210_a1-pure.cl  | 8 +++-----
 OpenCL/m17210_a3-pure.cl  | 8 +++-----
 OpenCL/m17230_a0-pure.cl  | 8 +++-----
 OpenCL/m17230_a1-pure.cl  | 9 +++++++--
 OpenCL/m17230_a3-pure.cl  | 8 +++-----
 7 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/OpenCL/inc_zip_inflate.cl b/OpenCL/inc_zip_inflate.cl
index 24633fe30..7e1fdb77c 100644
--- a/OpenCL/inc_zip_inflate.cl
+++ b/OpenCL/inc_zip_inflate.cl
@@ -61,10 +61,8 @@ any external components and dependencies which may be included with PKZIP Kernel
 
 */
 
-#include "inc_vendor.cl"
-#include "inc_hash_constants.h"
-#include "inc_hash_functions.cl"
-#include "inc_types.cl"
+#include "inc_vendor.h"
+#include "inc_types.h"
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
diff --git a/OpenCL/m17210_a0-pure.cl b/OpenCL/m17210_a0-pure.cl
index d78df3280..6002a3b95 100644
--- a/OpenCL/m17210_a0-pure.cl
+++ b/OpenCL/m17210_a0-pure.cl
@@ -84,10 +84,8 @@ Author: Sein Coray
 
 */
 
-#include "inc_vendor.cl"
-#include "inc_hash_constants.h"
-#include "inc_hash_functions.cl"
-#include "inc_types.cl"
+#include "inc_vendor.h"
+#include "inc_types.h"
 #include "inc_common.cl"
 #include "inc_simd.cl"
 #include "inc_rp.h"
@@ -548,4 +546,4 @@ __kernel void m17210_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/OpenCL/m17210_a1-pure.cl b/OpenCL/m17210_a1-pure.cl
index 6e49d74d5..992a1b439 100644
--- a/OpenCL/m17210_a1-pure.cl
+++ b/OpenCL/m17210_a1-pure.cl
@@ -84,10 +84,8 @@ Author: Sein Coray
 
 */
 
-#include "inc_vendor.cl"
-#include "inc_hash_constants.h"
-#include "inc_hash_functions.cl"
-#include "inc_types.cl"
+#include "inc_vendor.h"
+#include "inc_types.h"
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
@@ -550,4 +548,4 @@ __kernel void m17210_mxx (KERN_ATTR_ESALT (pkzip_t))
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/OpenCL/m17210_a3-pure.cl b/OpenCL/m17210_a3-pure.cl
index a56146cca..ebbc5142f 100644
--- a/OpenCL/m17210_a3-pure.cl
+++ b/OpenCL/m17210_a3-pure.cl
@@ -84,10 +84,8 @@ Author: Sein Coray
 
 */
 
-#include "inc_vendor.cl"
-#include "inc_hash_constants.h"
-#include "inc_hash_functions.cl"
-#include "inc_types.cl"
+#include "inc_vendor.h"
+#include "inc_types.h"
 #include "inc_common.cl"
 #include "inc_simd.cl"
 
@@ -562,4 +560,4 @@ __kernel void m17210_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/OpenCL/m17230_a0-pure.cl b/OpenCL/m17230_a0-pure.cl
index 9d3607604..b914e4dc6 100644
--- a/OpenCL/m17230_a0-pure.cl
+++ b/OpenCL/m17230_a0-pure.cl
@@ -84,10 +84,8 @@ Author: Sein Coray
 
 */
 
-#include "inc_vendor.cl"
-#include "inc_hash_constants.h"
-#include "inc_hash_functions.cl"
-#include "inc_types.cl"
+#include "inc_vendor.h"
+#include "inc_types.h"
 #include "inc_common.cl"
 #include "inc_simd.cl"
 #include "inc_rp.h"
@@ -536,4 +534,4 @@ __kernel void m17230_mxx (KERN_ATTR_RULES_ESALT (pkzip_t))
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/OpenCL/m17230_a1-pure.cl b/OpenCL/m17230_a1-pure.cl
index f882801fe..735d42850 100644
--- a/OpenCL/m17230_a1-pure.cl
+++ b/OpenCL/m17230_a1-pure.cl
@@ -84,7 +84,12 @@ Author: Sein Coray
 
 */
 
-#include "inc_zip_inflate.cl"
+#include "inc_vendor.h"
+#include "inc_types.h"
+#include "inc_common.cl"
+#include "inc_simd.cl"
+#include "inc_rp.h"
+#include "inc_rp.cl"
 
 #define CRC32(x,c) (((x)>>8)^l_crc32tab[((x)^(c))&0xff])
 #define MSB(x)     ((x)>>24)
@@ -541,4 +546,4 @@ __kernel void m17230_mxx (KERN_ATTR_ESALT (pkzip_t))
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/OpenCL/m17230_a3-pure.cl b/OpenCL/m17230_a3-pure.cl
index 4fd5ffbd4..dcf6d4047 100644
--- a/OpenCL/m17230_a3-pure.cl
+++ b/OpenCL/m17230_a3-pure.cl
@@ -84,10 +84,8 @@ Author: Sein Coray
 
 */
 
-#include "inc_vendor.cl"
-#include "inc_hash_constants.h"
-#include "inc_hash_functions.cl"
-#include "inc_types.cl"
+#include "inc_vendor.h"
+#include "inc_types.h"
 #include "inc_common.cl"
 #include "inc_simd.cl"
 #include "inc_rp.h"
@@ -552,4 +550,4 @@ __kernel void m17230_mxx (KERN_ATTR_VECTOR_ESALT (pkzip_t))
       }
     }
   }
-}
\ No newline at end of file
+}