From c9d60c079fc504bf59ee0fca8490c13004abb33c Mon Sep 17 00:00:00 2001 From: jsteube Date: Fri, 22 Mar 2019 15:16:25 +0100 Subject: [PATCH] Prepare OpenCL kernels for non-static compilation --- OpenCL/amp_a0.cl | 2 + OpenCL/amp_a1.cl | 2 + OpenCL/amp_a3.cl | 2 + OpenCL/m00000_a0-optimized.cl | 2 + OpenCL/m00000_a0-pure.cl | 2 + OpenCL/m00000_a1-optimized.cl | 2 + OpenCL/m00000_a1-pure.cl | 2 + OpenCL/m00000_a3-optimized.cl | 2 + OpenCL/m00000_a3-pure.cl | 2 + OpenCL/m00010_a0-optimized.cl | 2 + OpenCL/m00010_a0-pure.cl | 2 + OpenCL/m00010_a1-optimized.cl | 2 + OpenCL/m00010_a1-pure.cl | 2 + OpenCL/m00010_a3-optimized.cl | 2 + OpenCL/m00010_a3-pure.cl | 2 + OpenCL/m00020_a0-optimized.cl | 2 + OpenCL/m00020_a0-pure.cl | 2 + OpenCL/m00020_a1-optimized.cl | 2 + OpenCL/m00020_a1-pure.cl | 2 + OpenCL/m00020_a3-optimized.cl | 2 + OpenCL/m00020_a3-pure.cl | 2 + OpenCL/m00030_a0-optimized.cl | 2 + OpenCL/m00030_a0-pure.cl | 2 + OpenCL/m00030_a1-optimized.cl | 2 + OpenCL/m00030_a1-pure.cl | 2 + OpenCL/m00030_a3-optimized.cl | 2 + OpenCL/m00030_a3-pure.cl | 2 + OpenCL/m00040_a0-optimized.cl | 2 + OpenCL/m00040_a0-pure.cl | 2 + OpenCL/m00040_a1-optimized.cl | 2 + OpenCL/m00040_a1-pure.cl | 2 + OpenCL/m00040_a3-optimized.cl | 2 + OpenCL/m00040_a3-pure.cl | 2 + OpenCL/m00050_a0-optimized.cl | 2 + OpenCL/m00050_a0-pure.cl | 2 + OpenCL/m00050_a1-optimized.cl | 2 + OpenCL/m00050_a1-pure.cl | 2 + OpenCL/m00050_a3-optimized.cl | 2 + OpenCL/m00050_a3-pure.cl | 2 + OpenCL/m00060_a0-optimized.cl | 2 + OpenCL/m00060_a0-pure.cl | 2 + OpenCL/m00060_a1-optimized.cl | 2 + OpenCL/m00060_a1-pure.cl | 2 + OpenCL/m00060_a3-optimized.cl | 2 + OpenCL/m00060_a3-pure.cl | 2 + OpenCL/m00100_a0-optimized.cl | 2 + OpenCL/m00100_a0-pure.cl | 2 + OpenCL/m00100_a1-optimized.cl | 2 + OpenCL/m00100_a1-pure.cl | 2 + OpenCL/m00100_a3-optimized.cl | 2 + OpenCL/m00100_a3-pure.cl | 2 + OpenCL/m00110_a0-optimized.cl | 2 + OpenCL/m00110_a0-pure.cl | 2 + OpenCL/m00110_a1-optimized.cl | 2 + OpenCL/m00110_a1-pure.cl | 2 + OpenCL/m00110_a3-optimized.cl | 2 + OpenCL/m00110_a3-pure.cl | 2 + OpenCL/m00120_a0-optimized.cl | 2 + OpenCL/m00120_a0-pure.cl | 2 + OpenCL/m00120_a1-optimized.cl | 2 + OpenCL/m00120_a1-pure.cl | 2 + OpenCL/m00120_a3-optimized.cl | 2 + OpenCL/m00120_a3-pure.cl | 2 + OpenCL/m00130_a0-optimized.cl | 2 + OpenCL/m00130_a0-pure.cl | 2 + OpenCL/m00130_a1-optimized.cl | 2 + OpenCL/m00130_a1-pure.cl | 2 + OpenCL/m00130_a3-optimized.cl | 2 + OpenCL/m00130_a3-pure.cl | 2 + OpenCL/m00140_a0-optimized.cl | 2 + OpenCL/m00140_a0-pure.cl | 2 + OpenCL/m00140_a1-optimized.cl | 2 + OpenCL/m00140_a1-pure.cl | 2 + OpenCL/m00140_a3-optimized.cl | 2 + OpenCL/m00140_a3-pure.cl | 2 + OpenCL/m00150_a0-optimized.cl | 2 + OpenCL/m00150_a0-pure.cl | 2 + OpenCL/m00150_a1-optimized.cl | 2 + OpenCL/m00150_a1-pure.cl | 2 + OpenCL/m00150_a3-optimized.cl | 2 + OpenCL/m00150_a3-pure.cl | 2 + OpenCL/m00160_a0-optimized.cl | 2 + OpenCL/m00160_a0-pure.cl | 2 + OpenCL/m00160_a1-optimized.cl | 2 + OpenCL/m00160_a1-pure.cl | 2 + OpenCL/m00160_a3-optimized.cl | 2 + OpenCL/m00160_a3-pure.cl | 2 + OpenCL/m00200_a0-optimized.cl | 2 + OpenCL/m00200_a1-optimized.cl | 2 + OpenCL/m00200_a3-optimized.cl | 2 + OpenCL/m00300_a0-optimized.cl | 2 + OpenCL/m00300_a0-pure.cl | 2 + OpenCL/m00300_a1-optimized.cl | 2 + OpenCL/m00300_a1-pure.cl | 2 + OpenCL/m00300_a3-optimized.cl | 2 + OpenCL/m00300_a3-pure.cl | 2 + OpenCL/m00400-optimized.cl | 4 + OpenCL/m00400-pure.cl | 4 + OpenCL/m00500-optimized.cl | 4 + OpenCL/m00500-pure.cl | 4 + OpenCL/m00600_a0-optimized.cl | 2 + OpenCL/m00600_a1-optimized.cl | 2 + OpenCL/m00600_a3-optimized.cl | 2 + OpenCL/m00900_a0-optimized.cl | 2 + OpenCL/m00900_a0-pure.cl | 2 + OpenCL/m00900_a1-optimized.cl | 2 + OpenCL/m00900_a1-pure.cl | 2 + OpenCL/m00900_a3-optimized.cl | 2 + OpenCL/m00900_a3-pure.cl | 2 + OpenCL/m01000_a0-optimized.cl | 2 + OpenCL/m01000_a0-pure.cl | 2 + OpenCL/m01000_a1-optimized.cl | 2 + OpenCL/m01000_a1-pure.cl | 2 + OpenCL/m01000_a3-optimized.cl | 2 + OpenCL/m01000_a3-pure.cl | 2 + OpenCL/m01100_a0-optimized.cl | 2 + OpenCL/m01100_a0-pure.cl | 2 + OpenCL/m01100_a1-optimized.cl | 2 + OpenCL/m01100_a1-pure.cl | 2 + OpenCL/m01100_a3-optimized.cl | 2 + OpenCL/m01100_a3-pure.cl | 2 + OpenCL/m01300_a0-optimized.cl | 2 + OpenCL/m01300_a0-pure.cl | 2 + OpenCL/m01300_a1-optimized.cl | 2 + OpenCL/m01300_a1-pure.cl | 2 + OpenCL/m01300_a3-optimized.cl | 2 + OpenCL/m01300_a3-pure.cl | 2 + OpenCL/m01400_a0-optimized.cl | 2 + OpenCL/m01400_a0-pure.cl | 2 + OpenCL/m01400_a1-optimized.cl | 2 + OpenCL/m01400_a1-pure.cl | 2 + OpenCL/m01400_a3-optimized.cl | 2 + OpenCL/m01400_a3-pure.cl | 2 + OpenCL/m01410_a0-optimized.cl | 2 + OpenCL/m01410_a0-pure.cl | 2 + OpenCL/m01410_a1-optimized.cl | 2 + OpenCL/m01410_a1-pure.cl | 2 + OpenCL/m01410_a3-optimized.cl | 2 + OpenCL/m01410_a3-pure.cl | 2 + OpenCL/m01420_a0-optimized.cl | 2 + OpenCL/m01420_a0-pure.cl | 2 + OpenCL/m01420_a1-optimized.cl | 2 + OpenCL/m01420_a1-pure.cl | 2 + OpenCL/m01420_a3-optimized.cl | 2 + OpenCL/m01420_a3-pure.cl | 2 + OpenCL/m01430_a0-optimized.cl | 2 + OpenCL/m01430_a0-pure.cl | 2 + OpenCL/m01430_a1-optimized.cl | 2 + OpenCL/m01430_a1-pure.cl | 2 + OpenCL/m01430_a3-optimized.cl | 2 + OpenCL/m01430_a3-pure.cl | 2 + OpenCL/m01440_a0-optimized.cl | 2 + OpenCL/m01440_a0-pure.cl | 2 + OpenCL/m01440_a1-optimized.cl | 2 + OpenCL/m01440_a1-pure.cl | 2 + OpenCL/m01440_a3-optimized.cl | 2 + OpenCL/m01440_a3-pure.cl | 2 + OpenCL/m01450_a0-optimized.cl | 2 + OpenCL/m01450_a0-pure.cl | 2 + OpenCL/m01450_a1-optimized.cl | 2 + OpenCL/m01450_a1-pure.cl | 2 + OpenCL/m01450_a3-optimized.cl | 2 + OpenCL/m01450_a3-pure.cl | 2 + OpenCL/m01460_a0-optimized.cl | 2 + OpenCL/m01460_a0-pure.cl | 2 + OpenCL/m01460_a1-optimized.cl | 2 + OpenCL/m01460_a1-pure.cl | 2 + OpenCL/m01460_a3-optimized.cl | 2 + OpenCL/m01460_a3-pure.cl | 2 + OpenCL/m01500_a0-pure.cl | 2 + OpenCL/m01500_a1-pure.cl | 2 + OpenCL/m01500_a3-pure.cl | 8 + OpenCL/m01600-optimized.cl | 4 + OpenCL/m01600-pure.cl | 4 + OpenCL/m01700_a0-optimized.cl | 2 + OpenCL/m01700_a0-pure.cl | 2 + OpenCL/m01700_a1-optimized.cl | 2 + OpenCL/m01700_a1-pure.cl | 2 + OpenCL/m01700_a3-optimized.cl | 2 + OpenCL/m01700_a3-pure.cl | 2 + OpenCL/m01710_a0-optimized.cl | 2 + OpenCL/m01710_a0-pure.cl | 2 + OpenCL/m01710_a1-optimized.cl | 2 + OpenCL/m01710_a1-pure.cl | 2 + OpenCL/m01710_a3-optimized.cl | 2 + OpenCL/m01710_a3-pure.cl | 2 + OpenCL/m01720_a0-optimized.cl | 2 + OpenCL/m01720_a0-pure.cl | 2 + OpenCL/m01720_a1-optimized.cl | 2 + OpenCL/m01720_a1-pure.cl | 2 + OpenCL/m01720_a3-optimized.cl | 2 + OpenCL/m01720_a3-pure.cl | 2 + OpenCL/m01730_a0-optimized.cl | 2 + OpenCL/m01730_a0-pure.cl | 2 + OpenCL/m01730_a1-optimized.cl | 2 + OpenCL/m01730_a1-pure.cl | 2 + OpenCL/m01730_a3-optimized.cl | 2 + OpenCL/m01730_a3-pure.cl | 2 + OpenCL/m01740_a0-optimized.cl | 2 + OpenCL/m01740_a0-pure.cl | 2 + OpenCL/m01740_a1-optimized.cl | 2 + OpenCL/m01740_a1-pure.cl | 2 + OpenCL/m01740_a3-optimized.cl | 2 + OpenCL/m01740_a3-pure.cl | 2 + OpenCL/m01750_a0-optimized.cl | 2 + OpenCL/m01750_a0-pure.cl | 2 + OpenCL/m01750_a1-optimized.cl | 2 + OpenCL/m01750_a1-pure.cl | 2 + OpenCL/m01750_a3-optimized.cl | 2 + OpenCL/m01750_a3-pure.cl | 2 + OpenCL/m01760_a0-optimized.cl | 2 + OpenCL/m01760_a0-pure.cl | 2 + OpenCL/m01760_a1-optimized.cl | 2 + OpenCL/m01760_a1-pure.cl | 2 + OpenCL/m01760_a3-optimized.cl | 2 + OpenCL/m01760_a3-pure.cl | 2 + OpenCL/m01800-optimized.cl | 4 + OpenCL/m01800-pure.cl | 4 + OpenCL/m02000_a0-pure.cl | 2 + OpenCL/m02000_a1-pure.cl | 2 + OpenCL/m02000_a3-pure.cl | 2 + OpenCL/m02100-pure.cl | 4 + OpenCL/m02400_a0-optimized.cl | 2 + OpenCL/m02400_a1-optimized.cl | 2 + OpenCL/m02400_a3-optimized.cl | 2 + OpenCL/m02410_a0-optimized.cl | 2 + OpenCL/m02410_a1-optimized.cl | 2 + OpenCL/m02410_a3-optimized.cl | 2 + OpenCL/m02500-pure.cl | 2 + OpenCL/m02501-pure.cl | 2 + OpenCL/m02610_a0-optimized.cl | 2 + OpenCL/m02610_a0-pure.cl | 2 + OpenCL/m02610_a1-optimized.cl | 2 + OpenCL/m02610_a1-pure.cl | 2 + OpenCL/m02610_a3-optimized.cl | 2 + OpenCL/m02610_a3-pure.cl | 2 + OpenCL/m02710_a0-optimized.cl | 2 + OpenCL/m02710_a1-optimized.cl | 2 + OpenCL/m02710_a3-optimized.cl | 2 + OpenCL/m02810_a0-optimized.cl | 2 + OpenCL/m02810_a0-pure.cl | 2 + OpenCL/m02810_a1-optimized.cl | 2 + OpenCL/m02810_a1-pure.cl | 2 + OpenCL/m02810_a3-optimized.cl | 2 + OpenCL/m02810_a3-pure.cl | 2 + OpenCL/m03000_a0-pure.cl | 2 + OpenCL/m03000_a1-pure.cl | 2 + OpenCL/m03000_a3-pure.cl | 8 + OpenCL/m03100_a0-optimized.cl | 2 + OpenCL/m03100_a1-optimized.cl | 2 + OpenCL/m03100_a3-optimized.cl | 2 + OpenCL/m03200-pure.cl | 4 + OpenCL/m03710_a0-optimized.cl | 2 + OpenCL/m03710_a0-pure.cl | 2 + OpenCL/m03710_a1-optimized.cl | 2 + OpenCL/m03710_a1-pure.cl | 2 + OpenCL/m03710_a3-optimized.cl | 2 + OpenCL/m03710_a3-pure.cl | 2 + OpenCL/m03800_a0-optimized.cl | 2 + OpenCL/m03800_a0-pure.cl | 2 + OpenCL/m03800_a1-optimized.cl | 2 + OpenCL/m03800_a1-pure.cl | 2 + OpenCL/m03800_a3-optimized.cl | 2 + OpenCL/m03800_a3-pure.cl | 2 + OpenCL/m03910_a0-optimized.cl | 2 + OpenCL/m03910_a0-pure.cl | 2 + OpenCL/m03910_a1-optimized.cl | 2 + OpenCL/m03910_a1-pure.cl | 2 + OpenCL/m03910_a3-optimized.cl | 2 + OpenCL/m03910_a3-pure.cl | 2 + OpenCL/m04010_a0-optimized.cl | 2 + OpenCL/m04010_a0-pure.cl | 2 + OpenCL/m04010_a1-optimized.cl | 2 + OpenCL/m04010_a1-pure.cl | 2 + OpenCL/m04010_a3-optimized.cl | 2 + OpenCL/m04010_a3-pure.cl | 2 + OpenCL/m04110_a0-optimized.cl | 2 + OpenCL/m04110_a0-pure.cl | 2 + OpenCL/m04110_a1-optimized.cl | 2 + OpenCL/m04110_a1-pure.cl | 2 + OpenCL/m04110_a3-optimized.cl | 2 + OpenCL/m04110_a3-pure.cl | 2 + OpenCL/m04310_a0-optimized.cl | 2 + OpenCL/m04310_a0-pure.cl | 2 + OpenCL/m04310_a1-optimized.cl | 2 + OpenCL/m04310_a1-pure.cl | 2 + OpenCL/m04310_a3-optimized.cl | 2 + OpenCL/m04310_a3-pure.cl | 2 + OpenCL/m04400_a0-optimized.cl | 2 + OpenCL/m04400_a0-pure.cl | 2 + OpenCL/m04400_a1-optimized.cl | 2 + OpenCL/m04400_a1-pure.cl | 2 + OpenCL/m04400_a3-optimized.cl | 2 + OpenCL/m04400_a3-pure.cl | 2 + OpenCL/m04500_a0-optimized.cl | 2 + OpenCL/m04500_a0-pure.cl | 2 + OpenCL/m04500_a1-optimized.cl | 2 + OpenCL/m04500_a1-pure.cl | 2 + OpenCL/m04500_a3-optimized.cl | 2 + OpenCL/m04500_a3-pure.cl | 2 + OpenCL/m04520_a0-optimized.cl | 2 + OpenCL/m04520_a0-pure.cl | 2 + OpenCL/m04520_a1-optimized.cl | 2 + OpenCL/m04520_a1-pure.cl | 2 + OpenCL/m04520_a3-optimized.cl | 2 + OpenCL/m04520_a3-pure.cl | 2 + OpenCL/m04700_a0-optimized.cl | 2 + OpenCL/m04700_a0-pure.cl | 2 + OpenCL/m04700_a1-optimized.cl | 2 + OpenCL/m04700_a1-pure.cl | 2 + OpenCL/m04700_a3-optimized.cl | 2 + OpenCL/m04700_a3-pure.cl | 2 + OpenCL/m04800_a0-optimized.cl | 2 + OpenCL/m04800_a0-pure.cl | 2 + OpenCL/m04800_a1-optimized.cl | 2 + OpenCL/m04800_a1-pure.cl | 2 + OpenCL/m04800_a3-optimized.cl | 2 + OpenCL/m04800_a3-pure.cl | 2 + OpenCL/m04900_a0-optimized.cl | 2 + OpenCL/m04900_a0-pure.cl | 2 + OpenCL/m04900_a1-optimized.cl | 2 + OpenCL/m04900_a1-pure.cl | 2 + OpenCL/m04900_a3-optimized.cl | 2 + OpenCL/m04900_a3-pure.cl | 2 + OpenCL/m05100_a0-optimized.cl | 2 + OpenCL/m05100_a0-pure.cl | 2 + OpenCL/m05100_a1-optimized.cl | 2 + OpenCL/m05100_a1-pure.cl | 2 + OpenCL/m05100_a3-optimized.cl | 2 + OpenCL/m05100_a3-pure.cl | 2 + OpenCL/m05200-pure.cl | 4 + OpenCL/m05300_a0-optimized.cl | 2 + OpenCL/m05300_a0-pure.cl | 2 + OpenCL/m05300_a1-optimized.cl | 2 + OpenCL/m05300_a1-pure.cl | 2 + OpenCL/m05300_a3-optimized.cl | 2 + OpenCL/m05300_a3-pure.cl | 2 + OpenCL/m05400_a0-optimized.cl | 2 + OpenCL/m05400_a0-pure.cl | 2 + OpenCL/m05400_a1-optimized.cl | 2 + OpenCL/m05400_a1-pure.cl | 2 + OpenCL/m05400_a3-optimized.cl | 2 + OpenCL/m05400_a3-pure.cl | 2 + OpenCL/m05500_a0-optimized.cl | 2 + OpenCL/m05500_a0-pure.cl | 2 + OpenCL/m05500_a1-optimized.cl | 2 + OpenCL/m05500_a1-pure.cl | 2 + OpenCL/m05500_a3-optimized.cl | 2 + OpenCL/m05500_a3-pure.cl | 2 + OpenCL/m05600_a0-optimized.cl | 2 + OpenCL/m05600_a0-pure.cl | 2 + OpenCL/m05600_a1-optimized.cl | 2 + OpenCL/m05600_a1-pure.cl | 2 + OpenCL/m05600_a3-optimized.cl | 2 + OpenCL/m05600_a3-pure.cl | 2 + OpenCL/m05800-optimized.cl | 4 + OpenCL/m05800-pure.cl | 4 + OpenCL/m06000_a0-optimized.cl | 2 + OpenCL/m06000_a0-pure.cl | 2 + OpenCL/m06000_a1-optimized.cl | 2 + OpenCL/m06000_a1-pure.cl | 2 + OpenCL/m06000_a3-optimized.cl | 2 + OpenCL/m06000_a3-pure.cl | 2 + OpenCL/m06100_a0-optimized.cl | 2 + OpenCL/m06100_a0-pure.cl | 2 + OpenCL/m06100_a1-optimized.cl | 2 + OpenCL/m06100_a1-pure.cl | 2 + OpenCL/m06100_a3-optimized.cl | 2 + OpenCL/m06100_a3-pure.cl | 2 + OpenCL/m06211-pure.cl | 4 + OpenCL/m06212-pure.cl | 4 + OpenCL/m06213-pure.cl | 4 + OpenCL/m06221-pure.cl | 4 + OpenCL/m06222-pure.cl | 4 + OpenCL/m06223-pure.cl | 4 + OpenCL/m06231-pure.cl | 4 + OpenCL/m06232-pure.cl | 4 + OpenCL/m06233-pure.cl | 4 + OpenCL/m06300-optimized.cl | 4 + OpenCL/m06300-pure.cl | 4 + OpenCL/m06400-pure.cl | 4 + OpenCL/m06500-pure.cl | 4 + OpenCL/m06600-pure.cl | 4 + OpenCL/m06700-pure.cl | 4 + OpenCL/m06800-pure.cl | 4 + OpenCL/m06900_a0-optimized.cl | 2 + OpenCL/m06900_a1-optimized.cl | 2 + OpenCL/m06900_a3-optimized.cl | 2 + OpenCL/m07000_a0-optimized.cl | 2 + OpenCL/m07000_a0-pure.cl | 2 + OpenCL/m07000_a1-optimized.cl | 2 + OpenCL/m07000_a1-pure.cl | 2 + OpenCL/m07000_a3-optimized.cl | 2 + OpenCL/m07000_a3-pure.cl | 2 + OpenCL/m07100-pure.cl | 4 + OpenCL/m07300_a0-optimized.cl | 2 + OpenCL/m07300_a0-pure.cl | 2 + OpenCL/m07300_a1-optimized.cl | 2 + OpenCL/m07300_a1-pure.cl | 2 + OpenCL/m07300_a3-optimized.cl | 2 + OpenCL/m07300_a3-pure.cl | 2 + OpenCL/m07400-optimized.cl | 4 + OpenCL/m07400-pure.cl | 4 + OpenCL/m07500_a0-optimized.cl | 2 + OpenCL/m07500_a0-pure.cl | 2 + OpenCL/m07500_a1-optimized.cl | 2 + OpenCL/m07500_a1-pure.cl | 2 + OpenCL/m07500_a3-optimized.cl | 2 + OpenCL/m07500_a3-pure.cl | 2 + OpenCL/m07700_a0-optimized.cl | 2 + OpenCL/m07700_a1-optimized.cl | 2 + OpenCL/m07700_a3-optimized.cl | 2 + OpenCL/m07701_a0-optimized.cl | 2 + OpenCL/m07701_a1-optimized.cl | 2 + OpenCL/m07701_a3-optimized.cl | 2 + OpenCL/m07800_a0-optimized.cl | 2 + OpenCL/m07800_a1-optimized.cl | 2 + OpenCL/m07800_a3-optimized.cl | 2 + OpenCL/m07801_a0-optimized.cl | 2 + OpenCL/m07801_a1-optimized.cl | 2 + OpenCL/m07801_a3-optimized.cl | 2 + OpenCL/m07900-pure.cl | 4 + OpenCL/m08000_a0-optimized.cl | 2 + OpenCL/m08000_a1-optimized.cl | 2 + OpenCL/m08000_a3-optimized.cl | 2 + OpenCL/m08100_a0-optimized.cl | 2 + OpenCL/m08100_a0-pure.cl | 2 + OpenCL/m08100_a1-optimized.cl | 2 + OpenCL/m08100_a1-pure.cl | 2 + OpenCL/m08100_a3-optimized.cl | 2 + OpenCL/m08100_a3-pure.cl | 2 + OpenCL/m08200-pure.cl | 4 + OpenCL/m08300_a0-optimized.cl | 2 + OpenCL/m08300_a0-pure.cl | 2 + OpenCL/m08300_a1-optimized.cl | 2 + OpenCL/m08300_a1-pure.cl | 2 + OpenCL/m08300_a3-optimized.cl | 2 + OpenCL/m08300_a3-pure.cl | 2 + OpenCL/m08400_a0-optimized.cl | 2 + OpenCL/m08400_a0-pure.cl | 2 + OpenCL/m08400_a1-optimized.cl | 2 + OpenCL/m08400_a1-pure.cl | 2 + OpenCL/m08400_a3-optimized.cl | 2 + OpenCL/m08400_a3-pure.cl | 2 + OpenCL/m08500_a0-pure.cl | 2 + OpenCL/m08500_a1-pure.cl | 2 + OpenCL/m08500_a3-pure.cl | 2 + OpenCL/m08600_a0-pure.cl | 2 + OpenCL/m08600_a1-pure.cl | 2 + OpenCL/m08600_a3-pure.cl | 2 + OpenCL/m08700_a0-optimized.cl | 2 + OpenCL/m08700_a1-optimized.cl | 2 + OpenCL/m08700_a3-optimized.cl | 2 + OpenCL/m08800-pure.cl | 2 + OpenCL/m08900-pure.cl | 4 + OpenCL/m09000-pure.cl | 4 + OpenCL/m09100-pure.cl | 4 + OpenCL/m09400-pure.cl | 6 + OpenCL/m09500-pure.cl | 4 + OpenCL/m09600-pure.cl | 4 + OpenCL/m09700_a0-optimized.cl | 2 + OpenCL/m09700_a1-optimized.cl | 2 + OpenCL/m09700_a3-optimized.cl | 2 + OpenCL/m09710_a0-optimized.cl | 2 + OpenCL/m09710_a1-optimized.cl | 2 + OpenCL/m09710_a3-optimized.cl | 2 + OpenCL/m09720_a0-optimized.cl | 2 + OpenCL/m09720_a1-optimized.cl | 2 + OpenCL/m09720_a3-optimized.cl | 2 + OpenCL/m09800_a0-optimized.cl | 2 + OpenCL/m09800_a1-optimized.cl | 2 + OpenCL/m09800_a3-optimized.cl | 2 + OpenCL/m09810_a0-optimized.cl | 2 + OpenCL/m09810_a1-optimized.cl | 2 + OpenCL/m09810_a3-optimized.cl | 2 + OpenCL/m09820_a0-optimized.cl | 2 + OpenCL/m09820_a1-optimized.cl | 2 + OpenCL/m09820_a3-optimized.cl | 2 + OpenCL/m09900_a0-optimized.cl | 2 + OpenCL/m09900_a0-pure.cl | 2 + OpenCL/m09900_a1-optimized.cl | 2 + OpenCL/m09900_a1-pure.cl | 2 + OpenCL/m09900_a3-optimized.cl | 2 + OpenCL/m09900_a3-pure.cl | 2 + OpenCL/m10100_a0-optimized.cl | 2 + OpenCL/m10100_a1-optimized.cl | 2 + OpenCL/m10100_a3-optimized.cl | 2 + OpenCL/m10300-pure.cl | 4 + OpenCL/m10400_a0-optimized.cl | 2 + OpenCL/m10400_a1-optimized.cl | 2 + OpenCL/m10400_a3-optimized.cl | 2 + OpenCL/m10410_a0-optimized.cl | 2 + OpenCL/m10410_a1-optimized.cl | 2 + OpenCL/m10410_a3-optimized.cl | 2 + OpenCL/m10420_a0-optimized.cl | 2 + OpenCL/m10420_a1-optimized.cl | 2 + OpenCL/m10420_a3-optimized.cl | 2 + OpenCL/m10500-pure.cl | 4 + OpenCL/m10700-optimized.cl | 4 + OpenCL/m10700-pure.cl | 4 + OpenCL/m10800_a0-optimized.cl | 2 + OpenCL/m10800_a0-pure.cl | 2 + OpenCL/m10800_a1-optimized.cl | 2 + OpenCL/m10800_a1-pure.cl | 2 + OpenCL/m10800_a3-optimized.cl | 2 + OpenCL/m10800_a3-pure.cl | 2 + OpenCL/m10900-pure.cl | 4 + OpenCL/m11000_a0-optimized.cl | 2 + OpenCL/m11000_a0-pure.cl | 2 + OpenCL/m11000_a1-optimized.cl | 2 + OpenCL/m11000_a1-pure.cl | 2 + OpenCL/m11000_a3-optimized.cl | 2 + OpenCL/m11000_a3-pure.cl | 2 + OpenCL/m11100_a0-optimized.cl | 2 + OpenCL/m11100_a0-pure.cl | 2 + OpenCL/m11100_a1-optimized.cl | 2 + OpenCL/m11100_a1-pure.cl | 2 + OpenCL/m11100_a3-optimized.cl | 2 + OpenCL/m11100_a3-pure.cl | 2 + OpenCL/m11200_a0-optimized.cl | 2 + OpenCL/m11200_a0-pure.cl | 2 + OpenCL/m11200_a1-optimized.cl | 2 + OpenCL/m11200_a1-pure.cl | 2 + OpenCL/m11200_a3-optimized.cl | 2 + OpenCL/m11200_a3-pure.cl | 2 + OpenCL/m11300-pure.cl | 2 + OpenCL/m11400_a0-pure.cl | 2 + OpenCL/m11400_a1-pure.cl | 2 + OpenCL/m11400_a3-pure.cl | 2 + OpenCL/m11500_a0-optimized.cl | 2 + OpenCL/m11500_a1-optimized.cl | 2 + OpenCL/m11500_a3-optimized.cl | 2 + OpenCL/m11600-pure.cl | 2 + OpenCL/m11700_a0-optimized.cl | 2 + OpenCL/m11700_a0-pure.cl | 2 + OpenCL/m11700_a1-optimized.cl | 2 + OpenCL/m11700_a1-pure.cl | 2 + OpenCL/m11700_a3-optimized.cl | 2 + OpenCL/m11700_a3-pure.cl | 2 + OpenCL/m11750_a0-pure.cl | 2 + OpenCL/m11750_a1-pure.cl | 2 + OpenCL/m11750_a3-pure.cl | 2 + OpenCL/m11760_a0-pure.cl | 2 + OpenCL/m11760_a1-pure.cl | 2 + OpenCL/m11760_a3-pure.cl | 2 + OpenCL/m11800_a0-optimized.cl | 2 + OpenCL/m11800_a0-pure.cl | 2 + OpenCL/m11800_a1-optimized.cl | 2 + OpenCL/m11800_a1-pure.cl | 2 + OpenCL/m11800_a3-optimized.cl | 2 + OpenCL/m11800_a3-pure.cl | 2 + OpenCL/m11850_a0-pure.cl | 2 + OpenCL/m11850_a1-pure.cl | 2 + OpenCL/m11850_a3-pure.cl | 2 + OpenCL/m11860_a0-pure.cl | 2 + OpenCL/m11860_a1-pure.cl | 2 + OpenCL/m11860_a3-pure.cl | 2 + OpenCL/m11900-pure.cl | 4 + OpenCL/m12000-pure.cl | 4 + OpenCL/m12200-pure.cl | 4 + OpenCL/m12300-pure.cl | 4 + OpenCL/m12400-pure.cl | 4 + OpenCL/m12500-pure.cl | 4 + OpenCL/m12600_a0-optimized.cl | 2 + OpenCL/m12600_a0-pure.cl | 2 + OpenCL/m12600_a1-optimized.cl | 2 + OpenCL/m12600_a1-pure.cl | 2 + OpenCL/m12600_a3-optimized.cl | 2 + OpenCL/m12600_a3-pure.cl | 2 + OpenCL/m12700-pure.cl | 14 + OpenCL/m12800-pure.cl | 4 + OpenCL/m12900-pure.cl | 4 + OpenCL/m13000-pure.cl | 4 + OpenCL/m13100_a0-optimized.cl | 2 + OpenCL/m13100_a0-pure.cl | 2 + OpenCL/m13100_a1-optimized.cl | 2 + OpenCL/m13100_a1-pure.cl | 2 + OpenCL/m13100_a3-optimized.cl | 2 + OpenCL/m13100_a3-pure.cl | 2 + OpenCL/m13200-pure.cl | 2 + OpenCL/m13300_a0-optimized.cl | 2 + OpenCL/m13300_a0-pure.cl | 2 + OpenCL/m13300_a1-optimized.cl | 2 + OpenCL/m13300_a1-pure.cl | 2 + OpenCL/m13300_a3-optimized.cl | 2 + OpenCL/m13300_a3-pure.cl | 2 + OpenCL/m13400-pure.cl | 4 + OpenCL/m13500_a0-optimized.cl | 2 + OpenCL/m13500_a0-pure.cl | 2 + OpenCL/m13500_a1-optimized.cl | 2 + OpenCL/m13500_a1-pure.cl | 2 + OpenCL/m13500_a3-optimized.cl | 2 + OpenCL/m13500_a3-pure.cl | 2 + OpenCL/m13600-pure.cl | 4 + OpenCL/m13711-pure.cl | 4 + OpenCL/m13712-pure.cl | 4 + OpenCL/m13713-pure.cl | 4 + OpenCL/m13721-pure.cl | 4 + OpenCL/m13722-pure.cl | 4 + OpenCL/m13723-pure.cl | 4 + OpenCL/m13731-pure.cl | 4 + OpenCL/m13732-pure.cl | 4 + OpenCL/m13733-pure.cl | 4 + OpenCL/m13751-pure.cl | 4 + OpenCL/m13752-pure.cl | 4 + OpenCL/m13753-pure.cl | 4 + OpenCL/m13771-pure.cl | 4 + OpenCL/m13772-pure.cl | 4 + OpenCL/m13773-pure.cl | 4 + OpenCL/m13800_a0-optimized.cl | 2 + OpenCL/m13800_a0-pure.cl | 2 + OpenCL/m13800_a1-optimized.cl | 2 + OpenCL/m13800_a1-pure.cl | 2 + OpenCL/m13800_a3-optimized.cl | 2 + OpenCL/m13800_a3-pure.cl | 2 + OpenCL/m13900_a0-optimized.cl | 2 + OpenCL/m13900_a0-pure.cl | 2 + OpenCL/m13900_a1-optimized.cl | 2 + OpenCL/m13900_a1-pure.cl | 2 + OpenCL/m13900_a3-optimized.cl | 2 + OpenCL/m13900_a3-pure.cl | 2 + OpenCL/m14000_a0-pure.cl | 2 + OpenCL/m14000_a1-pure.cl | 2 + OpenCL/m14000_a3-pure.cl | 8 + OpenCL/m14100_a0-pure.cl | 2 + OpenCL/m14100_a1-pure.cl | 2 + OpenCL/m14100_a3-pure.cl | 2 + OpenCL/m14400_a0-optimized.cl | 2 + OpenCL/m14400_a0-pure.cl | 2 + OpenCL/m14400_a1-optimized.cl | 2 + OpenCL/m14400_a1-pure.cl | 2 + OpenCL/m14400_a3-optimized.cl | 2 + OpenCL/m14400_a3-pure.cl | 2 + OpenCL/m14611-pure.cl | 4 + OpenCL/m14612-pure.cl | 4 + OpenCL/m14613-pure.cl | 4 + OpenCL/m14621-pure.cl | 4 + OpenCL/m14622-pure.cl | 4 + OpenCL/m14623-pure.cl | 4 + OpenCL/m14631-pure.cl | 4 + OpenCL/m14632-pure.cl | 4 + OpenCL/m14633-pure.cl | 4 + OpenCL/m14641-pure.cl | 4 + OpenCL/m14642-pure.cl | 4 + OpenCL/m14643-pure.cl | 4 + OpenCL/m14700-pure.cl | 2 + OpenCL/m14800-pure.cl | 2 + OpenCL/m14900_a0-optimized.cl | 2 + OpenCL/m14900_a1-optimized.cl | 2 + OpenCL/m14900_a3-optimized.cl | 2 + OpenCL/m15000_a0-optimized.cl | 2 + OpenCL/m15000_a0-pure.cl | 2 + OpenCL/m15000_a1-optimized.cl | 2 + OpenCL/m15000_a1-pure.cl | 2 + OpenCL/m15000_a3-optimized.cl | 2 + OpenCL/m15000_a3-pure.cl | 2 + OpenCL/m15100-pure.cl | 4 + OpenCL/m15300-pure.cl | 2 + OpenCL/m15400_a0-optimized.cl | 2 + OpenCL/m15400_a1-optimized.cl | 2 + OpenCL/m15400_a3-optimized.cl | 2 + OpenCL/m15500_a0-optimized.cl | 2 + OpenCL/m15500_a0-pure.cl | 2 + OpenCL/m15500_a1-optimized.cl | 2 + OpenCL/m15500_a1-pure.cl | 2 + OpenCL/m15500_a3-optimized.cl | 2 + OpenCL/m15500_a3-pure.cl | 2 + OpenCL/m15600-pure.cl | 4 + OpenCL/m15700-pure.cl | 4 + OpenCL/m15900-pure.cl | 2 + OpenCL/m16000_a0-pure.cl | 2 + OpenCL/m16000_a1-pure.cl | 2 + OpenCL/m16000_a3-pure.cl | 2 + OpenCL/m16100_a0-optimized.cl | 2 + OpenCL/m16100_a0-pure.cl | 2 + OpenCL/m16100_a1-optimized.cl | 2 + OpenCL/m16100_a1-pure.cl | 2 + OpenCL/m16100_a3-optimized.cl | 2 + OpenCL/m16100_a3-pure.cl | 2 + OpenCL/m16200-pure.cl | 2 + OpenCL/m16300-pure.cl | 4 + OpenCL/m16400_a0-optimized.cl | 2 + OpenCL/m16400_a0-pure.cl | 2 + OpenCL/m16400_a1-optimized.cl | 2 + OpenCL/m16400_a1-pure.cl | 2 + OpenCL/m16400_a3-optimized.cl | 2 + OpenCL/m16400_a3-pure.cl | 2 + OpenCL/m16511_a0-pure.cl | 2 + OpenCL/m16511_a1-pure.cl | 2 + OpenCL/m16511_a3-pure.cl | 2 + OpenCL/m16512_a0-pure.cl | 2 + OpenCL/m16512_a1-pure.cl | 2 + OpenCL/m16512_a3-pure.cl | 2 + OpenCL/m16513_a0-pure.cl | 2 + OpenCL/m16513_a1-pure.cl | 2 + OpenCL/m16513_a3-pure.cl | 2 + OpenCL/m16600_a0-optimized.cl | 2 + OpenCL/m16600_a0-pure.cl | 2 + OpenCL/m16600_a1-optimized.cl | 2 + OpenCL/m16600_a1-pure.cl | 2 + OpenCL/m16600_a3-optimized.cl | 2 + OpenCL/m16600_a3-pure.cl | 2 + OpenCL/m16800-pure.cl | 4 + OpenCL/m16801-pure.cl | 4 + OpenCL/m16900-pure.cl | 4 + OpenCL/m17300_a0-optimized.cl | 2 + OpenCL/m17300_a1-optimized.cl | 2 + OpenCL/m17300_a3-optimized.cl | 2 + OpenCL/m17400_a0-optimized.cl | 2 + OpenCL/m17400_a1-optimized.cl | 2 + OpenCL/m17400_a3-optimized.cl | 2 + OpenCL/m17500_a0-optimized.cl | 2 + OpenCL/m17500_a1-optimized.cl | 2 + OpenCL/m17500_a3-optimized.cl | 2 + OpenCL/m17600_a0-optimized.cl | 2 + OpenCL/m17600_a1-optimized.cl | 2 + OpenCL/m17600_a3-optimized.cl | 2 + OpenCL/m17700_a0-optimized.cl | 2 + OpenCL/m17700_a1-optimized.cl | 2 + OpenCL/m17700_a3-optimized.cl | 2 + OpenCL/m17800_a0-optimized.cl | 2 + OpenCL/m17800_a1-optimized.cl | 2 + OpenCL/m17800_a3-optimized.cl | 2 + OpenCL/m17900_a0-optimized.cl | 2 + OpenCL/m17900_a1-optimized.cl | 2 + OpenCL/m17900_a3-optimized.cl | 2 + OpenCL/m18000_a0-optimized.cl | 2 + OpenCL/m18000_a1-optimized.cl | 2 + OpenCL/m18000_a3-optimized.cl | 2 + OpenCL/m18100_a0-pure.cl | 2 + OpenCL/m18100_a1-pure.cl | 2 + OpenCL/m18100_a3-pure.cl | 2 + OpenCL/m18200_a0-optimized.cl | 2 + OpenCL/m18200_a0-pure.cl | 2 + OpenCL/m18200_a1-optimized.cl | 2 + OpenCL/m18200_a1-pure.cl | 2 + OpenCL/m18200_a3-optimized.cl | 2 + OpenCL/m18200_a3-pure.cl | 2 + OpenCL/m18300-pure.cl | 2 + OpenCL/m18400-pure.cl | 4 + OpenCL/m18500_a0-pure.cl | 2 + OpenCL/m18500_a1-pure.cl | 2 + OpenCL/m18500_a3-pure.cl | 2 + OpenCL/m18600-pure.cl | 4 + OpenCL/m18700_a0-optimized.cl | 2 + OpenCL/m18700_a0-pure.cl | 2 + OpenCL/m18700_a1-optimized.cl | 2 + OpenCL/m18700_a1-pure.cl | 2 + OpenCL/m18700_a3-optimized.cl | 2 + OpenCL/m18700_a3-pure.cl | 2 + OpenCL/m18800-pure.cl | 4 + OpenCL/m18900-pure.cl | 2 + OpenCL/m19000-pure.cl | 4 + OpenCL/m19100-pure.cl | 4 + OpenCL/m19200-pure.cl | 6 + OpenCL/m19300_a0-pure.cl | 2 + OpenCL/m19300_a1-pure.cl | 2 + OpenCL/m19300_a3-pure.cl | 2 + OpenCL/m19500_a0-pure.cl | 2 + OpenCL/m19500_a1-pure.cl | 2 + OpenCL/m19500_a3-pure.cl | 2 + OpenCL/m19600-pure.cl | 2010 +++++++++++++++---------------- OpenCL/m19700-pure.cl | 2138 +++++++++++++++++---------------- OpenCL/markov_be.cl | 2 + OpenCL/markov_le.cl | 2 + src/opencl.c | 4 +- 766 files changed, 3830 insertions(+), 2074 deletions(-) diff --git a/OpenCL/amp_a0.cl b/OpenCL/amp_a0.cl index 66afddbf9..187bf8c3c 100644 --- a/OpenCL/amp_a0.cl +++ b/OpenCL/amp_a0.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_rp.h" #include "inc_rp.cl" +#endif __kernel void amp (__global pw_t * restrict pws, __global pw_t * restrict pws_amp, __constant const kernel_rule_t * restrict rules_buf, __global const pw_t * restrict combs_buf, __global const bf_t * restrict bfs_buf, const u32 combs_mode, const u64 gid_max) { diff --git a/OpenCL/amp_a1.cl b/OpenCL/amp_a1.cl index 97cc81608..dadad2c1f 100644 --- a/OpenCL/amp_a1.cl +++ b/OpenCL/amp_a1.cl @@ -3,9 +3,11 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" +#endif __kernel void amp (__global pw_t * restrict pws, __global pw_t * restrict pws_amp, __global const kernel_rule_t * restrict rules_buf, __global const pw_t * restrict combs_buf, __global const bf_t * restrict bfs_buf, const u32 combs_mode, const u64 gid_max) { diff --git a/OpenCL/amp_a3.cl b/OpenCL/amp_a3.cl index 9cf14d894..891ed3123 100644 --- a/OpenCL/amp_a3.cl +++ b/OpenCL/amp_a3.cl @@ -3,8 +3,10 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" +#endif __kernel void amp (__global pw_t * restrict pws, __global pw_t * restrict pws_amp, __global const kernel_rule_t * restrict rules_buf, __global const pw_t * restrict combs_buf, __constant const bf_t * restrict bfs_buf, const u32 combs_mode, const u64 gid_max) { diff --git a/OpenCL/m00000_a0-optimized.cl b/OpenCL/m00000_a0-optimized.cl index cb7796ab3..0682538b6 100644 --- a/OpenCL/m00000_a0-optimized.cl +++ b/OpenCL/m00000_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00000_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00000_a0-pure.cl b/OpenCL/m00000_a0-pure.cl index 86a3dad8b..ad678287b 100644 --- a/OpenCL/m00000_a0-pure.cl +++ b/OpenCL/m00000_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00000_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00000_a1-optimized.cl b/OpenCL/m00000_a1-optimized.cl index 4e7b4d1fd..4f2200c7c 100644 --- a/OpenCL/m00000_a1-optimized.cl +++ b/OpenCL/m00000_a1-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00000_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00000_a1-pure.cl b/OpenCL/m00000_a1-pure.cl index 22abd053b..47ca869c0 100644 --- a/OpenCL/m00000_a1-pure.cl +++ b/OpenCL/m00000_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00000_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00000_a3-optimized.cl b/OpenCL/m00000_a3-optimized.cl index 19f2cae9c..642949038 100644 --- a/OpenCL/m00000_a3-optimized.cl +++ b/OpenCL/m00000_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define MD5_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m00000_a3-pure.cl b/OpenCL/m00000_a3-pure.cl index 878462330..0ccae7df5 100644 --- a/OpenCL/m00000_a3-pure.cl +++ b/OpenCL/m00000_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00000_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00010_a0-optimized.cl b/OpenCL/m00010_a0-optimized.cl index b5c7b41f3..b02b3fcd3 100644 --- a/OpenCL/m00010_a0-optimized.cl +++ b/OpenCL/m00010_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00010_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00010_a0-pure.cl b/OpenCL/m00010_a0-pure.cl index c1d2941d4..2f5338bce 100644 --- a/OpenCL/m00010_a0-pure.cl +++ b/OpenCL/m00010_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00010_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00010_a1-optimized.cl b/OpenCL/m00010_a1-optimized.cl index 79f374e58..f4b7ee78d 100644 --- a/OpenCL/m00010_a1-optimized.cl +++ b/OpenCL/m00010_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00010_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00010_a1-pure.cl b/OpenCL/m00010_a1-pure.cl index 4a95a85b4..22ef57cf9 100644 --- a/OpenCL/m00010_a1-pure.cl +++ b/OpenCL/m00010_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00010_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00010_a3-optimized.cl b/OpenCL/m00010_a3-optimized.cl index e536aafb4..aa819aec4 100644 --- a/OpenCL/m00010_a3-optimized.cl +++ b/OpenCL/m00010_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define MD5_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m00010_a3-pure.cl b/OpenCL/m00010_a3-pure.cl index 19e96b4e7..73139e19f 100644 --- a/OpenCL/m00010_a3-pure.cl +++ b/OpenCL/m00010_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00010_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00020_a0-optimized.cl b/OpenCL/m00020_a0-optimized.cl index d54ed1bd3..c9bcbe669 100644 --- a/OpenCL/m00020_a0-optimized.cl +++ b/OpenCL/m00020_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00020_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00020_a0-pure.cl b/OpenCL/m00020_a0-pure.cl index 5584901ab..0b5b4d8bf 100644 --- a/OpenCL/m00020_a0-pure.cl +++ b/OpenCL/m00020_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00020_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00020_a1-optimized.cl b/OpenCL/m00020_a1-optimized.cl index b4d18c165..4c95f02bb 100644 --- a/OpenCL/m00020_a1-optimized.cl +++ b/OpenCL/m00020_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00020_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00020_a1-pure.cl b/OpenCL/m00020_a1-pure.cl index b61c88ea3..e35f2d4b9 100644 --- a/OpenCL/m00020_a1-pure.cl +++ b/OpenCL/m00020_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00020_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00020_a3-optimized.cl b/OpenCL/m00020_a3-optimized.cl index b72b802f8..126b73bf3 100644 --- a/OpenCL/m00020_a3-optimized.cl +++ b/OpenCL/m00020_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void m00020m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00020_a3-pure.cl b/OpenCL/m00020_a3-pure.cl index 37ee4f119..cd51f6c87 100644 --- a/OpenCL/m00020_a3-pure.cl +++ b/OpenCL/m00020_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00020_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00030_a0-optimized.cl b/OpenCL/m00030_a0-optimized.cl index f6bd269b0..9c1b9aa76 100644 --- a/OpenCL/m00030_a0-optimized.cl +++ b/OpenCL/m00030_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00030_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00030_a0-pure.cl b/OpenCL/m00030_a0-pure.cl index 61d4ad536..ad8926b37 100644 --- a/OpenCL/m00030_a0-pure.cl +++ b/OpenCL/m00030_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00030_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00030_a1-optimized.cl b/OpenCL/m00030_a1-optimized.cl index 2320b6e1c..1b488d38d 100644 --- a/OpenCL/m00030_a1-optimized.cl +++ b/OpenCL/m00030_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00030_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00030_a1-pure.cl b/OpenCL/m00030_a1-pure.cl index 275feffde..33f97db3f 100644 --- a/OpenCL/m00030_a1-pure.cl +++ b/OpenCL/m00030_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00030_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00030_a3-optimized.cl b/OpenCL/m00030_a3-optimized.cl index 3c034f655..7439dd2ea 100644 --- a/OpenCL/m00030_a3-optimized.cl +++ b/OpenCL/m00030_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define MD5_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m00030_a3-pure.cl b/OpenCL/m00030_a3-pure.cl index 2ce0a5c26..2387dfdc6 100644 --- a/OpenCL/m00030_a3-pure.cl +++ b/OpenCL/m00030_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00030_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00040_a0-optimized.cl b/OpenCL/m00040_a0-optimized.cl index ff446998b..4c298cc8e 100644 --- a/OpenCL/m00040_a0-optimized.cl +++ b/OpenCL/m00040_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00040_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00040_a0-pure.cl b/OpenCL/m00040_a0-pure.cl index 7dc04545f..e629937c9 100644 --- a/OpenCL/m00040_a0-pure.cl +++ b/OpenCL/m00040_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00040_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00040_a1-optimized.cl b/OpenCL/m00040_a1-optimized.cl index d62dab286..1e79c37ed 100644 --- a/OpenCL/m00040_a1-optimized.cl +++ b/OpenCL/m00040_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00040_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00040_a1-pure.cl b/OpenCL/m00040_a1-pure.cl index ff5096c38..ffb6c7d69 100644 --- a/OpenCL/m00040_a1-pure.cl +++ b/OpenCL/m00040_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00040_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00040_a3-optimized.cl b/OpenCL/m00040_a3-optimized.cl index 70fee879f..6e817b1ab 100644 --- a/OpenCL/m00040_a3-optimized.cl +++ b/OpenCL/m00040_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void m00040m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00040_a3-pure.cl b/OpenCL/m00040_a3-pure.cl index d24baa8c5..29f6338c2 100644 --- a/OpenCL/m00040_a3-pure.cl +++ b/OpenCL/m00040_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00040_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00050_a0-optimized.cl b/OpenCL/m00050_a0-optimized.cl index d15f145b7..76896167b 100644 --- a/OpenCL/m00050_a0-optimized.cl +++ b/OpenCL/m00050_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void hmac_md5_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00050_a0-pure.cl b/OpenCL/m00050_a0-pure.cl index e5bdd809e..dca86167a 100644 --- a/OpenCL/m00050_a0-pure.cl +++ b/OpenCL/m00050_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00050_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00050_a1-optimized.cl b/OpenCL/m00050_a1-optimized.cl index 378e0b741..e142a361d 100644 --- a/OpenCL/m00050_a1-optimized.cl +++ b/OpenCL/m00050_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void hmac_md5_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00050_a1-pure.cl b/OpenCL/m00050_a1-pure.cl index 32a3f4409..bd99496d7 100644 --- a/OpenCL/m00050_a1-pure.cl +++ b/OpenCL/m00050_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00050_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00050_a3-optimized.cl b/OpenCL/m00050_a3-optimized.cl index ef0d0002e..659e14ad3 100644 --- a/OpenCL/m00050_a3-optimized.cl +++ b/OpenCL/m00050_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void hmac_md5_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00050_a3-pure.cl b/OpenCL/m00050_a3-pure.cl index cddbea47d..f9189ac50 100644 --- a/OpenCL/m00050_a3-pure.cl +++ b/OpenCL/m00050_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00050_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00060_a0-optimized.cl b/OpenCL/m00060_a0-optimized.cl index 47c4df0d5..79d44e8f4 100644 --- a/OpenCL/m00060_a0-optimized.cl +++ b/OpenCL/m00060_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void hmac_md5_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00060_a0-pure.cl b/OpenCL/m00060_a0-pure.cl index c60e9facf..5db08dad5 100644 --- a/OpenCL/m00060_a0-pure.cl +++ b/OpenCL/m00060_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00060_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00060_a1-optimized.cl b/OpenCL/m00060_a1-optimized.cl index 38ab6861a..3ac733254 100644 --- a/OpenCL/m00060_a1-optimized.cl +++ b/OpenCL/m00060_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void hmac_md5_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00060_a1-pure.cl b/OpenCL/m00060_a1-pure.cl index 774eec291..45cd5568b 100644 --- a/OpenCL/m00060_a1-pure.cl +++ b/OpenCL/m00060_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00060_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00060_a3-optimized.cl b/OpenCL/m00060_a3-optimized.cl index 4dfeb52f2..766eb7650 100644 --- a/OpenCL/m00060_a3-optimized.cl +++ b/OpenCL/m00060_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void hmac_md5_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00060_a3-pure.cl b/OpenCL/m00060_a3-pure.cl index d2281ebd0..51bd3c93d 100644 --- a/OpenCL/m00060_a3-pure.cl +++ b/OpenCL/m00060_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m00060_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00100_a0-optimized.cl b/OpenCL/m00100_a0-optimized.cl index 1dce62513..a11ba0633 100644 --- a/OpenCL/m00100_a0-optimized.cl +++ b/OpenCL/m00100_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00100_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00100_a0-pure.cl b/OpenCL/m00100_a0-pure.cl index f17b661d6..6120d9631 100644 --- a/OpenCL/m00100_a0-pure.cl +++ b/OpenCL/m00100_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00100_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00100_a1-optimized.cl b/OpenCL/m00100_a1-optimized.cl index 492ed93d7..75c52ca7e 100644 --- a/OpenCL/m00100_a1-optimized.cl +++ b/OpenCL/m00100_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00100_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00100_a1-pure.cl b/OpenCL/m00100_a1-pure.cl index d715f2b1a..beaf57fd9 100644 --- a/OpenCL/m00100_a1-pure.cl +++ b/OpenCL/m00100_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00100_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00100_a3-optimized.cl b/OpenCL/m00100_a3-optimized.cl index aae1cc7ba..ac599e687 100644 --- a/OpenCL/m00100_a3-optimized.cl +++ b/OpenCL/m00100_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m00100m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00100_a3-pure.cl b/OpenCL/m00100_a3-pure.cl index 9ae9affe3..2532f8c1c 100644 --- a/OpenCL/m00100_a3-pure.cl +++ b/OpenCL/m00100_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00100_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00110_a0-optimized.cl b/OpenCL/m00110_a0-optimized.cl index 0de75d3c5..8d8eb3a68 100644 --- a/OpenCL/m00110_a0-optimized.cl +++ b/OpenCL/m00110_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00110_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00110_a0-pure.cl b/OpenCL/m00110_a0-pure.cl index d3e2730dc..34ab7d3dc 100644 --- a/OpenCL/m00110_a0-pure.cl +++ b/OpenCL/m00110_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00110_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00110_a1-optimized.cl b/OpenCL/m00110_a1-optimized.cl index cf9accbb4..73030a3e8 100644 --- a/OpenCL/m00110_a1-optimized.cl +++ b/OpenCL/m00110_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00110_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00110_a1-pure.cl b/OpenCL/m00110_a1-pure.cl index 26173a281..d12baebbc 100644 --- a/OpenCL/m00110_a1-pure.cl +++ b/OpenCL/m00110_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00110_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00110_a3-optimized.cl b/OpenCL/m00110_a3-optimized.cl index 1967ea9f5..1b76bc7a4 100644 --- a/OpenCL/m00110_a3-optimized.cl +++ b/OpenCL/m00110_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m00110m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00110_a3-pure.cl b/OpenCL/m00110_a3-pure.cl index adc982011..dbe6e6ab1 100644 --- a/OpenCL/m00110_a3-pure.cl +++ b/OpenCL/m00110_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00110_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00120_a0-optimized.cl b/OpenCL/m00120_a0-optimized.cl index dc0ef8f2e..25dd47ae9 100644 --- a/OpenCL/m00120_a0-optimized.cl +++ b/OpenCL/m00120_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00120_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00120_a0-pure.cl b/OpenCL/m00120_a0-pure.cl index e271fdfc7..c56460911 100644 --- a/OpenCL/m00120_a0-pure.cl +++ b/OpenCL/m00120_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00120_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00120_a1-optimized.cl b/OpenCL/m00120_a1-optimized.cl index 183b87dca..a8bf4008a 100644 --- a/OpenCL/m00120_a1-optimized.cl +++ b/OpenCL/m00120_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00120_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00120_a1-pure.cl b/OpenCL/m00120_a1-pure.cl index 79fc5a96d..4683d66e2 100644 --- a/OpenCL/m00120_a1-pure.cl +++ b/OpenCL/m00120_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00120_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00120_a3-optimized.cl b/OpenCL/m00120_a3-optimized.cl index 33e044b3c..3aa410c73 100644 --- a/OpenCL/m00120_a3-optimized.cl +++ b/OpenCL/m00120_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m00120m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00120_a3-pure.cl b/OpenCL/m00120_a3-pure.cl index ca53c17e5..605317bc4 100644 --- a/OpenCL/m00120_a3-pure.cl +++ b/OpenCL/m00120_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00120_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00130_a0-optimized.cl b/OpenCL/m00130_a0-optimized.cl index 277bef9c9..2de86f9bd 100644 --- a/OpenCL/m00130_a0-optimized.cl +++ b/OpenCL/m00130_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00130_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00130_a0-pure.cl b/OpenCL/m00130_a0-pure.cl index 4de1ad8ca..f4412381a 100644 --- a/OpenCL/m00130_a0-pure.cl +++ b/OpenCL/m00130_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00130_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00130_a1-optimized.cl b/OpenCL/m00130_a1-optimized.cl index 963e610dc..382f89fbf 100644 --- a/OpenCL/m00130_a1-optimized.cl +++ b/OpenCL/m00130_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00130_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00130_a1-pure.cl b/OpenCL/m00130_a1-pure.cl index 69b9bdd91..0fe3a9b2e 100644 --- a/OpenCL/m00130_a1-pure.cl +++ b/OpenCL/m00130_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00130_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00130_a3-optimized.cl b/OpenCL/m00130_a3-optimized.cl index 0bc5d6363..9c4ea31e0 100644 --- a/OpenCL/m00130_a3-optimized.cl +++ b/OpenCL/m00130_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m00130m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00130_a3-pure.cl b/OpenCL/m00130_a3-pure.cl index c6548df4d..0f45a56d4 100644 --- a/OpenCL/m00130_a3-pure.cl +++ b/OpenCL/m00130_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00130_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00140_a0-optimized.cl b/OpenCL/m00140_a0-optimized.cl index 7d98027b3..7773c5470 100644 --- a/OpenCL/m00140_a0-optimized.cl +++ b/OpenCL/m00140_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00140_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00140_a0-pure.cl b/OpenCL/m00140_a0-pure.cl index 6e5e3c606..4bc160261 100644 --- a/OpenCL/m00140_a0-pure.cl +++ b/OpenCL/m00140_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00140_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00140_a1-optimized.cl b/OpenCL/m00140_a1-optimized.cl index 8d05333a8..562c3997e 100644 --- a/OpenCL/m00140_a1-optimized.cl +++ b/OpenCL/m00140_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00140_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00140_a1-pure.cl b/OpenCL/m00140_a1-pure.cl index cee5b7989..7e8b7d366 100644 --- a/OpenCL/m00140_a1-pure.cl +++ b/OpenCL/m00140_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00140_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00140_a3-optimized.cl b/OpenCL/m00140_a3-optimized.cl index a677449a4..ea15507cf 100644 --- a/OpenCL/m00140_a3-optimized.cl +++ b/OpenCL/m00140_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m00140m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00140_a3-pure.cl b/OpenCL/m00140_a3-pure.cl index 5859cd847..b1a996bd5 100644 --- a/OpenCL/m00140_a3-pure.cl +++ b/OpenCL/m00140_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00140_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00150_a0-optimized.cl b/OpenCL/m00150_a0-optimized.cl index 1bdcfdf32..f620410bb 100644 --- a/OpenCL/m00150_a0-optimized.cl +++ b/OpenCL/m00150_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void hmac_sha1_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00150_a0-pure.cl b/OpenCL/m00150_a0-pure.cl index 1e2d37f3c..ca32106bd 100644 --- a/OpenCL/m00150_a0-pure.cl +++ b/OpenCL/m00150_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00150_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00150_a1-optimized.cl b/OpenCL/m00150_a1-optimized.cl index 1e9f5a95f..d72ef4fa5 100644 --- a/OpenCL/m00150_a1-optimized.cl +++ b/OpenCL/m00150_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void hmac_sha1_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00150_a1-pure.cl b/OpenCL/m00150_a1-pure.cl index 1b4d40f83..1f3ef85ef 100644 --- a/OpenCL/m00150_a1-pure.cl +++ b/OpenCL/m00150_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00150_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00150_a3-optimized.cl b/OpenCL/m00150_a3-optimized.cl index 9e2a0cb92..3e78b85af 100644 --- a/OpenCL/m00150_a3-optimized.cl +++ b/OpenCL/m00150_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void hmac_sha1_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00150_a3-pure.cl b/OpenCL/m00150_a3-pure.cl index dc11cafb4..794c5437c 100644 --- a/OpenCL/m00150_a3-pure.cl +++ b/OpenCL/m00150_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00150_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00160_a0-optimized.cl b/OpenCL/m00160_a0-optimized.cl index 234d98e4c..55a0b4f61 100644 --- a/OpenCL/m00160_a0-optimized.cl +++ b/OpenCL/m00160_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void hmac_sha1_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00160_a0-pure.cl b/OpenCL/m00160_a0-pure.cl index a61b9b199..90850882b 100644 --- a/OpenCL/m00160_a0-pure.cl +++ b/OpenCL/m00160_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00160_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00160_a1-optimized.cl b/OpenCL/m00160_a1-optimized.cl index 315c254cc..0f9269927 100644 --- a/OpenCL/m00160_a1-optimized.cl +++ b/OpenCL/m00160_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void hmac_sha1_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00160_a1-pure.cl b/OpenCL/m00160_a1-pure.cl index 196b96f22..f247394e0 100644 --- a/OpenCL/m00160_a1-pure.cl +++ b/OpenCL/m00160_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00160_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00160_a3-optimized.cl b/OpenCL/m00160_a3-optimized.cl index 6c2bd1126..f14416b5a 100644 --- a/OpenCL/m00160_a3-optimized.cl +++ b/OpenCL/m00160_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void hmac_sha1_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m00160_a3-pure.cl b/OpenCL/m00160_a3-pure.cl index 8394e362a..8d5df8ffe 100644 --- a/OpenCL/m00160_a3-pure.cl +++ b/OpenCL/m00160_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00160_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00200_a0-optimized.cl b/OpenCL/m00200_a0-optimized.cl index 4ddfcc4c4..9ee6af687 100644 --- a/OpenCL/m00200_a0-optimized.cl +++ b/OpenCL/m00200_a0-optimized.cl @@ -6,12 +6,14 @@ //incompatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __kernel void m00200_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00200_a1-optimized.cl b/OpenCL/m00200_a1-optimized.cl index d1d4d2e3e..3fa631d04 100644 --- a/OpenCL/m00200_a1-optimized.cl +++ b/OpenCL/m00200_a1-optimized.cl @@ -6,10 +6,12 @@ //incompatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __kernel void m00200_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00200_a3-optimized.cl b/OpenCL/m00200_a3-optimized.cl index 19232a7c0..0830abf51 100644 --- a/OpenCL/m00200_a3-optimized.cl +++ b/OpenCL/m00200_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define ROUND(v) \ { \ diff --git a/OpenCL/m00300_a0-optimized.cl b/OpenCL/m00300_a0-optimized.cl index 1710c50bb..253cf8ae8 100644 --- a/OpenCL/m00300_a0-optimized.cl +++ b/OpenCL/m00300_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00300_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00300_a0-pure.cl b/OpenCL/m00300_a0-pure.cl index e92cfcfda..aac7eddfe 100644 --- a/OpenCL/m00300_a0-pure.cl +++ b/OpenCL/m00300_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00300_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00300_a1-optimized.cl b/OpenCL/m00300_a1-optimized.cl index 497cc9078..7b47830f6 100644 --- a/OpenCL/m00300_a1-optimized.cl +++ b/OpenCL/m00300_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00300_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00300_a1-pure.cl b/OpenCL/m00300_a1-pure.cl index 8606afed0..f71a43c1d 100644 --- a/OpenCL/m00300_a1-pure.cl +++ b/OpenCL/m00300_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00300_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00300_a3-optimized.cl b/OpenCL/m00300_a3-optimized.cl index 85edbce23..7a61e23f2 100644 --- a/OpenCL/m00300_a3-optimized.cl +++ b/OpenCL/m00300_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m00300m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00300_a3-pure.cl b/OpenCL/m00300_a3-pure.cl index 7ffbad9aa..7290673f9 100644 --- a/OpenCL/m00300_a3-pure.cl +++ b/OpenCL/m00300_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m00300_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m00400-optimized.cl b/OpenCL/m00400-optimized.cl index 40cd12c3b..85d41e865 100644 --- a/OpenCL/m00400-optimized.cl +++ b/OpenCL/m00400-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -230,5 +232,7 @@ __kernel void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } \ No newline at end of file diff --git a/OpenCL/m00400-pure.cl b/OpenCL/m00400-pure.cl index c74b63680..306857133 100644 --- a/OpenCL/m00400-pure.cl +++ b/OpenCL/m00400-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -180,5 +182,7 @@ __kernel void m00400_comp (KERN_ATTR_TMPS (phpass_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m00500-optimized.cl b/OpenCL/m00500-optimized.cl index b04563d2e..7b9994262 100644 --- a/OpenCL/m00500-optimized.cl +++ b/OpenCL/m00500-optimized.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -1012,5 +1014,7 @@ __kernel void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m00500-pure.cl b/OpenCL/m00500-pure.cl index 52883f275..7c69d9333 100644 --- a/OpenCL/m00500-pure.cl +++ b/OpenCL/m00500-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -245,5 +247,7 @@ __kernel void m00500_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m00600_a0-optimized.cl b/OpenCL/m00600_a0-optimized.cl index 919047f98..3819cd522 100644 --- a/OpenCL/m00600_a0-optimized.cl +++ b/OpenCL/m00600_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif typedef struct blake2 { diff --git a/OpenCL/m00600_a1-optimized.cl b/OpenCL/m00600_a1-optimized.cl index 9e7d3a26a..5b6c8ed55 100644 --- a/OpenCL/m00600_a1-optimized.cl +++ b/OpenCL/m00600_a1-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif typedef struct blake2 { diff --git a/OpenCL/m00600_a3-optimized.cl b/OpenCL/m00600_a3-optimized.cl index ebd3f822a..cd089505d 100644 --- a/OpenCL/m00600_a3-optimized.cl +++ b/OpenCL/m00600_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif typedef struct blake2 { diff --git a/OpenCL/m00900_a0-optimized.cl b/OpenCL/m00900_a0-optimized.cl index 54f0c8362..218097d89 100644 --- a/OpenCL/m00900_a0-optimized.cl +++ b/OpenCL/m00900_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif __kernel void m00900_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00900_a0-pure.cl b/OpenCL/m00900_a0-pure.cl index bb05f92ec..3f5164e9e 100644 --- a/OpenCL/m00900_a0-pure.cl +++ b/OpenCL/m00900_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" +#endif __kernel void m00900_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m00900_a1-optimized.cl b/OpenCL/m00900_a1-optimized.cl index 8b502e3d3..8064703e7 100644 --- a/OpenCL/m00900_a1-optimized.cl +++ b/OpenCL/m00900_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif __kernel void m00900_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00900_a1-pure.cl b/OpenCL/m00900_a1-pure.cl index d32013cef..2e19383a0 100644 --- a/OpenCL/m00900_a1-pure.cl +++ b/OpenCL/m00900_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" +#endif __kernel void m00900_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m00900_a3-optimized.cl b/OpenCL/m00900_a3-optimized.cl index f258ed645..c41d0d735 100644 --- a/OpenCL/m00900_a3-optimized.cl +++ b/OpenCL/m00900_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif #define MD4_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m00900_a3-pure.cl b/OpenCL/m00900_a3-pure.cl index 6d1a346a5..a154851e8 100644 --- a/OpenCL/m00900_a3-pure.cl +++ b/OpenCL/m00900_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif __kernel void m00900_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01000_a0-optimized.cl b/OpenCL/m01000_a0-optimized.cl index 7ccb8c29d..7cc9ca6fa 100644 --- a/OpenCL/m01000_a0-optimized.cl +++ b/OpenCL/m01000_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif __kernel void m01000_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01000_a0-pure.cl b/OpenCL/m01000_a0-pure.cl index 203a18f21..65e245de7 100644 --- a/OpenCL/m01000_a0-pure.cl +++ b/OpenCL/m01000_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" +#endif __kernel void m01000_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01000_a1-optimized.cl b/OpenCL/m01000_a1-optimized.cl index 2a807f4e8..7f981e215 100644 --- a/OpenCL/m01000_a1-optimized.cl +++ b/OpenCL/m01000_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif __kernel void m01000_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01000_a1-pure.cl b/OpenCL/m01000_a1-pure.cl index f07f58822..3e979b722 100644 --- a/OpenCL/m01000_a1-pure.cl +++ b/OpenCL/m01000_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" +#endif __kernel void m01000_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01000_a3-optimized.cl b/OpenCL/m01000_a3-optimized.cl index 80b2a9421..c6093a070 100644 --- a/OpenCL/m01000_a3-optimized.cl +++ b/OpenCL/m01000_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif #define MD4_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m01000_a3-pure.cl b/OpenCL/m01000_a3-pure.cl index a3e51b44e..50db936c4 100644 --- a/OpenCL/m01000_a3-pure.cl +++ b/OpenCL/m01000_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif __kernel void m01000_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01100_a0-optimized.cl b/OpenCL/m01100_a0-optimized.cl index ce540612a..2e3a007c8 100644 --- a/OpenCL/m01100_a0-optimized.cl +++ b/OpenCL/m01100_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __kernel void m01100_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01100_a0-pure.cl b/OpenCL/m01100_a0-pure.cl index 164bea1a7..1e58bd1e6 100644 --- a/OpenCL/m01100_a0-pure.cl +++ b/OpenCL/m01100_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" +#endif __kernel void m01100_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01100_a1-optimized.cl b/OpenCL/m01100_a1-optimized.cl index f5cf5cdca..a12dca944 100644 --- a/OpenCL/m01100_a1-optimized.cl +++ b/OpenCL/m01100_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif __kernel void m01100_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01100_a1-pure.cl b/OpenCL/m01100_a1-pure.cl index 9d37b477f..1850917dd 100644 --- a/OpenCL/m01100_a1-pure.cl +++ b/OpenCL/m01100_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" +#endif __kernel void m01100_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01100_a3-optimized.cl b/OpenCL/m01100_a3-optimized.cl index b1805bfbb..5151d0454 100644 --- a/OpenCL/m01100_a3-optimized.cl +++ b/OpenCL/m01100_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif DECLSPEC void m01100m (__local salt_t *s_salt_buf, u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01100_a3-pure.cl b/OpenCL/m01100_a3-pure.cl index 43bba9cc7..1b775199c 100644 --- a/OpenCL/m01100_a3-pure.cl +++ b/OpenCL/m01100_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif __kernel void m01100_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01300_a0-optimized.cl b/OpenCL/m01300_a0-optimized.cl index 5c77c8d9b..6ff1b31fc 100644 --- a/OpenCL/m01300_a0-optimized.cl +++ b/OpenCL/m01300_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha224.cl" +#endif #define SHA224_STEP_REV(a,b,c,d,e,f,g) \ { \ diff --git a/OpenCL/m01300_a0-pure.cl b/OpenCL/m01300_a0-pure.cl index e44dc8482..b7747d5ac 100644 --- a/OpenCL/m01300_a0-pure.cl +++ b/OpenCL/m01300_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha224.cl" +#endif __kernel void m01300_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01300_a1-optimized.cl b/OpenCL/m01300_a1-optimized.cl index 8ee9ab709..df8ea58ac 100644 --- a/OpenCL/m01300_a1-optimized.cl +++ b/OpenCL/m01300_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha224.cl" +#endif #define SHA224_STEP_REV(a,b,c,d,e,f,g) \ { \ diff --git a/OpenCL/m01300_a1-pure.cl b/OpenCL/m01300_a1-pure.cl index e9537e067..e9bb74321 100644 --- a/OpenCL/m01300_a1-pure.cl +++ b/OpenCL/m01300_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha224.cl" +#endif __kernel void m01300_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01300_a3-optimized.cl b/OpenCL/m01300_a3-optimized.cl index bc9e01053..60283a08a 100644 --- a/OpenCL/m01300_a3-optimized.cl +++ b/OpenCL/m01300_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha224.cl" +#endif #define SHA224_STEP_REV(a,b,c,d,e,f,g) \ { \ diff --git a/OpenCL/m01300_a3-pure.cl b/OpenCL/m01300_a3-pure.cl index 34d4e9fc3..43653f701 100644 --- a/OpenCL/m01300_a3-pure.cl +++ b/OpenCL/m01300_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha224.cl" +#endif __kernel void m01300_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01400_a0-optimized.cl b/OpenCL/m01400_a0-optimized.cl index c3863c9c9..6fa712478 100644 --- a/OpenCL/m01400_a0-optimized.cl +++ b/OpenCL/m01400_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01400_a0-pure.cl b/OpenCL/m01400_a0-pure.cl index 454f30cd0..b0cff3938 100644 --- a/OpenCL/m01400_a0-pure.cl +++ b/OpenCL/m01400_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01400_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01400_a1-optimized.cl b/OpenCL/m01400_a1-optimized.cl index 852224f17..2a194d66a 100644 --- a/OpenCL/m01400_a1-optimized.cl +++ b/OpenCL/m01400_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01400_a1-pure.cl b/OpenCL/m01400_a1-pure.cl index 7fcf25a13..ea461048b 100644 --- a/OpenCL/m01400_a1-pure.cl +++ b/OpenCL/m01400_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01400_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01400_a3-optimized.cl b/OpenCL/m01400_a3-optimized.cl index beface9d0..f0dac447b 100644 --- a/OpenCL/m01400_a3-optimized.cl +++ b/OpenCL/m01400_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01400_a3-pure.cl b/OpenCL/m01400_a3-pure.cl index 90172b944..c21fd0efa 100644 --- a/OpenCL/m01400_a3-pure.cl +++ b/OpenCL/m01400_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01400_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01410_a0-optimized.cl b/OpenCL/m01410_a0-optimized.cl index ee5ceae80..f23351a9e 100644 --- a/OpenCL/m01410_a0-optimized.cl +++ b/OpenCL/m01410_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01410_a0-pure.cl b/OpenCL/m01410_a0-pure.cl index 42b6c15be..eb8db7066 100644 --- a/OpenCL/m01410_a0-pure.cl +++ b/OpenCL/m01410_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01410_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01410_a1-optimized.cl b/OpenCL/m01410_a1-optimized.cl index b57aa805d..70fb73833 100644 --- a/OpenCL/m01410_a1-optimized.cl +++ b/OpenCL/m01410_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01410_a1-pure.cl b/OpenCL/m01410_a1-pure.cl index fb5b379b7..7d068f4ea 100644 --- a/OpenCL/m01410_a1-pure.cl +++ b/OpenCL/m01410_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01410_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01410_a3-optimized.cl b/OpenCL/m01410_a3-optimized.cl index ca9fc1d6f..694a86e87 100644 --- a/OpenCL/m01410_a3-optimized.cl +++ b/OpenCL/m01410_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01410_a3-pure.cl b/OpenCL/m01410_a3-pure.cl index 01c1cb825..49fc431b8 100644 --- a/OpenCL/m01410_a3-pure.cl +++ b/OpenCL/m01410_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01410_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01420_a0-optimized.cl b/OpenCL/m01420_a0-optimized.cl index 65432d186..4ae15b997 100644 --- a/OpenCL/m01420_a0-optimized.cl +++ b/OpenCL/m01420_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01420_a0-pure.cl b/OpenCL/m01420_a0-pure.cl index 3e5783ede..565af9242 100644 --- a/OpenCL/m01420_a0-pure.cl +++ b/OpenCL/m01420_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01420_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01420_a1-optimized.cl b/OpenCL/m01420_a1-optimized.cl index 730410d07..90d7251d4 100644 --- a/OpenCL/m01420_a1-optimized.cl +++ b/OpenCL/m01420_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01420_a1-pure.cl b/OpenCL/m01420_a1-pure.cl index 9abd345f2..bdee99ed6 100644 --- a/OpenCL/m01420_a1-pure.cl +++ b/OpenCL/m01420_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01420_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01420_a3-optimized.cl b/OpenCL/m01420_a3-optimized.cl index b7e3c98b6..c5be4488d 100644 --- a/OpenCL/m01420_a3-optimized.cl +++ b/OpenCL/m01420_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01420_a3-pure.cl b/OpenCL/m01420_a3-pure.cl index 617c82f42..4915fc961 100644 --- a/OpenCL/m01420_a3-pure.cl +++ b/OpenCL/m01420_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01420_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01430_a0-optimized.cl b/OpenCL/m01430_a0-optimized.cl index a1e3891ed..b5c667ee3 100644 --- a/OpenCL/m01430_a0-optimized.cl +++ b/OpenCL/m01430_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01430_a0-pure.cl b/OpenCL/m01430_a0-pure.cl index 435219671..b96aaa2b9 100644 --- a/OpenCL/m01430_a0-pure.cl +++ b/OpenCL/m01430_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01430_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01430_a1-optimized.cl b/OpenCL/m01430_a1-optimized.cl index 9e49e97cd..4f9194498 100644 --- a/OpenCL/m01430_a1-optimized.cl +++ b/OpenCL/m01430_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01430_a1-pure.cl b/OpenCL/m01430_a1-pure.cl index df0190f50..eb7c5d45f 100644 --- a/OpenCL/m01430_a1-pure.cl +++ b/OpenCL/m01430_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01430_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01430_a3-optimized.cl b/OpenCL/m01430_a3-optimized.cl index edaf6e6a8..674079e24 100644 --- a/OpenCL/m01430_a3-optimized.cl +++ b/OpenCL/m01430_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01430_a3-pure.cl b/OpenCL/m01430_a3-pure.cl index e0984fa6a..8cdf7ed18 100644 --- a/OpenCL/m01430_a3-pure.cl +++ b/OpenCL/m01430_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01430_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01440_a0-optimized.cl b/OpenCL/m01440_a0-optimized.cl index 2d7ba9f0e..487fd731a 100644 --- a/OpenCL/m01440_a0-optimized.cl +++ b/OpenCL/m01440_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01440_a0-pure.cl b/OpenCL/m01440_a0-pure.cl index 4e1f3869b..68de284cc 100644 --- a/OpenCL/m01440_a0-pure.cl +++ b/OpenCL/m01440_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01440_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01440_a1-optimized.cl b/OpenCL/m01440_a1-optimized.cl index 9155c7c4e..a6a16fc98 100644 --- a/OpenCL/m01440_a1-optimized.cl +++ b/OpenCL/m01440_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01440_a1-pure.cl b/OpenCL/m01440_a1-pure.cl index 9a80f519d..0874df12a 100644 --- a/OpenCL/m01440_a1-pure.cl +++ b/OpenCL/m01440_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01440_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01440_a3-optimized.cl b/OpenCL/m01440_a3-optimized.cl index f32d36a02..2f62909a9 100644 --- a/OpenCL/m01440_a3-optimized.cl +++ b/OpenCL/m01440_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define SHA256_STEP_REV(a,b,c,d,e,f,g,h) \ { \ diff --git a/OpenCL/m01440_a3-pure.cl b/OpenCL/m01440_a3-pure.cl index 8d382f839..90d2f44e4 100644 --- a/OpenCL/m01440_a3-pure.cl +++ b/OpenCL/m01440_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01440_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01450_a0-optimized.cl b/OpenCL/m01450_a0-optimized.cl index f2f2d91e1..2d451f5f8 100644 --- a/OpenCL/m01450_a0-optimized.cl +++ b/OpenCL/m01450_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif DECLSPEC void hmac_sha256_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m01450_a0-pure.cl b/OpenCL/m01450_a0-pure.cl index f576e157a..44d3c97cf 100644 --- a/OpenCL/m01450_a0-pure.cl +++ b/OpenCL/m01450_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01450_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01450_a1-optimized.cl b/OpenCL/m01450_a1-optimized.cl index c8eddf083..46f04f0cb 100644 --- a/OpenCL/m01450_a1-optimized.cl +++ b/OpenCL/m01450_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif DECLSPEC void hmac_sha256_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m01450_a1-pure.cl b/OpenCL/m01450_a1-pure.cl index 67634306d..ffd4ccee2 100644 --- a/OpenCL/m01450_a1-pure.cl +++ b/OpenCL/m01450_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01450_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01450_a3-optimized.cl b/OpenCL/m01450_a3-optimized.cl index 6eccfdb2c..a9f342e21 100644 --- a/OpenCL/m01450_a3-optimized.cl +++ b/OpenCL/m01450_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif DECLSPEC void hmac_sha256_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m01450_a3-pure.cl b/OpenCL/m01450_a3-pure.cl index fa5629482..f690c82c2 100644 --- a/OpenCL/m01450_a3-pure.cl +++ b/OpenCL/m01450_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01450_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01460_a0-optimized.cl b/OpenCL/m01460_a0-optimized.cl index 91d9fe522..a08cdb322 100644 --- a/OpenCL/m01460_a0-optimized.cl +++ b/OpenCL/m01460_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif DECLSPEC void hmac_sha256_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m01460_a0-pure.cl b/OpenCL/m01460_a0-pure.cl index fd1cff39c..ba505ad52 100644 --- a/OpenCL/m01460_a0-pure.cl +++ b/OpenCL/m01460_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01460_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01460_a1-optimized.cl b/OpenCL/m01460_a1-optimized.cl index 7ff4562fc..264b2f861 100644 --- a/OpenCL/m01460_a1-optimized.cl +++ b/OpenCL/m01460_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif DECLSPEC void hmac_sha256_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m01460_a1-pure.cl b/OpenCL/m01460_a1-pure.cl index c6f1e911e..24b3ba1ca 100644 --- a/OpenCL/m01460_a1-pure.cl +++ b/OpenCL/m01460_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01460_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01460_a3-optimized.cl b/OpenCL/m01460_a3-optimized.cl index feec36da9..2efd78f96 100644 --- a/OpenCL/m01460_a3-optimized.cl +++ b/OpenCL/m01460_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif DECLSPEC void hmac_sha256_pad (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad) { diff --git a/OpenCL/m01460_a3-pure.cl b/OpenCL/m01460_a3-pure.cl index a6d1979de..dd1ccd36e 100644 --- a/OpenCL/m01460_a3-pure.cl +++ b/OpenCL/m01460_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif __kernel void m01460_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01500_a0-pure.cl b/OpenCL/m01500_a0-pure.cl index c9f014bc1..59a4742c1 100644 --- a/OpenCL/m01500_a0-pure.cl +++ b/OpenCL/m01500_a0-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp.h" #include "inc_rp.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m01500_a1-pure.cl b/OpenCL/m01500_a1-pure.cl index 99874c618..14ae2224c 100644 --- a/OpenCL/m01500_a1-pure.cl +++ b/OpenCL/m01500_a1-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m01500_a3-pure.cl b/OpenCL/m01500_a3-pure.cl index 45ed3f0c6..8cd39ded7 100644 --- a/OpenCL/m01500_a3-pure.cl +++ b/OpenCL/m01500_a3-pure.cl @@ -5,9 +5,11 @@ * : sboxes for others were takes fron JtR, license below */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" +#endif #define COMPARE_S "inc_comp_single_bs.cl" #define COMPARE_M "inc_comp_multi_bs.cl" @@ -2246,7 +2248,9 @@ __kernel void m01500_mxx (KERN_ATTR_BITSLICE ()) const u32 r2 = 0; const u32 r3 = 0; + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } } else @@ -2274,7 +2278,9 @@ __kernel void m01500_mxx (KERN_ATTR_BITSLICE ()) const u32 r0 = out0[31 - slice]; const u32 r1 = out1[31 - slice]; const u32 r2 = 0; + #ifdef KERNEL_STATIC const u32 r3 = 0; + #endif #include COMPARE_M } @@ -2667,5 +2673,7 @@ __kernel void m01500_sxx (KERN_ATTR_BITSLICE ()) const u32 slice = ffz (tmpResult); + #ifdef KERNEL_STATIC #include COMPARE_S + #endif } diff --git a/OpenCL/m01600-optimized.cl b/OpenCL/m01600-optimized.cl index 8052cc1c5..a15c290ec 100644 --- a/OpenCL/m01600-optimized.cl +++ b/OpenCL/m01600-optimized.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -1027,5 +1029,7 @@ __kernel void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m01600-pure.cl b/OpenCL/m01600-pure.cl index 572064cb0..3e209a049 100644 --- a/OpenCL/m01600-pure.cl +++ b/OpenCL/m01600-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -352,5 +354,7 @@ __kernel void m01600_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m01700_a0-optimized.cl b/OpenCL/m01700_a0-optimized.cl index b726d0a27..812d22420 100644 --- a/OpenCL/m01700_a0-optimized.cl +++ b/OpenCL/m01700_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01700_a0-pure.cl b/OpenCL/m01700_a0-pure.cl index 76f8a1d39..a075a46da 100644 --- a/OpenCL/m01700_a0-pure.cl +++ b/OpenCL/m01700_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01700_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01700_a1-optimized.cl b/OpenCL/m01700_a1-optimized.cl index 100c3a3a6..1afaffa3a 100644 --- a/OpenCL/m01700_a1-optimized.cl +++ b/OpenCL/m01700_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01700_a1-pure.cl b/OpenCL/m01700_a1-pure.cl index d190ff6d7..55e0299dd 100644 --- a/OpenCL/m01700_a1-pure.cl +++ b/OpenCL/m01700_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01700_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01700_a3-optimized.cl b/OpenCL/m01700_a3-optimized.cl index 30cf95516..fd53e1d57 100644 --- a/OpenCL/m01700_a3-optimized.cl +++ b/OpenCL/m01700_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01700_a3-pure.cl b/OpenCL/m01700_a3-pure.cl index abde151d4..3caf2086d 100644 --- a/OpenCL/m01700_a3-pure.cl +++ b/OpenCL/m01700_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01700_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01710_a0-optimized.cl b/OpenCL/m01710_a0-optimized.cl index e6b99dfc8..ab91a8e99 100644 --- a/OpenCL/m01710_a0-optimized.cl +++ b/OpenCL/m01710_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01710_a0-pure.cl b/OpenCL/m01710_a0-pure.cl index 4abb22664..701c89dc2 100644 --- a/OpenCL/m01710_a0-pure.cl +++ b/OpenCL/m01710_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01710_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01710_a1-optimized.cl b/OpenCL/m01710_a1-optimized.cl index 833e44adb..380bd0c04 100644 --- a/OpenCL/m01710_a1-optimized.cl +++ b/OpenCL/m01710_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01710_a1-pure.cl b/OpenCL/m01710_a1-pure.cl index aac9d1b2c..2d1aa4faf 100644 --- a/OpenCL/m01710_a1-pure.cl +++ b/OpenCL/m01710_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01710_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01710_a3-optimized.cl b/OpenCL/m01710_a3-optimized.cl index 329c63cf9..abacade88 100644 --- a/OpenCL/m01710_a3-optimized.cl +++ b/OpenCL/m01710_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01710_a3-pure.cl b/OpenCL/m01710_a3-pure.cl index 951b42562..eb8f442b7 100644 --- a/OpenCL/m01710_a3-pure.cl +++ b/OpenCL/m01710_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01710_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01720_a0-optimized.cl b/OpenCL/m01720_a0-optimized.cl index a55dd2040..6a0290027 100644 --- a/OpenCL/m01720_a0-optimized.cl +++ b/OpenCL/m01720_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01720_a0-pure.cl b/OpenCL/m01720_a0-pure.cl index ee6228694..eaca91836 100644 --- a/OpenCL/m01720_a0-pure.cl +++ b/OpenCL/m01720_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01720_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01720_a1-optimized.cl b/OpenCL/m01720_a1-optimized.cl index 7587fb27d..2ebc95fb4 100644 --- a/OpenCL/m01720_a1-optimized.cl +++ b/OpenCL/m01720_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01720_a1-pure.cl b/OpenCL/m01720_a1-pure.cl index 0daf1fe83..979a825f1 100644 --- a/OpenCL/m01720_a1-pure.cl +++ b/OpenCL/m01720_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01720_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01720_a3-optimized.cl b/OpenCL/m01720_a3-optimized.cl index 3780ecd3e..a28b7b425 100644 --- a/OpenCL/m01720_a3-optimized.cl +++ b/OpenCL/m01720_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01720_a3-pure.cl b/OpenCL/m01720_a3-pure.cl index a97d9d844..e6eee406d 100644 --- a/OpenCL/m01720_a3-pure.cl +++ b/OpenCL/m01720_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01720_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01730_a0-optimized.cl b/OpenCL/m01730_a0-optimized.cl index 002c7cd44..36b32641f 100644 --- a/OpenCL/m01730_a0-optimized.cl +++ b/OpenCL/m01730_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01730_a0-pure.cl b/OpenCL/m01730_a0-pure.cl index 61f4fe011..5d0dff961 100644 --- a/OpenCL/m01730_a0-pure.cl +++ b/OpenCL/m01730_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01730_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01730_a1-optimized.cl b/OpenCL/m01730_a1-optimized.cl index 7e17505ad..ef214361e 100644 --- a/OpenCL/m01730_a1-optimized.cl +++ b/OpenCL/m01730_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01730_a1-pure.cl b/OpenCL/m01730_a1-pure.cl index 7b76d239d..a1b179bd3 100644 --- a/OpenCL/m01730_a1-pure.cl +++ b/OpenCL/m01730_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01730_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01730_a3-optimized.cl b/OpenCL/m01730_a3-optimized.cl index 9e0bea54c..4b761d33e 100644 --- a/OpenCL/m01730_a3-optimized.cl +++ b/OpenCL/m01730_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01730_a3-pure.cl b/OpenCL/m01730_a3-pure.cl index 0f9076e40..7a69a8ec8 100644 --- a/OpenCL/m01730_a3-pure.cl +++ b/OpenCL/m01730_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01730_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01740_a0-optimized.cl b/OpenCL/m01740_a0-optimized.cl index 0cc8b5252..4b1701d68 100644 --- a/OpenCL/m01740_a0-optimized.cl +++ b/OpenCL/m01740_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01740_a0-pure.cl b/OpenCL/m01740_a0-pure.cl index 0d31ad819..43d684902 100644 --- a/OpenCL/m01740_a0-pure.cl +++ b/OpenCL/m01740_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01740_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01740_a1-optimized.cl b/OpenCL/m01740_a1-optimized.cl index adcd24164..a8c6f82fa 100644 --- a/OpenCL/m01740_a1-optimized.cl +++ b/OpenCL/m01740_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01740_a1-pure.cl b/OpenCL/m01740_a1-pure.cl index 1a03e8f71..06bec90f4 100644 --- a/OpenCL/m01740_a1-pure.cl +++ b/OpenCL/m01740_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01740_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01740_a3-optimized.cl b/OpenCL/m01740_a3-optimized.cl index 4eac77bb6..6c4d10832 100644 --- a/OpenCL/m01740_a3-optimized.cl +++ b/OpenCL/m01740_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m01740_a3-pure.cl b/OpenCL/m01740_a3-pure.cl index 5f7504405..c489ac3b7 100644 --- a/OpenCL/m01740_a3-pure.cl +++ b/OpenCL/m01740_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01740_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01750_a0-optimized.cl b/OpenCL/m01750_a0-optimized.cl index 841e6f521..a210ddfb0 100644 --- a/OpenCL/m01750_a0-optimized.cl +++ b/OpenCL/m01750_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern_transport_vector (const u64x *w0, const u64x *w1, const u64x *w2, const u64x *w3, u64x *digest) { diff --git a/OpenCL/m01750_a0-pure.cl b/OpenCL/m01750_a0-pure.cl index 305100159..39a482d04 100644 --- a/OpenCL/m01750_a0-pure.cl +++ b/OpenCL/m01750_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01750_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01750_a1-optimized.cl b/OpenCL/m01750_a1-optimized.cl index 9e64f085f..4d28ed131 100644 --- a/OpenCL/m01750_a1-optimized.cl +++ b/OpenCL/m01750_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_transport_vector (const u64x *w0, const u64x *w1, const u64x *w2, const u64x *w3, u64x *digest) { diff --git a/OpenCL/m01750_a1-pure.cl b/OpenCL/m01750_a1-pure.cl index b18f18ec1..a0a525859 100644 --- a/OpenCL/m01750_a1-pure.cl +++ b/OpenCL/m01750_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01750_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01750_a3-optimized.cl b/OpenCL/m01750_a3-optimized.cl index 2c4e408f5..a9669084e 100644 --- a/OpenCL/m01750_a3-optimized.cl +++ b/OpenCL/m01750_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_transport_vector (const u64x *w0, const u64x *w1, const u64x *w2, const u64x *w3, u64x *digest) { diff --git a/OpenCL/m01750_a3-pure.cl b/OpenCL/m01750_a3-pure.cl index ec3e28552..9e53c0f42 100644 --- a/OpenCL/m01750_a3-pure.cl +++ b/OpenCL/m01750_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01750_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01760_a0-optimized.cl b/OpenCL/m01760_a0-optimized.cl index 0fe51b647..9117fc862 100644 --- a/OpenCL/m01760_a0-optimized.cl +++ b/OpenCL/m01760_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_transport_vector (const u64x *w0, const u64x *w1, const u64x *w2, const u64x *w3, u64x *digest) { diff --git a/OpenCL/m01760_a0-pure.cl b/OpenCL/m01760_a0-pure.cl index ca043e6c7..e706cdf9c 100644 --- a/OpenCL/m01760_a0-pure.cl +++ b/OpenCL/m01760_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01760_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m01760_a1-optimized.cl b/OpenCL/m01760_a1-optimized.cl index f9bf0c300..b0a9d7dff 100644 --- a/OpenCL/m01760_a1-optimized.cl +++ b/OpenCL/m01760_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_transport_vector (const u64x *w0, const u64x *w1, const u64x *w2, const u64x *w3, u64x *digest) { diff --git a/OpenCL/m01760_a1-pure.cl b/OpenCL/m01760_a1-pure.cl index 4778f6ab7..c36ae49fe 100644 --- a/OpenCL/m01760_a1-pure.cl +++ b/OpenCL/m01760_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01760_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m01760_a3-optimized.cl b/OpenCL/m01760_a3-optimized.cl index e173f65aa..e95250b0f 100644 --- a/OpenCL/m01760_a3-optimized.cl +++ b/OpenCL/m01760_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_transport_vector (const u64x *w0, const u64x *w1, const u64x *w2, const u64x *w3, u64x *digest) { diff --git a/OpenCL/m01760_a3-pure.cl b/OpenCL/m01760_a3-pure.cl index cfe82ccec..4171c6928 100644 --- a/OpenCL/m01760_a3-pure.cl +++ b/OpenCL/m01760_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m01760_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m01800-optimized.cl b/OpenCL/m01800-optimized.cl index 3d45e56c3..96317b480 100644 --- a/OpenCL/m01800-optimized.cl +++ b/OpenCL/m01800-optimized.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha512.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -496,5 +498,7 @@ __kernel void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m01800-pure.cl b/OpenCL/m01800-pure.cl index fb59486e9..1e6a837ec 100644 --- a/OpenCL/m01800-pure.cl +++ b/OpenCL/m01800-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha512.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -413,5 +415,7 @@ __kernel void m01800_comp (KERN_ATTR_TMPS (sha512crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m02000_a0-pure.cl b/OpenCL/m02000_a0-pure.cl index f6a6f9213..1cdd3f75f 100644 --- a/OpenCL/m02000_a0-pure.cl +++ b/OpenCL/m02000_a0-pure.cl @@ -3,9 +3,11 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" +#endif __kernel void m02000_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m02000_a1-pure.cl b/OpenCL/m02000_a1-pure.cl index f6a6f9213..1cdd3f75f 100644 --- a/OpenCL/m02000_a1-pure.cl +++ b/OpenCL/m02000_a1-pure.cl @@ -3,9 +3,11 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" +#endif __kernel void m02000_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m02000_a3-pure.cl b/OpenCL/m02000_a3-pure.cl index f6a6f9213..1cdd3f75f 100644 --- a/OpenCL/m02000_a3-pure.cl +++ b/OpenCL/m02000_a3-pure.cl @@ -3,9 +3,11 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" +#endif __kernel void m02000_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m02100-pure.cl b/OpenCL/m02100-pure.cl index 536a60614..71a87e03c 100644 --- a/OpenCL/m02100-pure.cl +++ b/OpenCL/m02100-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -282,5 +284,7 @@ __kernel void m02100_comp (KERN_ATTR_TMPS (dcc2_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m02400_a0-optimized.cl b/OpenCL/m02400_a0-optimized.cl index ccd639d31..16fec9757 100644 --- a/OpenCL/m02400_a0-optimized.cl +++ b/OpenCL/m02400_a0-optimized.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m02400_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m02400_a1-optimized.cl b/OpenCL/m02400_a1-optimized.cl index af8147f69..0822a17ea 100644 --- a/OpenCL/m02400_a1-optimized.cl +++ b/OpenCL/m02400_a1-optimized.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m02400_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m02400_a3-optimized.cl b/OpenCL/m02400_a3-optimized.cl index 155bc0510..432187222 100644 --- a/OpenCL/m02400_a3-optimized.cl +++ b/OpenCL/m02400_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void m02400m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m02410_a0-optimized.cl b/OpenCL/m02410_a0-optimized.cl index 850a9afbf..75cfa39c4 100644 --- a/OpenCL/m02410_a0-optimized.cl +++ b/OpenCL/m02410_a0-optimized.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m02410_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m02410_a1-optimized.cl b/OpenCL/m02410_a1-optimized.cl index b86e3475f..2fcf292a7 100644 --- a/OpenCL/m02410_a1-optimized.cl +++ b/OpenCL/m02410_a1-optimized.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m02410_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m02410_a3-optimized.cl b/OpenCL/m02410_a3-optimized.cl index afa7ac570..2586ccf04 100644 --- a/OpenCL/m02410_a3-optimized.cl +++ b/OpenCL/m02410_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void m02410m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m02500-pure.cl b/OpenCL/m02500-pure.cl index 8ce5979a4..7052a02b2 100644 --- a/OpenCL/m02500-pure.cl +++ b/OpenCL/m02500-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m02501-pure.cl b/OpenCL/m02501-pure.cl index 799e106c4..ab5dceb65 100644 --- a/OpenCL/m02501-pure.cl +++ b/OpenCL/m02501-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m02610_a0-optimized.cl b/OpenCL/m02610_a0-optimized.cl index 7632937e6..4697314fa 100644 --- a/OpenCL/m02610_a0-optimized.cl +++ b/OpenCL/m02610_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02610_a0-pure.cl b/OpenCL/m02610_a0-pure.cl index 0e2c3bd23..507d9c47f 100644 --- a/OpenCL/m02610_a0-pure.cl +++ b/OpenCL/m02610_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02610_a1-optimized.cl b/OpenCL/m02610_a1-optimized.cl index f48e925d6..5d86d2e83 100644 --- a/OpenCL/m02610_a1-optimized.cl +++ b/OpenCL/m02610_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02610_a1-pure.cl b/OpenCL/m02610_a1-pure.cl index 95357da45..2522d870d 100644 --- a/OpenCL/m02610_a1-pure.cl +++ b/OpenCL/m02610_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02610_a3-optimized.cl b/OpenCL/m02610_a3-optimized.cl index ad857699e..8bdfb7c9d 100644 --- a/OpenCL/m02610_a3-optimized.cl +++ b/OpenCL/m02610_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02610_a3-pure.cl b/OpenCL/m02610_a3-pure.cl index 6fc80d18f..e7e66688f 100644 --- a/OpenCL/m02610_a3-pure.cl +++ b/OpenCL/m02610_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02710_a0-optimized.cl b/OpenCL/m02710_a0-optimized.cl index ec7a39198..314af2ab7 100644 --- a/OpenCL/m02710_a0-optimized.cl +++ b/OpenCL/m02710_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02710_a1-optimized.cl b/OpenCL/m02710_a1-optimized.cl index 1deec06d9..126039df9 100644 --- a/OpenCL/m02710_a1-optimized.cl +++ b/OpenCL/m02710_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02710_a3-optimized.cl b/OpenCL/m02710_a3-optimized.cl index 1e0ab8b53..1b47cbfff 100644 --- a/OpenCL/m02710_a3-optimized.cl +++ b/OpenCL/m02710_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02810_a0-optimized.cl b/OpenCL/m02810_a0-optimized.cl index b7a659764..1345829f8 100644 --- a/OpenCL/m02810_a0-optimized.cl +++ b/OpenCL/m02810_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02810_a0-pure.cl b/OpenCL/m02810_a0-pure.cl index 4ad50f6b4..ec64b07e2 100644 --- a/OpenCL/m02810_a0-pure.cl +++ b/OpenCL/m02810_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02810_a1-optimized.cl b/OpenCL/m02810_a1-optimized.cl index 9a87d5640..17c034926 100644 --- a/OpenCL/m02810_a1-optimized.cl +++ b/OpenCL/m02810_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02810_a1-pure.cl b/OpenCL/m02810_a1-pure.cl index abc477be1..16607694e 100644 --- a/OpenCL/m02810_a1-pure.cl +++ b/OpenCL/m02810_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02810_a3-optimized.cl b/OpenCL/m02810_a3-optimized.cl index 41d7d5814..fd3860d2e 100644 --- a/OpenCL/m02810_a3-optimized.cl +++ b/OpenCL/m02810_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m02810_a3-pure.cl b/OpenCL/m02810_a3-pure.cl index fa9d3c1aa..636b9c9e4 100644 --- a/OpenCL/m02810_a3-pure.cl +++ b/OpenCL/m02810_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03000_a0-pure.cl b/OpenCL/m03000_a0-pure.cl index ec1dcc3bd..48acd8dca 100644 --- a/OpenCL/m03000_a0-pure.cl +++ b/OpenCL/m03000_a0-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp.h" #include "inc_rp.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m03000_a1-pure.cl b/OpenCL/m03000_a1-pure.cl index 217e327b1..0649cdb38 100644 --- a/OpenCL/m03000_a1-pure.cl +++ b/OpenCL/m03000_a1-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m03000_a3-pure.cl b/OpenCL/m03000_a3-pure.cl index 2478b991c..e4f751e52 100644 --- a/OpenCL/m03000_a3-pure.cl +++ b/OpenCL/m03000_a3-pure.cl @@ -5,9 +5,11 @@ * : sboxes for others were takes fron JtR, license below */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" +#endif #define COMPARE_S "inc_comp_single_bs.cl" #define COMPARE_M "inc_comp_multi_bs.cl" @@ -2085,7 +2087,9 @@ __kernel void m03000_mxx (KERN_ATTR_BITSLICE ()) const u32 r0 = search[0]; const u32 r1 = search[1]; const u32 r2 = 0; + #ifdef KERNEL_STATIC const u32 r3 = 0; + #endif #include COMPARE_M } @@ -2115,7 +2119,9 @@ __kernel void m03000_mxx (KERN_ATTR_BITSLICE ()) const u32 r0 = out0[31 - slice]; const u32 r1 = out1[31 - slice]; const u32 r2 = 0; + #ifdef KERNEL_STATIC const u32 r3 = 0; + #endif #include COMPARE_M } @@ -2508,5 +2514,7 @@ __kernel void m03000_sxx (KERN_ATTR_BITSLICE ()) const u32 slice = ffz (tmpResult); + #ifdef KERNEL_STATIC #include COMPARE_S + #endif } diff --git a/OpenCL/m03100_a0-optimized.cl b/OpenCL/m03100_a0-optimized.cl index 4002be87a..2c18fc332 100644 --- a/OpenCL/m03100_a0-optimized.cl +++ b/OpenCL/m03100_a0-optimized.cl @@ -6,6 +6,7 @@ //incompatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_cipher_des.cl" +#endif __kernel void m03100_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m03100_a1-optimized.cl b/OpenCL/m03100_a1-optimized.cl index 47fff4603..edbfd0cad 100644 --- a/OpenCL/m03100_a1-optimized.cl +++ b/OpenCL/m03100_a1-optimized.cl @@ -6,11 +6,13 @@ //incompatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_cipher_des.cl" +#endif __kernel void m03100_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m03100_a3-optimized.cl b/OpenCL/m03100_a3-optimized.cl index fba4aae6b..a076f8503 100644 --- a/OpenCL/m03100_a3-optimized.cl +++ b/OpenCL/m03100_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_cipher_des.cl" +#endif DECLSPEC void m03100m (SHM_TYPE u32 (*s_SPtrans)[64], SHM_TYPE u32 (*s_skb)[64], u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m03200-pure.cl b/OpenCL/m03200-pure.cl index dc4f64b46..47c9b4bda 100644 --- a/OpenCL/m03200-pure.cl +++ b/OpenCL/m03200-pure.cl @@ -3,9 +3,11 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -851,5 +853,7 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m032 #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m03710_a0-optimized.cl b/OpenCL/m03710_a0-optimized.cl index f283ae6b4..7f9e67c28 100644 --- a/OpenCL/m03710_a0-optimized.cl +++ b/OpenCL/m03710_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03710_a0-pure.cl b/OpenCL/m03710_a0-pure.cl index 40e3bee95..3a038550a 100644 --- a/OpenCL/m03710_a0-pure.cl +++ b/OpenCL/m03710_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03710_a1-optimized.cl b/OpenCL/m03710_a1-optimized.cl index 8e1c2bd66..7c8272612 100644 --- a/OpenCL/m03710_a1-optimized.cl +++ b/OpenCL/m03710_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03710_a1-pure.cl b/OpenCL/m03710_a1-pure.cl index fdbe69429..fe791c484 100644 --- a/OpenCL/m03710_a1-pure.cl +++ b/OpenCL/m03710_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03710_a3-optimized.cl b/OpenCL/m03710_a3-optimized.cl index b47e9a9cd..f7d3426fc 100644 --- a/OpenCL/m03710_a3-optimized.cl +++ b/OpenCL/m03710_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03710_a3-pure.cl b/OpenCL/m03710_a3-pure.cl index 9b5bec76f..def23af1f 100644 --- a/OpenCL/m03710_a3-pure.cl +++ b/OpenCL/m03710_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03800_a0-optimized.cl b/OpenCL/m03800_a0-optimized.cl index 1c8b162e7..5e670574a 100644 --- a/OpenCL/m03800_a0-optimized.cl +++ b/OpenCL/m03800_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m03800_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m03800_a0-pure.cl b/OpenCL/m03800_a0-pure.cl index acacd9a7f..d7350ef67 100644 --- a/OpenCL/m03800_a0-pure.cl +++ b/OpenCL/m03800_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m03800_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m03800_a1-optimized.cl b/OpenCL/m03800_a1-optimized.cl index fa4407c26..00c103966 100644 --- a/OpenCL/m03800_a1-optimized.cl +++ b/OpenCL/m03800_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m03800_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m03800_a1-pure.cl b/OpenCL/m03800_a1-pure.cl index 3eca59abb..824d03034 100644 --- a/OpenCL/m03800_a1-pure.cl +++ b/OpenCL/m03800_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m03800_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m03800_a3-optimized.cl b/OpenCL/m03800_a3-optimized.cl index fd1af6c32..c46ed57b0 100644 --- a/OpenCL/m03800_a3-optimized.cl +++ b/OpenCL/m03800_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void m03800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m03800_a3-pure.cl b/OpenCL/m03800_a3-pure.cl index 5ff980f67..709e5dd3a 100644 --- a/OpenCL/m03800_a3-pure.cl +++ b/OpenCL/m03800_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m03800_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m03910_a0-optimized.cl b/OpenCL/m03910_a0-optimized.cl index f5c3e3681..ce2320047 100644 --- a/OpenCL/m03910_a0-optimized.cl +++ b/OpenCL/m03910_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03910_a0-pure.cl b/OpenCL/m03910_a0-pure.cl index 4b70bdc06..2ee648879 100644 --- a/OpenCL/m03910_a0-pure.cl +++ b/OpenCL/m03910_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03910_a1-optimized.cl b/OpenCL/m03910_a1-optimized.cl index 252572d91..3e6858b99 100644 --- a/OpenCL/m03910_a1-optimized.cl +++ b/OpenCL/m03910_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03910_a1-pure.cl b/OpenCL/m03910_a1-pure.cl index c11878ca8..d2b021663 100644 --- a/OpenCL/m03910_a1-pure.cl +++ b/OpenCL/m03910_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03910_a3-optimized.cl b/OpenCL/m03910_a3-optimized.cl index 3b13f6e2a..ebcb15b9c 100644 --- a/OpenCL/m03910_a3-optimized.cl +++ b/OpenCL/m03910_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m03910_a3-pure.cl b/OpenCL/m03910_a3-pure.cl index ec1044d30..e6bb8cdf2 100644 --- a/OpenCL/m03910_a3-pure.cl +++ b/OpenCL/m03910_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04010_a0-optimized.cl b/OpenCL/m04010_a0-optimized.cl index 1bbcc9b3e..73598613c 100644 --- a/OpenCL/m04010_a0-optimized.cl +++ b/OpenCL/m04010_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04010_a0-pure.cl b/OpenCL/m04010_a0-pure.cl index 3f0728302..7999b8241 100644 --- a/OpenCL/m04010_a0-pure.cl +++ b/OpenCL/m04010_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04010_a1-optimized.cl b/OpenCL/m04010_a1-optimized.cl index 9cf0d2c54..c122168e1 100644 --- a/OpenCL/m04010_a1-optimized.cl +++ b/OpenCL/m04010_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04010_a1-pure.cl b/OpenCL/m04010_a1-pure.cl index 3385a8da8..671c852b6 100644 --- a/OpenCL/m04010_a1-pure.cl +++ b/OpenCL/m04010_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04010_a3-optimized.cl b/OpenCL/m04010_a3-optimized.cl index cee0e0a85..79d2b28e8 100644 --- a/OpenCL/m04010_a3-optimized.cl +++ b/OpenCL/m04010_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04010_a3-pure.cl b/OpenCL/m04010_a3-pure.cl index 8b4255d46..366a36b9d 100644 --- a/OpenCL/m04010_a3-pure.cl +++ b/OpenCL/m04010_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04110_a0-optimized.cl b/OpenCL/m04110_a0-optimized.cl index 9423f27f8..dd8cafe1d 100644 --- a/OpenCL/m04110_a0-optimized.cl +++ b/OpenCL/m04110_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04110_a0-pure.cl b/OpenCL/m04110_a0-pure.cl index 456951480..ca2b5c47a 100644 --- a/OpenCL/m04110_a0-pure.cl +++ b/OpenCL/m04110_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04110_a1-optimized.cl b/OpenCL/m04110_a1-optimized.cl index 9a6883ef4..a452b5d09 100644 --- a/OpenCL/m04110_a1-optimized.cl +++ b/OpenCL/m04110_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04110_a1-pure.cl b/OpenCL/m04110_a1-pure.cl index c79733153..a5e9367e5 100644 --- a/OpenCL/m04110_a1-pure.cl +++ b/OpenCL/m04110_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04110_a3-optimized.cl b/OpenCL/m04110_a3-optimized.cl index 5e2ccb4d5..0efa1c78c 100644 --- a/OpenCL/m04110_a3-optimized.cl +++ b/OpenCL/m04110_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04110_a3-pure.cl b/OpenCL/m04110_a3-pure.cl index 1c03d2f2f..19ce10f95 100644 --- a/OpenCL/m04110_a3-pure.cl +++ b/OpenCL/m04110_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04310_a0-optimized.cl b/OpenCL/m04310_a0-optimized.cl index c6db696ba..707baea57 100644 --- a/OpenCL/m04310_a0-optimized.cl +++ b/OpenCL/m04310_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04310_a0-pure.cl b/OpenCL/m04310_a0-pure.cl index cbd79253a..b7661f4ce 100644 --- a/OpenCL/m04310_a0-pure.cl +++ b/OpenCL/m04310_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04310_a1-optimized.cl b/OpenCL/m04310_a1-optimized.cl index 86b9e4e4d..7fde51367 100644 --- a/OpenCL/m04310_a1-optimized.cl +++ b/OpenCL/m04310_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04310_a1-pure.cl b/OpenCL/m04310_a1-pure.cl index 3e6a4dc1a..bb6cd3945 100644 --- a/OpenCL/m04310_a1-pure.cl +++ b/OpenCL/m04310_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04310_a3-optimized.cl b/OpenCL/m04310_a3-optimized.cl index 94d241cbe..c5b0f2df9 100644 --- a/OpenCL/m04310_a3-optimized.cl +++ b/OpenCL/m04310_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04310_a3-pure.cl b/OpenCL/m04310_a3-pure.cl index 6ce112605..7bfd0daa7 100644 --- a/OpenCL/m04310_a3-pure.cl +++ b/OpenCL/m04310_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04400_a0-optimized.cl b/OpenCL/m04400_a0-optimized.cl index 6bb820555..49688814c 100644 --- a/OpenCL/m04400_a0-optimized.cl +++ b/OpenCL/m04400_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_simd.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04400_a0-pure.cl b/OpenCL/m04400_a0-pure.cl index 9149ea491..36d6e1c71 100644 --- a/OpenCL/m04400_a0-pure.cl +++ b/OpenCL/m04400_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_scalar.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04400_a1-optimized.cl b/OpenCL/m04400_a1-optimized.cl index 19b56c553..410f9c081 100644 --- a/OpenCL/m04400_a1-optimized.cl +++ b/OpenCL/m04400_a1-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04400_a1-pure.cl b/OpenCL/m04400_a1-pure.cl index 2495ddb33..639acc6fa 100644 --- a/OpenCL/m04400_a1-pure.cl +++ b/OpenCL/m04400_a1-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04400_a3-optimized.cl b/OpenCL/m04400_a3-optimized.cl index a233d4dbe..d89381d5d 100644 --- a/OpenCL/m04400_a3-optimized.cl +++ b/OpenCL/m04400_a3-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04400_a3-pure.cl b/OpenCL/m04400_a3-pure.cl index 85279ac97..7467c078a 100644 --- a/OpenCL/m04400_a3-pure.cl +++ b/OpenCL/m04400_a3-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04500_a0-optimized.cl b/OpenCL/m04500_a0-optimized.cl index b4a6d5ce3..1bda23482 100644 --- a/OpenCL/m04500_a0-optimized.cl +++ b/OpenCL/m04500_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04500_a0-pure.cl b/OpenCL/m04500_a0-pure.cl index a81307210..3ce4a27bb 100644 --- a/OpenCL/m04500_a0-pure.cl +++ b/OpenCL/m04500_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04500_a1-optimized.cl b/OpenCL/m04500_a1-optimized.cl index 149078220..ed5c7bac7 100644 --- a/OpenCL/m04500_a1-optimized.cl +++ b/OpenCL/m04500_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04500_a1-pure.cl b/OpenCL/m04500_a1-pure.cl index db62279fe..5583d05cc 100644 --- a/OpenCL/m04500_a1-pure.cl +++ b/OpenCL/m04500_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04500_a3-optimized.cl b/OpenCL/m04500_a3-optimized.cl index 57389826a..a3b711962 100644 --- a/OpenCL/m04500_a3-optimized.cl +++ b/OpenCL/m04500_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04500_a3-pure.cl b/OpenCL/m04500_a3-pure.cl index 3d8e75dd4..15b0cbe12 100644 --- a/OpenCL/m04500_a3-pure.cl +++ b/OpenCL/m04500_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04520_a0-optimized.cl b/OpenCL/m04520_a0-optimized.cl index ca9ceb8f3..e6569d86b 100644 --- a/OpenCL/m04520_a0-optimized.cl +++ b/OpenCL/m04520_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04520_a0-pure.cl b/OpenCL/m04520_a0-pure.cl index fadde2a30..c6fd1b96c 100644 --- a/OpenCL/m04520_a0-pure.cl +++ b/OpenCL/m04520_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04520_a1-optimized.cl b/OpenCL/m04520_a1-optimized.cl index 015cfad47..1ff340a97 100644 --- a/OpenCL/m04520_a1-optimized.cl +++ b/OpenCL/m04520_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04520_a1-pure.cl b/OpenCL/m04520_a1-pure.cl index a8190bbce..dfa325e04 100644 --- a/OpenCL/m04520_a1-pure.cl +++ b/OpenCL/m04520_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04520_a3-optimized.cl b/OpenCL/m04520_a3-optimized.cl index 785277216..fe4eb7509 100644 --- a/OpenCL/m04520_a3-optimized.cl +++ b/OpenCL/m04520_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04520_a3-pure.cl b/OpenCL/m04520_a3-pure.cl index 69dceae1d..5b86f9977 100644 --- a/OpenCL/m04520_a3-pure.cl +++ b/OpenCL/m04520_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04700_a0-optimized.cl b/OpenCL/m04700_a0-optimized.cl index 91f6e58e6..f1ab10919 100644 --- a/OpenCL/m04700_a0-optimized.cl +++ b/OpenCL/m04700_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_simd.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04700_a0-pure.cl b/OpenCL/m04700_a0-pure.cl index bf0772672..6fdd54c9c 100644 --- a/OpenCL/m04700_a0-pure.cl +++ b/OpenCL/m04700_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_scalar.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04700_a1-optimized.cl b/OpenCL/m04700_a1-optimized.cl index 9c3ff7321..2ad62a46a 100644 --- a/OpenCL/m04700_a1-optimized.cl +++ b/OpenCL/m04700_a1-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04700_a1-pure.cl b/OpenCL/m04700_a1-pure.cl index f6aadefbc..c33480df9 100644 --- a/OpenCL/m04700_a1-pure.cl +++ b/OpenCL/m04700_a1-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04700_a3-optimized.cl b/OpenCL/m04700_a3-optimized.cl index 828fbb8ad..96ebb71e6 100644 --- a/OpenCL/m04700_a3-optimized.cl +++ b/OpenCL/m04700_a3-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04700_a3-pure.cl b/OpenCL/m04700_a3-pure.cl index d6bb0a4ce..08a4a000a 100644 --- a/OpenCL/m04700_a3-pure.cl +++ b/OpenCL/m04700_a3-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04800_a0-optimized.cl b/OpenCL/m04800_a0-optimized.cl index fd5d82a28..68f2b176c 100644 --- a/OpenCL/m04800_a0-optimized.cl +++ b/OpenCL/m04800_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m04800_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m04800_a0-pure.cl b/OpenCL/m04800_a0-pure.cl index 312897010..9b46a8e22 100644 --- a/OpenCL/m04800_a0-pure.cl +++ b/OpenCL/m04800_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m04800_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m04800_a1-optimized.cl b/OpenCL/m04800_a1-optimized.cl index 91edfe208..08a0b90a5 100644 --- a/OpenCL/m04800_a1-optimized.cl +++ b/OpenCL/m04800_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m04800_a1-pure.cl b/OpenCL/m04800_a1-pure.cl index 9ead2c000..80fe39f3e 100644 --- a/OpenCL/m04800_a1-pure.cl +++ b/OpenCL/m04800_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m04800_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m04800_a3-optimized.cl b/OpenCL/m04800_a3-optimized.cl index 3d4c5df7d..782f8caa0 100644 --- a/OpenCL/m04800_a3-optimized.cl +++ b/OpenCL/m04800_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void m04800m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m04800_a3-pure.cl b/OpenCL/m04800_a3-pure.cl index 1c59a1a39..71d0bf58f 100644 --- a/OpenCL/m04800_a3-pure.cl +++ b/OpenCL/m04800_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m04800_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m04900_a0-optimized.cl b/OpenCL/m04900_a0-optimized.cl index e0e95b2f9..2ecff69c6 100644 --- a/OpenCL/m04900_a0-optimized.cl +++ b/OpenCL/m04900_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m04900_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m04900_a0-pure.cl b/OpenCL/m04900_a0-pure.cl index b6a69431a..e071a5bcd 100644 --- a/OpenCL/m04900_a0-pure.cl +++ b/OpenCL/m04900_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m04900_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m04900_a1-optimized.cl b/OpenCL/m04900_a1-optimized.cl index 98d9df7da..1fe4b5414 100644 --- a/OpenCL/m04900_a1-optimized.cl +++ b/OpenCL/m04900_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m04900_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m04900_a1-pure.cl b/OpenCL/m04900_a1-pure.cl index 69a72c5ee..5c73b40a7 100644 --- a/OpenCL/m04900_a1-pure.cl +++ b/OpenCL/m04900_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m04900_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m04900_a3-optimized.cl b/OpenCL/m04900_a3-optimized.cl index d5183034f..a10cc4475 100644 --- a/OpenCL/m04900_a3-optimized.cl +++ b/OpenCL/m04900_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m04900m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m04900_a3-pure.cl b/OpenCL/m04900_a3-pure.cl index 9e8594e9b..ef23e9605 100644 --- a/OpenCL/m04900_a3-pure.cl +++ b/OpenCL/m04900_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m04900_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m05100_a0-optimized.cl b/OpenCL/m05100_a0-optimized.cl index 500669e54..a90dbc5d8 100644 --- a/OpenCL/m05100_a0-optimized.cl +++ b/OpenCL/m05100_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m05100_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m05100_a0-pure.cl b/OpenCL/m05100_a0-pure.cl index 5a8a9742b..47b4a916c 100644 --- a/OpenCL/m05100_a0-pure.cl +++ b/OpenCL/m05100_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m05100_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m05100_a1-optimized.cl b/OpenCL/m05100_a1-optimized.cl index d91caaa4f..2dd1a50b4 100644 --- a/OpenCL/m05100_a1-optimized.cl +++ b/OpenCL/m05100_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m05100_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m05100_a1-pure.cl b/OpenCL/m05100_a1-pure.cl index 374a12ebf..02f154e7e 100644 --- a/OpenCL/m05100_a1-pure.cl +++ b/OpenCL/m05100_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m05100_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m05100_a3-optimized.cl b/OpenCL/m05100_a3-optimized.cl index b783f78df..bb9437db1 100644 --- a/OpenCL/m05100_a3-optimized.cl +++ b/OpenCL/m05100_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void m05100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m05100_a3-pure.cl b/OpenCL/m05100_a3-pure.cl index 4a897b64d..d383df8d8 100644 --- a/OpenCL/m05100_a3-pure.cl +++ b/OpenCL/m05100_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m05100_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m05200-pure.cl b/OpenCL/m05200-pure.cl index 48e42ae0e..e7afddc84 100644 --- a/OpenCL/m05200-pure.cl +++ b/OpenCL/m05200-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -140,5 +142,7 @@ __kernel void m05200_comp (KERN_ATTR_TMPS (pwsafe3_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m05300_a0-optimized.cl b/OpenCL/m05300_a0-optimized.cl index a7de810f3..c4c38ede4 100644 --- a/OpenCL/m05300_a0-optimized.cl +++ b/OpenCL/m05300_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05300_a0-pure.cl b/OpenCL/m05300_a0-pure.cl index de004cbdb..f91a90984 100644 --- a/OpenCL/m05300_a0-pure.cl +++ b/OpenCL/m05300_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05300_a1-optimized.cl b/OpenCL/m05300_a1-optimized.cl index 3487b3ec1..4080f38de 100644 --- a/OpenCL/m05300_a1-optimized.cl +++ b/OpenCL/m05300_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05300_a1-pure.cl b/OpenCL/m05300_a1-pure.cl index 095aa1106..e04043729 100644 --- a/OpenCL/m05300_a1-pure.cl +++ b/OpenCL/m05300_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05300_a3-optimized.cl b/OpenCL/m05300_a3-optimized.cl index 68c70dd36..88a62ff38 100644 --- a/OpenCL/m05300_a3-optimized.cl +++ b/OpenCL/m05300_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05300_a3-pure.cl b/OpenCL/m05300_a3-pure.cl index 901143d5a..c10efad8a 100644 --- a/OpenCL/m05300_a3-pure.cl +++ b/OpenCL/m05300_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05400_a0-optimized.cl b/OpenCL/m05400_a0-optimized.cl index ce2650546..684a39c3d 100644 --- a/OpenCL/m05400_a0-optimized.cl +++ b/OpenCL/m05400_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05400_a0-pure.cl b/OpenCL/m05400_a0-pure.cl index 7959d8380..5a5f55899 100644 --- a/OpenCL/m05400_a0-pure.cl +++ b/OpenCL/m05400_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05400_a1-optimized.cl b/OpenCL/m05400_a1-optimized.cl index d28c2f75f..b2fbea59e 100644 --- a/OpenCL/m05400_a1-optimized.cl +++ b/OpenCL/m05400_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05400_a1-pure.cl b/OpenCL/m05400_a1-pure.cl index 7f1854fa7..0fd1e0607 100644 --- a/OpenCL/m05400_a1-pure.cl +++ b/OpenCL/m05400_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05400_a3-optimized.cl b/OpenCL/m05400_a3-optimized.cl index cac3209f5..cf1f15f3a 100644 --- a/OpenCL/m05400_a3-optimized.cl +++ b/OpenCL/m05400_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05400_a3-pure.cl b/OpenCL/m05400_a3-pure.cl index 16fd9bb0a..c93576159 100644 --- a/OpenCL/m05400_a3-pure.cl +++ b/OpenCL/m05400_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct ikepsk { diff --git a/OpenCL/m05500_a0-optimized.cl b/OpenCL/m05500_a0-optimized.cl index 36d150b26..199e59dc3 100644 --- a/OpenCL/m05500_a0-optimized.cl +++ b/OpenCL/m05500_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05500_a0-pure.cl b/OpenCL/m05500_a0-pure.cl index 834423c3d..0a6f0dfba 100644 --- a/OpenCL/m05500_a0-pure.cl +++ b/OpenCL/m05500_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05500_a1-optimized.cl b/OpenCL/m05500_a1-optimized.cl index 510f169b6..139300359 100644 --- a/OpenCL/m05500_a1-optimized.cl +++ b/OpenCL/m05500_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05500_a1-pure.cl b/OpenCL/m05500_a1-pure.cl index 2fe5f52c0..86e00e3a1 100644 --- a/OpenCL/m05500_a1-pure.cl +++ b/OpenCL/m05500_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05500_a3-optimized.cl b/OpenCL/m05500_a3-optimized.cl index 76b17c027..6676806d8 100644 --- a/OpenCL/m05500_a3-optimized.cl +++ b/OpenCL/m05500_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05500_a3-pure.cl b/OpenCL/m05500_a3-pure.cl index 39a1a145b..9af1148d8 100644 --- a/OpenCL/m05500_a3-pure.cl +++ b/OpenCL/m05500_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05600_a0-optimized.cl b/OpenCL/m05600_a0-optimized.cl index 32631e45f..a83b8639d 100644 --- a/OpenCL/m05600_a0-optimized.cl +++ b/OpenCL/m05600_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05600_a0-pure.cl b/OpenCL/m05600_a0-pure.cl index 7e536579b..56f9333a6 100644 --- a/OpenCL/m05600_a0-pure.cl +++ b/OpenCL/m05600_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_scalar.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05600_a1-optimized.cl b/OpenCL/m05600_a1-optimized.cl index 20ce8dc27..fe32f2668 100644 --- a/OpenCL/m05600_a1-optimized.cl +++ b/OpenCL/m05600_a1-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05600_a1-pure.cl b/OpenCL/m05600_a1-pure.cl index f42b79f34..2e2d38ac4 100644 --- a/OpenCL/m05600_a1-pure.cl +++ b/OpenCL/m05600_a1-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05600_a3-optimized.cl b/OpenCL/m05600_a3-optimized.cl index 248c46294..69948d742 100644 --- a/OpenCL/m05600_a3-optimized.cl +++ b/OpenCL/m05600_a3-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05600_a3-pure.cl b/OpenCL/m05600_a3-pure.cl index 81e2eee7b..fc65ab0e1 100644 --- a/OpenCL/m05600_a3-pure.cl +++ b/OpenCL/m05600_a3-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct netntlm { diff --git a/OpenCL/m05800-optimized.cl b/OpenCL/m05800-optimized.cl index 15854d032..80becc1d0 100644 --- a/OpenCL/m05800-optimized.cl +++ b/OpenCL/m05800-optimized.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -2425,5 +2427,7 @@ __kernel void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m05800-pure.cl b/OpenCL/m05800-pure.cl index 4809c0389..4be1ae24e 100644 --- a/OpenCL/m05800-pure.cl +++ b/OpenCL/m05800-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -2225,5 +2227,7 @@ __kernel void m05800_comp (KERN_ATTR_TMPS (androidpin_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m06000_a0-optimized.cl b/OpenCL/m06000_a0-optimized.cl index 95b05be01..bf97dead1 100644 --- a/OpenCL/m06000_a0-optimized.cl +++ b/OpenCL/m06000_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" +#endif DECLSPEC void ripemd160_transform_transport_vector (const u32x *w, u32x *dgst) { diff --git a/OpenCL/m06000_a0-pure.cl b/OpenCL/m06000_a0-pure.cl index 09c8c0655..c7d2d08e0 100644 --- a/OpenCL/m06000_a0-pure.cl +++ b/OpenCL/m06000_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_ripemd160.cl" +#endif __kernel void m06000_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m06000_a1-optimized.cl b/OpenCL/m06000_a1-optimized.cl index fcfb8e494..764855562 100644 --- a/OpenCL/m06000_a1-optimized.cl +++ b/OpenCL/m06000_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" +#endif DECLSPEC void ripemd160_transform_transport_vector (const u32x *w, u32x *dgst) { diff --git a/OpenCL/m06000_a1-pure.cl b/OpenCL/m06000_a1-pure.cl index ce41e9573..1a79009d3 100644 --- a/OpenCL/m06000_a1-pure.cl +++ b/OpenCL/m06000_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_ripemd160.cl" +#endif __kernel void m06000_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m06000_a3-optimized.cl b/OpenCL/m06000_a3-optimized.cl index 3fba5307e..be9776696 100644 --- a/OpenCL/m06000_a3-optimized.cl +++ b/OpenCL/m06000_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" +#endif DECLSPEC void ripemd160_transform_transport_vector (const u32x *w, u32x *dgst) { diff --git a/OpenCL/m06000_a3-pure.cl b/OpenCL/m06000_a3-pure.cl index a98e6754b..22d256ab2 100644 --- a/OpenCL/m06000_a3-pure.cl +++ b/OpenCL/m06000_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_ripemd160.cl" +#endif __kernel void m06000_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m06100_a0-optimized.cl b/OpenCL/m06100_a0-optimized.cl index 936ac96db..578f177f6 100644 --- a/OpenCL/m06100_a0-optimized.cl +++ b/OpenCL/m06100_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" +#endif DECLSPEC void whirlpool_transform_transport_vector (const u32x *w, u32x *digest, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) { diff --git a/OpenCL/m06100_a0-pure.cl b/OpenCL/m06100_a0-pure.cl index 1753612ec..5c0f0b7e8 100644 --- a/OpenCL/m06100_a0-pure.cl +++ b/OpenCL/m06100_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_whirlpool.cl" +#endif __kernel void m06100_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m06100_a1-optimized.cl b/OpenCL/m06100_a1-optimized.cl index 581020995..ef0fb5954 100644 --- a/OpenCL/m06100_a1-optimized.cl +++ b/OpenCL/m06100_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" +#endif DECLSPEC void whirlpool_transform_transport_vector (const u32x *w, u32x *digest, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) { diff --git a/OpenCL/m06100_a1-pure.cl b/OpenCL/m06100_a1-pure.cl index 4d6b7d7f5..d87690a2d 100644 --- a/OpenCL/m06100_a1-pure.cl +++ b/OpenCL/m06100_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_whirlpool.cl" +#endif __kernel void m06100_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m06100_a3-optimized.cl b/OpenCL/m06100_a3-optimized.cl index 342d077f0..24fd15bb5 100644 --- a/OpenCL/m06100_a3-optimized.cl +++ b/OpenCL/m06100_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" +#endif DECLSPEC void whirlpool_transform_transport_vector (const u32x *w, u32x *digest, SHM_TYPE u32 (*s_Ch)[256], SHM_TYPE u32 (*s_Cl)[256]) { diff --git a/OpenCL/m06100_a3-pure.cl b/OpenCL/m06100_a3-pure.cl index 0cf9dbc0d..4b1dab8b5 100644 --- a/OpenCL/m06100_a3-pure.cl +++ b/OpenCL/m06100_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_whirlpool.cl" +#endif __kernel void m06100_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m06211-pure.cl b/OpenCL/m06211-pure.cl index 82c7f0016..f73411f30 100644 --- a/OpenCL/m06211-pure.cl +++ b/OpenCL/m06211-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" +#endif typedef struct tc { @@ -26,9 +28,11 @@ typedef struct tc } tc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" +#endif typedef struct tc_tmp { diff --git a/OpenCL/m06212-pure.cl b/OpenCL/m06212-pure.cl index bccf601d3..551025185 100644 --- a/OpenCL/m06212-pure.cl +++ b/OpenCL/m06212-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" +#endif typedef struct tc { @@ -26,9 +28,11 @@ typedef struct tc } tc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" +#endif typedef struct tc_tmp { diff --git a/OpenCL/m06213-pure.cl b/OpenCL/m06213-pure.cl index 2e24921e4..abb61bcbf 100644 --- a/OpenCL/m06213-pure.cl +++ b/OpenCL/m06213-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" +#endif typedef struct tc { @@ -26,9 +28,11 @@ typedef struct tc } tc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" +#endif typedef struct tc_tmp { diff --git a/OpenCL/m06221-pure.cl b/OpenCL/m06221-pure.cl index 081029f95..685d05c4c 100644 --- a/OpenCL/m06221-pure.cl +++ b/OpenCL/m06221-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" +#endif typedef struct tc { @@ -26,9 +28,11 @@ typedef struct tc } tc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" +#endif typedef struct tc64_tmp { diff --git a/OpenCL/m06222-pure.cl b/OpenCL/m06222-pure.cl index c42611643..9717de020 100644 --- a/OpenCL/m06222-pure.cl +++ b/OpenCL/m06222-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" +#endif typedef struct tc { @@ -26,9 +28,11 @@ typedef struct tc } tc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" +#endif typedef struct tc64_tmp { diff --git a/OpenCL/m06223-pure.cl b/OpenCL/m06223-pure.cl index 9b3bc8fcc..89e7cbb8c 100644 --- a/OpenCL/m06223-pure.cl +++ b/OpenCL/m06223-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" +#endif typedef struct tc { @@ -26,9 +28,11 @@ typedef struct tc } tc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" +#endif typedef struct tc64_tmp { diff --git a/OpenCL/m06231-pure.cl b/OpenCL/m06231-pure.cl index c680d6712..c78b65241 100644 --- a/OpenCL/m06231-pure.cl +++ b/OpenCL/m06231-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" +#endif typedef struct tc { @@ -26,9 +28,11 @@ typedef struct tc } tc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" +#endif typedef struct tc_tmp { diff --git a/OpenCL/m06232-pure.cl b/OpenCL/m06232-pure.cl index fc3a75884..49d54949e 100644 --- a/OpenCL/m06232-pure.cl +++ b/OpenCL/m06232-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" +#endif typedef struct tc { @@ -26,9 +28,11 @@ typedef struct tc } tc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" +#endif typedef struct tc_tmp { diff --git a/OpenCL/m06233-pure.cl b/OpenCL/m06233-pure.cl index 7f4c51d6b..1abe5bcf7 100644 --- a/OpenCL/m06233-pure.cl +++ b/OpenCL/m06233-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" #include "inc_cipher_serpent.cl" +#endif typedef struct tc { @@ -26,9 +28,11 @@ typedef struct tc } tc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" +#endif typedef struct tc_tmp { diff --git a/OpenCL/m06300-optimized.cl b/OpenCL/m06300-optimized.cl index 048f0d7c9..d66972f21 100644 --- a/OpenCL/m06300-optimized.cl +++ b/OpenCL/m06300-optimized.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -921,5 +923,7 @@ __kernel void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m06300-pure.cl b/OpenCL/m06300-pure.cl index 247cb3658..88bfdf6d9 100644 --- a/OpenCL/m06300-pure.cl +++ b/OpenCL/m06300-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md5.cl" +#endif #define PUTCHAR_LE(a,p,c) ((u8 *)(a))[(p)] = (u8) (c) #define GETCHAR_LE(a,p) ((u8 *)(a))[(p)] @@ -342,5 +344,7 @@ __kernel void m06300_comp (KERN_ATTR_TMPS (md5crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m06400-pure.cl b/OpenCL/m06400-pure.cl index add0631d3..6769aaefe 100644 --- a/OpenCL/m06400-pure.cl +++ b/OpenCL/m06400-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -290,5 +292,7 @@ __kernel void m06400_comp (KERN_ATTR_TMPS (sha256aix_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m06500-pure.cl b/OpenCL/m06500-pure.cl index a8fbdeb76..9fd5aa0d8 100644 --- a/OpenCL/m06500-pure.cl +++ b/OpenCL/m06500-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -346,5 +348,7 @@ __kernel void m06500_comp (KERN_ATTR_TMPS (sha512aix_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m06600-pure.cl b/OpenCL/m06600-pure.cl index 14ca99f3e..a9bdcd714 100644 --- a/OpenCL/m06600-pure.cl +++ b/OpenCL/m06600-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -333,5 +335,7 @@ __kernel void m06600_comp (KERN_ATTR_TMPS (agilekey_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m06700-pure.cl b/OpenCL/m06700-pure.cl index 03a2345a5..83329c68d 100644 --- a/OpenCL/m06700-pure.cl +++ b/OpenCL/m06700-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -248,5 +250,7 @@ __kernel void m06700_comp (KERN_ATTR_TMPS (sha1aix_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m06800-pure.cl b/OpenCL/m06800-pure.cl index b69ac3459..513632756 100644 --- a/OpenCL/m06800-pure.cl +++ b/OpenCL/m06800-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -408,6 +410,8 @@ __kernel void m06800_comp (KERN_ATTR_TMPS (lastpass_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } } diff --git a/OpenCL/m06900_a0-optimized.cl b/OpenCL/m06900_a0-optimized.cl index 1bc9840ac..58a1046b7 100644 --- a/OpenCL/m06900_a0-optimized.cl +++ b/OpenCL/m06900_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u32a c_tables[4][256] = { diff --git a/OpenCL/m06900_a1-optimized.cl b/OpenCL/m06900_a1-optimized.cl index bdb153d02..08a143c80 100644 --- a/OpenCL/m06900_a1-optimized.cl +++ b/OpenCL/m06900_a1-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u32a c_tables[4][256] = { diff --git a/OpenCL/m06900_a3-optimized.cl b/OpenCL/m06900_a3-optimized.cl index 015903ed6..39015df3e 100644 --- a/OpenCL/m06900_a3-optimized.cl +++ b/OpenCL/m06900_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u32a c_tables[4][256] = { diff --git a/OpenCL/m07000_a0-optimized.cl b/OpenCL/m07000_a0-optimized.cl index c43252a3d..570726262 100644 --- a/OpenCL/m07000_a0-optimized.cl +++ b/OpenCL/m07000_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m07000_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m07000_a0-pure.cl b/OpenCL/m07000_a0-pure.cl index 87fee455a..926522145 100644 --- a/OpenCL/m07000_a0-pure.cl +++ b/OpenCL/m07000_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m07000_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m07000_a1-optimized.cl b/OpenCL/m07000_a1-optimized.cl index 2d43409b1..9a17b66a0 100644 --- a/OpenCL/m07000_a1-optimized.cl +++ b/OpenCL/m07000_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m07000_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m07000_a1-pure.cl b/OpenCL/m07000_a1-pure.cl index 4867462a8..48989bf23 100644 --- a/OpenCL/m07000_a1-pure.cl +++ b/OpenCL/m07000_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m07000_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m07000_a3-optimized.cl b/OpenCL/m07000_a3-optimized.cl index 7cc4c6126..f12be4c7c 100644 --- a/OpenCL/m07000_a3-optimized.cl +++ b/OpenCL/m07000_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m07000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m07000_a3-pure.cl b/OpenCL/m07000_a3-pure.cl index f15b3f36c..41ff3792d 100644 --- a/OpenCL/m07000_a3-pure.cl +++ b/OpenCL/m07000_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m07000_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m07100-pure.cl b/OpenCL/m07100-pure.cl index b7b8c81af..d59171ccf 100644 --- a/OpenCL/m07100-pure.cl +++ b/OpenCL/m07100-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -340,5 +342,7 @@ __kernel void m07100_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m07300_a0-optimized.cl b/OpenCL/m07300_a0-optimized.cl index 7f1c2e7ff..0955f056a 100644 --- a/OpenCL/m07300_a0-optimized.cl +++ b/OpenCL/m07300_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct rakp { diff --git a/OpenCL/m07300_a0-pure.cl b/OpenCL/m07300_a0-pure.cl index 05c59a9e6..56c9722c0 100644 --- a/OpenCL/m07300_a0-pure.cl +++ b/OpenCL/m07300_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct rakp { diff --git a/OpenCL/m07300_a1-optimized.cl b/OpenCL/m07300_a1-optimized.cl index 91f634f93..3929ff987 100644 --- a/OpenCL/m07300_a1-optimized.cl +++ b/OpenCL/m07300_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct rakp { diff --git a/OpenCL/m07300_a1-pure.cl b/OpenCL/m07300_a1-pure.cl index 9808221ce..103e1745f 100644 --- a/OpenCL/m07300_a1-pure.cl +++ b/OpenCL/m07300_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct rakp { diff --git a/OpenCL/m07300_a3-optimized.cl b/OpenCL/m07300_a3-optimized.cl index 9486aa218..d6d0387e9 100644 --- a/OpenCL/m07300_a3-optimized.cl +++ b/OpenCL/m07300_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct rakp { diff --git a/OpenCL/m07300_a3-pure.cl b/OpenCL/m07300_a3-pure.cl index 7123db79a..d6d209205 100644 --- a/OpenCL/m07300_a3-pure.cl +++ b/OpenCL/m07300_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct rakp { diff --git a/OpenCL/m07400-optimized.cl b/OpenCL/m07400-optimized.cl index cd3d8f919..7bf302bc4 100644 --- a/OpenCL/m07400-optimized.cl +++ b/OpenCL/m07400-optimized.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -1107,5 +1109,7 @@ __kernel void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m07400-pure.cl b/OpenCL/m07400-pure.cl index 4a7ae05f6..83db96f0a 100644 --- a/OpenCL/m07400-pure.cl +++ b/OpenCL/m07400-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -361,5 +363,7 @@ __kernel void m07400_comp (KERN_ATTR_TMPS (sha256crypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m07500_a0-optimized.cl b/OpenCL/m07500_a0-optimized.cl index 345b8d9da..588948995 100644 --- a/OpenCL/m07500_a0-optimized.cl +++ b/OpenCL/m07500_a0-optimized.cl @@ -6,6 +6,7 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -14,6 +15,7 @@ #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5pa { diff --git a/OpenCL/m07500_a0-pure.cl b/OpenCL/m07500_a0-pure.cl index 127062d8f..aabd80e7a 100644 --- a/OpenCL/m07500_a0-pure.cl +++ b/OpenCL/m07500_a0-pure.cl @@ -6,6 +6,7 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5pa { diff --git a/OpenCL/m07500_a1-optimized.cl b/OpenCL/m07500_a1-optimized.cl index f208588ee..6b48a6adb 100644 --- a/OpenCL/m07500_a1-optimized.cl +++ b/OpenCL/m07500_a1-optimized.cl @@ -6,12 +6,14 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5pa { diff --git a/OpenCL/m07500_a1-pure.cl b/OpenCL/m07500_a1-pure.cl index 1dd0a27fe..ae1bbe0c0 100644 --- a/OpenCL/m07500_a1-pure.cl +++ b/OpenCL/m07500_a1-pure.cl @@ -6,11 +6,13 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5pa { diff --git a/OpenCL/m07500_a3-optimized.cl b/OpenCL/m07500_a3-optimized.cl index 78f6f2e95..89cbf3b30 100644 --- a/OpenCL/m07500_a3-optimized.cl +++ b/OpenCL/m07500_a3-optimized.cl @@ -6,12 +6,14 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5pa { diff --git a/OpenCL/m07500_a3-pure.cl b/OpenCL/m07500_a3-pure.cl index c6eb1bcf5..ad3bdfac0 100644 --- a/OpenCL/m07500_a3-pure.cl +++ b/OpenCL/m07500_a3-pure.cl @@ -6,11 +6,13 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5pa { diff --git a/OpenCL/m07700_a0-optimized.cl b/OpenCL/m07700_a0-optimized.cl index 083451346..bf24c1ac6 100644 --- a/OpenCL/m07700_a0-optimized.cl +++ b/OpenCL/m07700_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff) #define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8)))) diff --git a/OpenCL/m07700_a1-optimized.cl b/OpenCL/m07700_a1-optimized.cl index d1e881094..0b7de13a8 100644 --- a/OpenCL/m07700_a1-optimized.cl +++ b/OpenCL/m07700_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff) #define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8)))) diff --git a/OpenCL/m07700_a3-optimized.cl b/OpenCL/m07700_a3-optimized.cl index cd217d3df..bbc87f477 100644 --- a/OpenCL/m07700_a3-optimized.cl +++ b/OpenCL/m07700_a3-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff) #define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8)))) diff --git a/OpenCL/m07701_a0-optimized.cl b/OpenCL/m07701_a0-optimized.cl index c3f144212..f7393b769 100644 --- a/OpenCL/m07701_a0-optimized.cl +++ b/OpenCL/m07701_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff) #define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8)))) diff --git a/OpenCL/m07701_a1-optimized.cl b/OpenCL/m07701_a1-optimized.cl index 4eb16112b..b6194b9a3 100644 --- a/OpenCL/m07701_a1-optimized.cl +++ b/OpenCL/m07701_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff) #define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8)))) diff --git a/OpenCL/m07701_a3-optimized.cl b/OpenCL/m07701_a3-optimized.cl index 9684e9053..0550d781d 100644 --- a/OpenCL/m07701_a3-optimized.cl +++ b/OpenCL/m07701_a3-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define GETCHAR(a,p) (((a)[(p) / 4] >> (((p) & 3) * 8)) & 0xff) #define PUTCHAR(a,p,c) ((a)[(p) / 4] = (((a)[(p) / 4] & ~(0xff << (((p) & 3) * 8))) | ((c) << (((p) & 3) * 8)))) diff --git a/OpenCL/m07800_a0-optimized.cl b/OpenCL/m07800_a0-optimized.cl index 2b0205028..c68100907 100644 --- a/OpenCL/m07800_a0-optimized.cl +++ b/OpenCL/m07800_a0-optimized.cl @@ -6,6 +6,7 @@ //incompatible data-dependant code //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __constant u32a theMagicArray[64] = { diff --git a/OpenCL/m07800_a1-optimized.cl b/OpenCL/m07800_a1-optimized.cl index 928e1d8a9..7b349656e 100644 --- a/OpenCL/m07800_a1-optimized.cl +++ b/OpenCL/m07800_a1-optimized.cl @@ -6,11 +6,13 @@ //incompatible data-dependant code //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __constant u32a theMagicArray[64] = { diff --git a/OpenCL/m07800_a3-optimized.cl b/OpenCL/m07800_a3-optimized.cl index 6bb162b3d..5c07ce01f 100644 --- a/OpenCL/m07800_a3-optimized.cl +++ b/OpenCL/m07800_a3-optimized.cl @@ -6,11 +6,13 @@ //incompatible data-dependant code //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __constant u32a theMagicArray[64] = { diff --git a/OpenCL/m07801_a0-optimized.cl b/OpenCL/m07801_a0-optimized.cl index 100d3e053..3d0912ced 100644 --- a/OpenCL/m07801_a0-optimized.cl +++ b/OpenCL/m07801_a0-optimized.cl @@ -6,6 +6,7 @@ //incompatible data-dependant code //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __constant u32a theMagicArray[64] = { diff --git a/OpenCL/m07801_a1-optimized.cl b/OpenCL/m07801_a1-optimized.cl index 7e0ba2a8c..f6f3426f3 100644 --- a/OpenCL/m07801_a1-optimized.cl +++ b/OpenCL/m07801_a1-optimized.cl @@ -6,11 +6,13 @@ //incompatible data-dependant code //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __constant u32a theMagicArray[64] = { diff --git a/OpenCL/m07801_a3-optimized.cl b/OpenCL/m07801_a3-optimized.cl index 3f616e001..a37597375 100644 --- a/OpenCL/m07801_a3-optimized.cl +++ b/OpenCL/m07801_a3-optimized.cl @@ -6,11 +6,13 @@ //incompatible data-dependant code //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __constant u32a theMagicArray[64] = { diff --git a/OpenCL/m07900-pure.cl b/OpenCL/m07900-pure.cl index a2a488c43..b0a428d79 100644 --- a/OpenCL/m07900-pure.cl +++ b/OpenCL/m07900-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha512.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -236,5 +238,7 @@ __kernel void m07900_comp (KERN_ATTR_TMPS (drupal7_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m08000_a0-optimized.cl b/OpenCL/m08000_a0-optimized.cl index 47871f249..b3dcac0f4 100644 --- a/OpenCL/m08000_a0-optimized.cl +++ b/OpenCL/m08000_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif DECLSPEC void sha256_transform_m (u32x *digest, const u32x *w) { diff --git a/OpenCL/m08000_a1-optimized.cl b/OpenCL/m08000_a1-optimized.cl index 199f0bab0..379e8a2c2 100644 --- a/OpenCL/m08000_a1-optimized.cl +++ b/OpenCL/m08000_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif DECLSPEC void sha256_transform_m (u32x *digest, const u32x *w) { diff --git a/OpenCL/m08000_a3-optimized.cl b/OpenCL/m08000_a3-optimized.cl index 674867950..617f72e88 100644 --- a/OpenCL/m08000_a3-optimized.cl +++ b/OpenCL/m08000_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif DECLSPEC void sha256_transform_m (u32x *digest, const u32x *w) { diff --git a/OpenCL/m08100_a0-optimized.cl b/OpenCL/m08100_a0-optimized.cl index 454a32286..a91c2a793 100644 --- a/OpenCL/m08100_a0-optimized.cl +++ b/OpenCL/m08100_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08100_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m08100_a0-pure.cl b/OpenCL/m08100_a0-pure.cl index 430c05d50..2276447fa 100644 --- a/OpenCL/m08100_a0-pure.cl +++ b/OpenCL/m08100_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08100_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m08100_a1-optimized.cl b/OpenCL/m08100_a1-optimized.cl index 66b8c4e49..e72c2ee7c 100644 --- a/OpenCL/m08100_a1-optimized.cl +++ b/OpenCL/m08100_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08100_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m08100_a1-pure.cl b/OpenCL/m08100_a1-pure.cl index 08e78abf0..1b969834f 100644 --- a/OpenCL/m08100_a1-pure.cl +++ b/OpenCL/m08100_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08100_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m08100_a3-optimized.cl b/OpenCL/m08100_a3-optimized.cl index e6b03191b..8ffaef5ef 100644 --- a/OpenCL/m08100_a3-optimized.cl +++ b/OpenCL/m08100_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m08100m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m08100_a3-pure.cl b/OpenCL/m08100_a3-pure.cl index 686d57155..c4cdc633d 100644 --- a/OpenCL/m08100_a3-pure.cl +++ b/OpenCL/m08100_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08100_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m08200-pure.cl b/OpenCL/m08200-pure.cl index 75e3c65f0..e583aea11 100644 --- a/OpenCL/m08200-pure.cl +++ b/OpenCL/m08200-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" #include "inc_hash_sha512.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -369,5 +371,7 @@ __kernel void m08200_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, cloudkey_t #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m08300_a0-optimized.cl b/OpenCL/m08300_a0-optimized.cl index 45b4a0970..38cc40e13 100644 --- a/OpenCL/m08300_a0-optimized.cl +++ b/OpenCL/m08300_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08300_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m08300_a0-pure.cl b/OpenCL/m08300_a0-pure.cl index fe4b81af3..bca2508ff 100644 --- a/OpenCL/m08300_a0-pure.cl +++ b/OpenCL/m08300_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08300_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m08300_a1-optimized.cl b/OpenCL/m08300_a1-optimized.cl index fa36f737a..940a5aba3 100644 --- a/OpenCL/m08300_a1-optimized.cl +++ b/OpenCL/m08300_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08300_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m08300_a1-pure.cl b/OpenCL/m08300_a1-pure.cl index 0af95fa4e..d17cc98e4 100644 --- a/OpenCL/m08300_a1-pure.cl +++ b/OpenCL/m08300_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08300_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m08300_a3-optimized.cl b/OpenCL/m08300_a3-optimized.cl index 53771b438..16e483d4e 100644 --- a/OpenCL/m08300_a3-optimized.cl +++ b/OpenCL/m08300_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m08300m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m08300_a3-pure.cl b/OpenCL/m08300_a3-pure.cl index afd4a840b..19961afd7 100644 --- a/OpenCL/m08300_a3-pure.cl +++ b/OpenCL/m08300_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m08300_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m08400_a0-optimized.cl b/OpenCL/m08400_a0-optimized.cl index 6e6ce5949..7e2f58200 100644 --- a/OpenCL/m08400_a0-optimized.cl +++ b/OpenCL/m08400_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m08400_a0-pure.cl b/OpenCL/m08400_a0-pure.cl index 8449d40a3..58c1c53bc 100644 --- a/OpenCL/m08400_a0-pure.cl +++ b/OpenCL/m08400_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m08400_a1-optimized.cl b/OpenCL/m08400_a1-optimized.cl index 9b93213e6..8475cb8b3 100644 --- a/OpenCL/m08400_a1-optimized.cl +++ b/OpenCL/m08400_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m08400_a1-pure.cl b/OpenCL/m08400_a1-pure.cl index a67de987d..031a5667f 100644 --- a/OpenCL/m08400_a1-pure.cl +++ b/OpenCL/m08400_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m08400_a3-optimized.cl b/OpenCL/m08400_a3-optimized.cl index fb32bf32a..aa0a04b8a 100644 --- a/OpenCL/m08400_a3-optimized.cl +++ b/OpenCL/m08400_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m08400_a3-pure.cl b/OpenCL/m08400_a3-pure.cl index 7d7dd16f6..bf66eb80b 100644 --- a/OpenCL/m08400_a3-pure.cl +++ b/OpenCL/m08400_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m08500_a0-pure.cl b/OpenCL/m08500_a0-pure.cl index 3f0c23f02..6a63c9790 100644 --- a/OpenCL/m08500_a0-pure.cl +++ b/OpenCL/m08500_a0-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp.h" #include "inc_rp.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m08500_a1-pure.cl b/OpenCL/m08500_a1-pure.cl index e9297b35d..7e2730808 100644 --- a/OpenCL/m08500_a1-pure.cl +++ b/OpenCL/m08500_a1-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m08500_a3-pure.cl b/OpenCL/m08500_a3-pure.cl index 29cde149d..616e6555b 100644 --- a/OpenCL/m08500_a3-pure.cl +++ b/OpenCL/m08500_a3-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m08600_a0-pure.cl b/OpenCL/m08600_a0-pure.cl index 5389ae3cd..0223051fa 100644 --- a/OpenCL/m08600_a0-pure.cl +++ b/OpenCL/m08600_a0-pure.cl @@ -6,12 +6,14 @@ //incompatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp.h" #include "inc_rp.cl" #include "inc_simd.cl" +#endif __constant u32a lotus_magic_table[256] = { diff --git a/OpenCL/m08600_a1-pure.cl b/OpenCL/m08600_a1-pure.cl index 54aaed2f7..6d1138ed8 100644 --- a/OpenCL/m08600_a1-pure.cl +++ b/OpenCL/m08600_a1-pure.cl @@ -6,10 +6,12 @@ //incompatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u32a lotus_magic_table[256] = { diff --git a/OpenCL/m08600_a3-pure.cl b/OpenCL/m08600_a3-pure.cl index 0e89f69e8..090c30368 100644 --- a/OpenCL/m08600_a3-pure.cl +++ b/OpenCL/m08600_a3-pure.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u32a lotus_magic_table[256] = { diff --git a/OpenCL/m08700_a0-optimized.cl b/OpenCL/m08700_a0-optimized.cl index 4e7ca3970..7f7083437 100644 --- a/OpenCL/m08700_a0-optimized.cl +++ b/OpenCL/m08700_a0-optimized.cl @@ -6,12 +6,14 @@ //incompatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u32a lotus_magic_table[256] = { diff --git a/OpenCL/m08700_a1-optimized.cl b/OpenCL/m08700_a1-optimized.cl index 55fe47f93..771fa617c 100644 --- a/OpenCL/m08700_a1-optimized.cl +++ b/OpenCL/m08700_a1-optimized.cl @@ -6,10 +6,12 @@ //incompatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u32a lotus_magic_table[256] = { diff --git a/OpenCL/m08700_a3-optimized.cl b/OpenCL/m08700_a3-optimized.cl index ee524a31f..c554f1ef0 100644 --- a/OpenCL/m08700_a3-optimized.cl +++ b/OpenCL/m08700_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u32a lotus_magic_table[256] = { diff --git a/OpenCL/m08800-pure.cl b/OpenCL/m08800-pure.cl index c4290da60..1ea3f1eeb 100644 --- a/OpenCL/m08800-pure.cl +++ b/OpenCL/m08800-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif typedef struct androidfde_tmp { diff --git a/OpenCL/m08900-pure.cl b/OpenCL/m08900-pure.cl index cdbfb6ec3..14cddaa86 100644 --- a/OpenCL/m08900-pure.cl +++ b/OpenCL/m08900-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -403,5 +405,7 @@ __kernel void m08900_comp (KERN_ATTR_TMPS (scrypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m09000-pure.cl b/OpenCL/m09000-pure.cl index cb58840c6..380313c6d 100644 --- a/OpenCL/m09000-pure.cl +++ b/OpenCL/m09000-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -693,5 +695,7 @@ __kernel void m09000_comp (KERN_ATTR_TMPS (pwsafe2_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m09100-pure.cl b/OpenCL/m09100-pure.cl index 29b42ad92..241eb9dbb 100644 --- a/OpenCL/m09100-pure.cl +++ b/OpenCL/m09100-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -766,5 +768,7 @@ __kernel void m09100_comp (KERN_ATTR_TMPS (lotus8_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m09400-pure.cl b/OpenCL/m09400-pure.cl index 5b01555e4..3316f87ca 100644 --- a/OpenCL/m09400-pure.cl +++ b/OpenCL/m09400-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -329,7 +331,9 @@ __kernel void m09400_comp (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t) const u32 r2 = out[2]; const u32 r3 = out[3]; + #ifdef KERNEL_STATIC #define il_pos 0 + #endif #include COMPARE_M } @@ -427,6 +431,8 @@ __kernel void m09400_comp (KERN_ATTR_TMPS_ESALT (office2007_tmp_t, office2007_t) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } } diff --git a/OpenCL/m09500-pure.cl b/OpenCL/m09500-pure.cl index 570a7ab8b..86b9caccd 100644 --- a/OpenCL/m09500-pure.cl +++ b/OpenCL/m09500-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -339,5 +341,7 @@ __kernel void m09500_comp (KERN_ATTR_TMPS_ESALT (office2010_tmp_t, office2010_t) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m09600-pure.cl b/OpenCL/m09600-pure.cl index 5533c5820..a081ede63 100644 --- a/OpenCL/m09600-pure.cl +++ b/OpenCL/m09600-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -458,5 +460,7 @@ __kernel void m09600_comp (KERN_ATTR_TMPS_ESALT (office2013_tmp_t, office2013_t) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m09700_a0-optimized.cl b/OpenCL/m09700_a0-optimized.cl index b12048142..de4085a90 100644 --- a/OpenCL/m09700_a0-optimized.cl +++ b/OpenCL/m09700_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct oldoffice01 { diff --git a/OpenCL/m09700_a1-optimized.cl b/OpenCL/m09700_a1-optimized.cl index cbd49896a..d0f3e150f 100644 --- a/OpenCL/m09700_a1-optimized.cl +++ b/OpenCL/m09700_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct oldoffice01 { diff --git a/OpenCL/m09700_a3-optimized.cl b/OpenCL/m09700_a3-optimized.cl index 79893b00d..6378688a6 100644 --- a/OpenCL/m09700_a3-optimized.cl +++ b/OpenCL/m09700_a3-optimized.cl @@ -3,11 +3,13 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct oldoffice01 { diff --git a/OpenCL/m09710_a0-optimized.cl b/OpenCL/m09710_a0-optimized.cl index ae0400516..638e697a3 100644 --- a/OpenCL/m09710_a0-optimized.cl +++ b/OpenCL/m09710_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct oldoffice01 { diff --git a/OpenCL/m09710_a1-optimized.cl b/OpenCL/m09710_a1-optimized.cl index 6df8c1d15..29cb342ef 100644 --- a/OpenCL/m09710_a1-optimized.cl +++ b/OpenCL/m09710_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct oldoffice01 { diff --git a/OpenCL/m09710_a3-optimized.cl b/OpenCL/m09710_a3-optimized.cl index c4712d3fc..dff28cfa7 100644 --- a/OpenCL/m09710_a3-optimized.cl +++ b/OpenCL/m09710_a3-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct oldoffice01 { diff --git a/OpenCL/m09720_a0-optimized.cl b/OpenCL/m09720_a0-optimized.cl index 0d9fe56ef..a7764d152 100644 --- a/OpenCL/m09720_a0-optimized.cl +++ b/OpenCL/m09720_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct oldoffice01 { diff --git a/OpenCL/m09720_a1-optimized.cl b/OpenCL/m09720_a1-optimized.cl index 7fb8a3f33..6ada235a0 100644 --- a/OpenCL/m09720_a1-optimized.cl +++ b/OpenCL/m09720_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct oldoffice01 { diff --git a/OpenCL/m09720_a3-optimized.cl b/OpenCL/m09720_a3-optimized.cl index 734ac06b6..3662850ff 100644 --- a/OpenCL/m09720_a3-optimized.cl +++ b/OpenCL/m09720_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct oldoffice01 { diff --git a/OpenCL/m09800_a0-optimized.cl b/OpenCL/m09800_a0-optimized.cl index 25cf7f8a1..9cbf439aa 100644 --- a/OpenCL/m09800_a0-optimized.cl +++ b/OpenCL/m09800_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct oldoffice34 { diff --git a/OpenCL/m09800_a1-optimized.cl b/OpenCL/m09800_a1-optimized.cl index d489f69ad..b15d3b8ff 100644 --- a/OpenCL/m09800_a1-optimized.cl +++ b/OpenCL/m09800_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct oldoffice34 { diff --git a/OpenCL/m09800_a3-optimized.cl b/OpenCL/m09800_a3-optimized.cl index 486a4e805..359873112 100644 --- a/OpenCL/m09800_a3-optimized.cl +++ b/OpenCL/m09800_a3-optimized.cl @@ -3,11 +3,13 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct oldoffice34 { diff --git a/OpenCL/m09810_a0-optimized.cl b/OpenCL/m09810_a0-optimized.cl index 024a6d422..f29aa09f0 100644 --- a/OpenCL/m09810_a0-optimized.cl +++ b/OpenCL/m09810_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct oldoffice34 { diff --git a/OpenCL/m09810_a1-optimized.cl b/OpenCL/m09810_a1-optimized.cl index 80c8b5d4e..8216745f3 100644 --- a/OpenCL/m09810_a1-optimized.cl +++ b/OpenCL/m09810_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct oldoffice34 { diff --git a/OpenCL/m09810_a3-optimized.cl b/OpenCL/m09810_a3-optimized.cl index f06e7acaa..c88e8e6b0 100644 --- a/OpenCL/m09810_a3-optimized.cl +++ b/OpenCL/m09810_a3-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct oldoffice34 { diff --git a/OpenCL/m09820_a0-optimized.cl b/OpenCL/m09820_a0-optimized.cl index 761feb292..76febadfb 100644 --- a/OpenCL/m09820_a0-optimized.cl +++ b/OpenCL/m09820_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct oldoffice34 { diff --git a/OpenCL/m09820_a1-optimized.cl b/OpenCL/m09820_a1-optimized.cl index def31b5f3..48b424ac4 100644 --- a/OpenCL/m09820_a1-optimized.cl +++ b/OpenCL/m09820_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct oldoffice34 { diff --git a/OpenCL/m09820_a3-optimized.cl b/OpenCL/m09820_a3-optimized.cl index 84f76f0ea..ecb6fa4d6 100644 --- a/OpenCL/m09820_a3-optimized.cl +++ b/OpenCL/m09820_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct oldoffice34 { diff --git a/OpenCL/m09900_a0-optimized.cl b/OpenCL/m09900_a0-optimized.cl index f6eeda8b5..f20dd95c5 100644 --- a/OpenCL/m09900_a0-optimized.cl +++ b/OpenCL/m09900_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m09900_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m09900_a0-pure.cl b/OpenCL/m09900_a0-pure.cl index 5f89fac71..37482f661 100644 --- a/OpenCL/m09900_a0-pure.cl +++ b/OpenCL/m09900_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m09900_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m09900_a1-optimized.cl b/OpenCL/m09900_a1-optimized.cl index d070f2422..0c2b2e447 100644 --- a/OpenCL/m09900_a1-optimized.cl +++ b/OpenCL/m09900_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m09900_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m09900_a1-pure.cl b/OpenCL/m09900_a1-pure.cl index 02274eb20..941b0d7b2 100644 --- a/OpenCL/m09900_a1-pure.cl +++ b/OpenCL/m09900_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m09900_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m09900_a3-optimized.cl b/OpenCL/m09900_a3-optimized.cl index c2666379e..5b0c6a634 100644 --- a/OpenCL/m09900_a3-optimized.cl +++ b/OpenCL/m09900_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void m09900m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m09900_a3-pure.cl b/OpenCL/m09900_a3-pure.cl index fbb2c811e..1f243072e 100644 --- a/OpenCL/m09900_a3-pure.cl +++ b/OpenCL/m09900_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m09900_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m10100_a0-optimized.cl b/OpenCL/m10100_a0-optimized.cl index f487d28bc..63847175e 100644 --- a/OpenCL/m10100_a0-optimized.cl +++ b/OpenCL/m10100_a0-optimized.cl @@ -6,12 +6,14 @@ //incompatible to simd //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif #define SIPROUND(v0,v1,v2,v3) \ (v0) += (v1); \ diff --git a/OpenCL/m10100_a1-optimized.cl b/OpenCL/m10100_a1-optimized.cl index 83ca8e8a3..3037d1815 100644 --- a/OpenCL/m10100_a1-optimized.cl +++ b/OpenCL/m10100_a1-optimized.cl @@ -6,10 +6,12 @@ //incompatible to simd //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define SIPROUND(v0,v1,v2,v3) \ (v0) += (v1); \ diff --git a/OpenCL/m10100_a3-optimized.cl b/OpenCL/m10100_a3-optimized.cl index 0c8ce7b46..3a834c85d 100644 --- a/OpenCL/m10100_a3-optimized.cl +++ b/OpenCL/m10100_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define SIPROUND(v0,v1,v2,v3) \ (v0) += (v1); \ diff --git a/OpenCL/m10300-pure.cl b/OpenCL/m10300-pure.cl index 1dfe8d907..60bb8a3c1 100644 --- a/OpenCL/m10300-pure.cl +++ b/OpenCL/m10300-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -147,5 +149,7 @@ __kernel void m10300_comp (KERN_ATTR_TMPS (saph_sha1_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m10400_a0-optimized.cl b/OpenCL/m10400_a0-optimized.cl index 6cd76d74d..03986059b 100644 --- a/OpenCL/m10400_a0-optimized.cl +++ b/OpenCL/m10400_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __constant u32a padding[8] = { diff --git a/OpenCL/m10400_a1-optimized.cl b/OpenCL/m10400_a1-optimized.cl index 3bf4e6c05..f3fab8059 100644 --- a/OpenCL/m10400_a1-optimized.cl +++ b/OpenCL/m10400_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __constant u32a padding[8] = { diff --git a/OpenCL/m10400_a3-optimized.cl b/OpenCL/m10400_a3-optimized.cl index 75649851c..cad8ecfbc 100644 --- a/OpenCL/m10400_a3-optimized.cl +++ b/OpenCL/m10400_a3-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __constant u32a padding[8] = { diff --git a/OpenCL/m10410_a0-optimized.cl b/OpenCL/m10410_a0-optimized.cl index 7895a82fa..97f5f3523 100644 --- a/OpenCL/m10410_a0-optimized.cl +++ b/OpenCL/m10410_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __constant u32a padding[8] = { diff --git a/OpenCL/m10410_a1-optimized.cl b/OpenCL/m10410_a1-optimized.cl index c0ddeaaa1..61fcb8231 100644 --- a/OpenCL/m10410_a1-optimized.cl +++ b/OpenCL/m10410_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __constant u32a padding[8] = { diff --git a/OpenCL/m10410_a3-optimized.cl b/OpenCL/m10410_a3-optimized.cl index 593e0b9fc..e62051043 100644 --- a/OpenCL/m10410_a3-optimized.cl +++ b/OpenCL/m10410_a3-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __constant u32a padding[8] = { diff --git a/OpenCL/m10420_a0-optimized.cl b/OpenCL/m10420_a0-optimized.cl index 3eec2e650..97d91e064 100644 --- a/OpenCL/m10420_a0-optimized.cl +++ b/OpenCL/m10420_a0-optimized.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __constant u32a padding[8] = { diff --git a/OpenCL/m10420_a1-optimized.cl b/OpenCL/m10420_a1-optimized.cl index 7f3f47b4b..56f670b7b 100644 --- a/OpenCL/m10420_a1-optimized.cl +++ b/OpenCL/m10420_a1-optimized.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __constant u32a padding[8] = { diff --git a/OpenCL/m10420_a3-optimized.cl b/OpenCL/m10420_a3-optimized.cl index 8d7015e06..65449e879 100644 --- a/OpenCL/m10420_a3-optimized.cl +++ b/OpenCL/m10420_a3-optimized.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __constant u32a padding[8] = { diff --git a/OpenCL/m10500-pure.cl b/OpenCL/m10500-pure.cl index 27596a9bb..073c0b917 100644 --- a/OpenCL/m10500-pure.cl +++ b/OpenCL/m10500-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -485,5 +487,7 @@ __kernel void m10500_comp (KERN_ATTR_TMPS_ESALT (pdf14_tmp_t, pdf_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m10700-optimized.cl b/OpenCL/m10700-optimized.cl index c2849e7d8..0cec176e6 100644 --- a/OpenCL/m10700-optimized.cl +++ b/OpenCL/m10700-optimized.cl @@ -3,6 +3,7 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -10,6 +11,7 @@ #include "inc_hash_sha384.cl" #include "inc_hash_sha512.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -702,5 +704,7 @@ __kernel void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m10700-pure.cl b/OpenCL/m10700-pure.cl index af2e2fd18..8be2fa8d1 100644 --- a/OpenCL/m10700-pure.cl +++ b/OpenCL/m10700-pure.cl @@ -3,6 +3,7 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -10,6 +11,7 @@ #include "inc_hash_sha384.cl" #include "inc_hash_sha512.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -1281,5 +1283,7 @@ __kernel void m10700_comp (KERN_ATTR_TMPS_ESALT (pdf17l8_tmp_t, pdf_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m10800_a0-optimized.cl b/OpenCL/m10800_a0-optimized.cl index 5c278b50f..7385f6986 100644 --- a/OpenCL/m10800_a0-optimized.cl +++ b/OpenCL/m10800_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha384.cl" +#endif DECLSPEC void sha384_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m10800_a0-pure.cl b/OpenCL/m10800_a0-pure.cl index f4ecd1867..9fcaf782a 100644 --- a/OpenCL/m10800_a0-pure.cl +++ b/OpenCL/m10800_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha384.cl" +#endif __kernel void m10800_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m10800_a1-optimized.cl b/OpenCL/m10800_a1-optimized.cl index b20d87b5c..2c8c07f63 100644 --- a/OpenCL/m10800_a1-optimized.cl +++ b/OpenCL/m10800_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha384.cl" +#endif DECLSPEC void sha384_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m10800_a1-pure.cl b/OpenCL/m10800_a1-pure.cl index 556561da1..8dda4d801 100644 --- a/OpenCL/m10800_a1-pure.cl +++ b/OpenCL/m10800_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha384.cl" +#endif __kernel void m10800_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m10800_a3-optimized.cl b/OpenCL/m10800_a3-optimized.cl index 81a2bd1f7..3e475e4a6 100644 --- a/OpenCL/m10800_a3-optimized.cl +++ b/OpenCL/m10800_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha384.cl" +#endif DECLSPEC void sha384_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u64x *digest) { diff --git a/OpenCL/m10800_a3-pure.cl b/OpenCL/m10800_a3-pure.cl index e1697ebf3..f52d4d82d 100644 --- a/OpenCL/m10800_a3-pure.cl +++ b/OpenCL/m10800_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha384.cl" +#endif __kernel void m10800_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m10900-pure.cl b/OpenCL/m10900-pure.cl index 2394e95eb..2a0a7c5ee 100644 --- a/OpenCL/m10900-pure.cl +++ b/OpenCL/m10900-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -281,5 +283,7 @@ __kernel void m10900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m11000_a0-optimized.cl b/OpenCL/m11000_a0-optimized.cl index b00f540ed..3764d45c4 100644 --- a/OpenCL/m11000_a0-optimized.cl +++ b/OpenCL/m11000_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m11000_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11000_a0-pure.cl b/OpenCL/m11000_a0-pure.cl index f03f036aa..18585ff4c 100644 --- a/OpenCL/m11000_a0-pure.cl +++ b/OpenCL/m11000_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m11000_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11000_a1-optimized.cl b/OpenCL/m11000_a1-optimized.cl index d934ecb87..439a5592c 100644 --- a/OpenCL/m11000_a1-optimized.cl +++ b/OpenCL/m11000_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m11000_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11000_a1-pure.cl b/OpenCL/m11000_a1-pure.cl index 6c2bf747c..f42321914 100644 --- a/OpenCL/m11000_a1-pure.cl +++ b/OpenCL/m11000_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif __kernel void m11000_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11000_a3-optimized.cl b/OpenCL/m11000_a3-optimized.cl index a1d6840cf..c9ea6b74f 100644 --- a/OpenCL/m11000_a3-optimized.cl +++ b/OpenCL/m11000_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void m11000m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11000_a3-pure.cl b/OpenCL/m11000_a3-pure.cl index 8dea1af0c..b3a46eb84 100644 --- a/OpenCL/m11000_a3-pure.cl +++ b/OpenCL/m11000_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m11000_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m11100_a0-optimized.cl b/OpenCL/m11100_a0-optimized.cl index fb70a12c7..4f4e328cf 100644 --- a/OpenCL/m11100_a0-optimized.cl +++ b/OpenCL/m11100_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11100_a0-pure.cl b/OpenCL/m11100_a0-pure.cl index 4c14f29f4..c13cc7eed 100644 --- a/OpenCL/m11100_a0-pure.cl +++ b/OpenCL/m11100_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11100_a1-optimized.cl b/OpenCL/m11100_a1-optimized.cl index c28987a4f..0a9c38c9d 100644 --- a/OpenCL/m11100_a1-optimized.cl +++ b/OpenCL/m11100_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11100_a1-pure.cl b/OpenCL/m11100_a1-pure.cl index 000bcfe07..e39eb283b 100644 --- a/OpenCL/m11100_a1-pure.cl +++ b/OpenCL/m11100_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11100_a3-optimized.cl b/OpenCL/m11100_a3-optimized.cl index baf191fa9..04e352b51 100644 --- a/OpenCL/m11100_a3-optimized.cl +++ b/OpenCL/m11100_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11100_a3-pure.cl b/OpenCL/m11100_a3-pure.cl index a88cd7ff1..b9e0c931e 100644 --- a/OpenCL/m11100_a3-pure.cl +++ b/OpenCL/m11100_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11200_a0-optimized.cl b/OpenCL/m11200_a0-optimized.cl index d6eedce03..6f7bd60d0 100644 --- a/OpenCL/m11200_a0-optimized.cl +++ b/OpenCL/m11200_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m11200_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11200_a0-pure.cl b/OpenCL/m11200_a0-pure.cl index e4d65de1d..273351b3e 100644 --- a/OpenCL/m11200_a0-pure.cl +++ b/OpenCL/m11200_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m11200_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11200_a1-optimized.cl b/OpenCL/m11200_a1-optimized.cl index 39962ff20..9d5dd59f7 100644 --- a/OpenCL/m11200_a1-optimized.cl +++ b/OpenCL/m11200_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m11200_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11200_a1-pure.cl b/OpenCL/m11200_a1-pure.cl index ce7674798..520e5071a 100644 --- a/OpenCL/m11200_a1-pure.cl +++ b/OpenCL/m11200_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m11200_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11200_a3-optimized.cl b/OpenCL/m11200_a3-optimized.cl index b92ffed92..e5ac0c38f 100644 --- a/OpenCL/m11200_a3-optimized.cl +++ b/OpenCL/m11200_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m11200m (u32 *w0, u32 *w1, u32 *w2, u32 *w3, const u32 pw_len, KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11200_a3-pure.cl b/OpenCL/m11200_a3-pure.cl index bd359ce3a..4cccad9de 100644 --- a/OpenCL/m11200_a3-pure.cl +++ b/OpenCL/m11200_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m11300-pure.cl b/OpenCL/m11300-pure.cl index 5daf0da9d..85780ceac 100644 --- a/OpenCL/m11300-pure.cl +++ b/OpenCL/m11300-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" #include "inc_cipher_aes.cl" +#endif typedef struct bitcoin_wallet_tmp { diff --git a/OpenCL/m11400_a0-pure.cl b/OpenCL/m11400_a0-pure.cl index 49f1b035b..9d9505c1c 100644 --- a/OpenCL/m11400_a0-pure.cl +++ b/OpenCL/m11400_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif typedef struct sip { diff --git a/OpenCL/m11400_a1-pure.cl b/OpenCL/m11400_a1-pure.cl index 44dc803c4..7674b62cc 100644 --- a/OpenCL/m11400_a1-pure.cl +++ b/OpenCL/m11400_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif typedef struct sip { diff --git a/OpenCL/m11400_a3-pure.cl b/OpenCL/m11400_a3-pure.cl index 24f07660c..2ed0eac80 100644 --- a/OpenCL/m11400_a3-pure.cl +++ b/OpenCL/m11400_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct sip { diff --git a/OpenCL/m11500_a0-optimized.cl b/OpenCL/m11500_a0-optimized.cl index 9ffdfd628..1300781f7 100644 --- a/OpenCL/m11500_a0-optimized.cl +++ b/OpenCL/m11500_a0-optimized.cl @@ -6,12 +6,14 @@ //incompatible because of branches //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u32a crc32tab[0x100] = { diff --git a/OpenCL/m11500_a1-optimized.cl b/OpenCL/m11500_a1-optimized.cl index 2e9a39a3a..8d15bb809 100644 --- a/OpenCL/m11500_a1-optimized.cl +++ b/OpenCL/m11500_a1-optimized.cl @@ -6,10 +6,12 @@ //incompatible because of branches //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u32a crc32tab[0x100] = { diff --git a/OpenCL/m11500_a3-optimized.cl b/OpenCL/m11500_a3-optimized.cl index 175b00b91..2074d2e9f 100644 --- a/OpenCL/m11500_a3-optimized.cl +++ b/OpenCL/m11500_a3-optimized.cl @@ -6,10 +6,12 @@ //incompatible because of branches //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u32a crc32tab[0x100] = { diff --git a/OpenCL/m11600-pure.cl b/OpenCL/m11600-pure.cl index 35aab93d3..364798993 100644 --- a/OpenCL/m11600-pure.cl +++ b/OpenCL/m11600-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha256.cl" +#endif typedef struct seven_zip_tmp { diff --git a/OpenCL/m11700_a0-optimized.cl b/OpenCL/m11700_a0-optimized.cl index 3408e0f96..ff09b0ac0 100644 --- a/OpenCL/m11700_a0-optimized.cl +++ b/OpenCL/m11700_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_streebog256.cl" +#endif #define INITVAL 0x0101010101010101 diff --git a/OpenCL/m11700_a0-pure.cl b/OpenCL/m11700_a0-pure.cl index 02c75c3db..6ccb7a607 100644 --- a/OpenCL/m11700_a0-pure.cl +++ b/OpenCL/m11700_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_streebog256.cl" +#endif __kernel void m11700_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11700_a1-optimized.cl b/OpenCL/m11700_a1-optimized.cl index 76fe46ea8..e61aaf51e 100644 --- a/OpenCL/m11700_a1-optimized.cl +++ b/OpenCL/m11700_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog256.cl" +#endif #define INITVAL 0x0101010101010101 diff --git a/OpenCL/m11700_a1-pure.cl b/OpenCL/m11700_a1-pure.cl index 095ebc4bf..6273dd821 100644 --- a/OpenCL/m11700_a1-pure.cl +++ b/OpenCL/m11700_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_streebog256.cl" +#endif __kernel void m11700_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11700_a3-optimized.cl b/OpenCL/m11700_a3-optimized.cl index 0816f04d1..4d7137af0 100644 --- a/OpenCL/m11700_a3-optimized.cl +++ b/OpenCL/m11700_a3-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog256.cl" +#endif #define INITVAL 0x0101010101010101 diff --git a/OpenCL/m11700_a3-pure.cl b/OpenCL/m11700_a3-pure.cl index 7e0145699..c7c4364c7 100644 --- a/OpenCL/m11700_a3-pure.cl +++ b/OpenCL/m11700_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog256.cl" +#endif __kernel void m11700_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m11750_a0-pure.cl b/OpenCL/m11750_a0-pure.cl index c46356a25..db7a3f5f7 100644 --- a/OpenCL/m11750_a0-pure.cl +++ b/OpenCL/m11750_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_streebog256.cl" +#endif __kernel void m11750_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11750_a1-pure.cl b/OpenCL/m11750_a1-pure.cl index aedb73c66..a7badd2d1 100644 --- a/OpenCL/m11750_a1-pure.cl +++ b/OpenCL/m11750_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_streebog256.cl" +#endif __kernel void m11750_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11750_a3-pure.cl b/OpenCL/m11750_a3-pure.cl index 6f62d205d..4e3f2ec6b 100644 --- a/OpenCL/m11750_a3-pure.cl +++ b/OpenCL/m11750_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog256.cl" +#endif __kernel void m11750_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m11760_a0-pure.cl b/OpenCL/m11760_a0-pure.cl index 6ae933825..fa9539193 100644 --- a/OpenCL/m11760_a0-pure.cl +++ b/OpenCL/m11760_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_streebog256.cl" +#endif __kernel void m11760_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11760_a1-pure.cl b/OpenCL/m11760_a1-pure.cl index b13607bb0..4329d064a 100644 --- a/OpenCL/m11760_a1-pure.cl +++ b/OpenCL/m11760_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_streebog256.cl" +#endif __kernel void m11760_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11760_a3-pure.cl b/OpenCL/m11760_a3-pure.cl index b6d0702d6..0830a5b69 100644 --- a/OpenCL/m11760_a3-pure.cl +++ b/OpenCL/m11760_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog256.cl" +#endif __kernel void m11760_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m11800_a0-optimized.cl b/OpenCL/m11800_a0-optimized.cl index 729ae3c4f..9db4eeb74 100644 --- a/OpenCL/m11800_a0-optimized.cl +++ b/OpenCL/m11800_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_streebog512.cl" +#endif #define INITVAL 0 diff --git a/OpenCL/m11800_a0-pure.cl b/OpenCL/m11800_a0-pure.cl index 78178e740..f50a82b9e 100644 --- a/OpenCL/m11800_a0-pure.cl +++ b/OpenCL/m11800_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_streebog512.cl" +#endif __kernel void m11800_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11800_a1-optimized.cl b/OpenCL/m11800_a1-optimized.cl index 59e59bb31..0faaae549 100644 --- a/OpenCL/m11800_a1-optimized.cl +++ b/OpenCL/m11800_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog512.cl" +#endif #define INITVAL 0 diff --git a/OpenCL/m11800_a1-pure.cl b/OpenCL/m11800_a1-pure.cl index 6322f02c3..02a175ce8 100644 --- a/OpenCL/m11800_a1-pure.cl +++ b/OpenCL/m11800_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_streebog512.cl" +#endif __kernel void m11800_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11800_a3-optimized.cl b/OpenCL/m11800_a3-optimized.cl index 19d27587d..fe0441343 100644 --- a/OpenCL/m11800_a3-optimized.cl +++ b/OpenCL/m11800_a3-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog512.cl" +#endif #define INITVAL 0 diff --git a/OpenCL/m11800_a3-pure.cl b/OpenCL/m11800_a3-pure.cl index 9d5486c2c..edbdd78cb 100644 --- a/OpenCL/m11800_a3-pure.cl +++ b/OpenCL/m11800_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog512.cl" +#endif __kernel void m11800_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m11850_a0-pure.cl b/OpenCL/m11850_a0-pure.cl index 6b743f987..11d9d252c 100644 --- a/OpenCL/m11850_a0-pure.cl +++ b/OpenCL/m11850_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_streebog512.cl" +#endif __kernel void m11850_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11850_a1-pure.cl b/OpenCL/m11850_a1-pure.cl index cf1a3d710..006fb1c5a 100644 --- a/OpenCL/m11850_a1-pure.cl +++ b/OpenCL/m11850_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_streebog512.cl" +#endif __kernel void m11850_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11850_a3-pure.cl b/OpenCL/m11850_a3-pure.cl index 4f22e7f4e..4479a590f 100644 --- a/OpenCL/m11850_a3-pure.cl +++ b/OpenCL/m11850_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog512.cl" +#endif __kernel void m11850_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m11860_a0-pure.cl b/OpenCL/m11860_a0-pure.cl index bba186083..9d76e79ae 100644 --- a/OpenCL/m11860_a0-pure.cl +++ b/OpenCL/m11860_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_streebog512.cl" +#endif __kernel void m11860_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m11860_a1-pure.cl b/OpenCL/m11860_a1-pure.cl index 98d9b289a..0ced7b79c 100644 --- a/OpenCL/m11860_a1-pure.cl +++ b/OpenCL/m11860_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_streebog512.cl" +#endif __kernel void m11860_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m11860_a3-pure.cl b/OpenCL/m11860_a3-pure.cl index 1fe825321..b0cff7e7a 100644 --- a/OpenCL/m11860_a3-pure.cl +++ b/OpenCL/m11860_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_streebog512.cl" +#endif __kernel void m11860_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m11900-pure.cl b/OpenCL/m11900-pure.cl index f608c8def..7c4bf887f 100644 --- a/OpenCL/m11900-pure.cl +++ b/OpenCL/m11900-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -229,5 +231,7 @@ __kernel void m11900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_md5_tmp_t, pbkdf2_md5_t) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m12000-pure.cl b/OpenCL/m12000-pure.cl index 27a508a07..4e922809c 100644 --- a/OpenCL/m12000-pure.cl +++ b/OpenCL/m12000-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -242,5 +244,7 @@ __kernel void m12000_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, pbkdf2_sha1_ #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m12200-pure.cl b/OpenCL/m12200-pure.cl index dd90dc6b2..595e51ca6 100644 --- a/OpenCL/m12200-pure.cl +++ b/OpenCL/m12200-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -180,5 +182,7 @@ __kernel void m12200_comp (KERN_ATTR_TMPS (ecryptfs_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m12300-pure.cl b/OpenCL/m12300-pure.cl index d35b39432..71bfbffc0 100644 --- a/OpenCL/m12300-pure.cl +++ b/OpenCL/m12300-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -429,5 +431,7 @@ __kernel void m12300_comp (KERN_ATTR_TMPS (oraclet_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m12400-pure.cl b/OpenCL/m12400-pure.cl index 20c00f9f0..baa46cb08 100644 --- a/OpenCL/m12400-pure.cl +++ b/OpenCL/m12400-pure.cl @@ -3,9 +3,11 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -782,5 +784,7 @@ __kernel void m12400_comp (KERN_ATTR_TMPS (bsdicrypt_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m12500-pure.cl b/OpenCL/m12500-pure.cl index 7f57b88b7..ddffa58de 100644 --- a/OpenCL/m12500-pure.cl +++ b/OpenCL/m12500-pure.cl @@ -3,11 +3,13 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha1.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -491,5 +493,7 @@ __kernel void m12500_comp (KERN_ATTR_TMPS_ESALT (rar3_tmp_t, pbkdf2_sha1_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m12600_a0-optimized.cl b/OpenCL/m12600_a0-optimized.cl index 3a81c6b44..eadb9400d 100644 --- a/OpenCL/m12600_a0-optimized.cl +++ b/OpenCL/m12600_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m12600_a0-pure.cl b/OpenCL/m12600_a0-pure.cl index be40e1180..84cd09854 100644 --- a/OpenCL/m12600_a0-pure.cl +++ b/OpenCL/m12600_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_scalar.cl" #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m12600_a1-optimized.cl b/OpenCL/m12600_a1-optimized.cl index 7dc599e5f..8cc0f2139 100644 --- a/OpenCL/m12600_a1-optimized.cl +++ b/OpenCL/m12600_a1-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m12600_a1-pure.cl b/OpenCL/m12600_a1-pure.cl index 31ecf96d5..d08146784 100644 --- a/OpenCL/m12600_a1-pure.cl +++ b/OpenCL/m12600_a1-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m12600_a3-optimized.cl b/OpenCL/m12600_a3-optimized.cl index e2d27500b..e9eccd863 100644 --- a/OpenCL/m12600_a3-optimized.cl +++ b/OpenCL/m12600_a3-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_upper8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m12600_a3-pure.cl b/OpenCL/m12600_a3-pure.cl index 8f564f91d..c25117d82 100644 --- a/OpenCL/m12600_a3-pure.cl +++ b/OpenCL/m12600_a3-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m12700-pure.cl b/OpenCL/m12700-pure.cl index ef64086c8..ec946b09e 100644 --- a/OpenCL/m12700-pure.cl +++ b/OpenCL/m12700-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -350,7 +352,9 @@ __kernel void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) const u32 r2 = data[2]; const u32 r3 = data[3]; + #ifdef KERNEL_STATIC #define il_pos 0 + #endif #include COMPARE_M } @@ -365,7 +369,9 @@ __kernel void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } // "share @@ -376,7 +382,9 @@ __kernel void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) const u32 r2 = data[2]; const u32 r3 = data[3]; + #ifdef KERNEL_STATIC #define il_pos 0 + #endif #include COMPARE_M } @@ -391,7 +399,9 @@ __kernel void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } // "addre @@ -404,7 +414,9 @@ __kernel void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } // "keys" @@ -417,7 +429,9 @@ __kernel void m12700_comp (KERN_ATTR_TMPS (mywallet_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } } } diff --git a/OpenCL/m12800-pure.cl b/OpenCL/m12800-pure.cl index deb7fdfe5..9d018bb48 100644 --- a/OpenCL/m12800-pure.cl +++ b/OpenCL/m12800-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -365,5 +367,7 @@ __kernel void m12800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m12900-pure.cl b/OpenCL/m12900-pure.cl index 6ebbbbce0..070e87462 100644 --- a/OpenCL/m12900-pure.cl +++ b/OpenCL/m12900-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -345,5 +347,7 @@ __kernel void m12900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m13000-pure.cl b/OpenCL/m13000-pure.cl index e53fef389..319e73265 100644 --- a/OpenCL/m13000-pure.cl +++ b/OpenCL/m13000-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -299,5 +301,7 @@ __kernel void m13000_comp (KERN_ATTR_TMPS (pbkdf2_sha256_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m13100_a0-optimized.cl b/OpenCL/m13100_a0-optimized.cl index 27b7557ff..7851e82e5 100644 --- a/OpenCL/m13100_a0-optimized.cl +++ b/OpenCL/m13100_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -14,6 +15,7 @@ #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5tgs { diff --git a/OpenCL/m13100_a0-pure.cl b/OpenCL/m13100_a0-pure.cl index ae27d3d25..acf3fe4f7 100644 --- a/OpenCL/m13100_a0-pure.cl +++ b/OpenCL/m13100_a0-pure.cl @@ -6,6 +6,7 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5tgs { diff --git a/OpenCL/m13100_a1-optimized.cl b/OpenCL/m13100_a1-optimized.cl index 8386feea8..c64da8db2 100644 --- a/OpenCL/m13100_a1-optimized.cl +++ b/OpenCL/m13100_a1-optimized.cl @@ -6,12 +6,14 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5tgs { diff --git a/OpenCL/m13100_a1-pure.cl b/OpenCL/m13100_a1-pure.cl index 668f0c991..afe866c3d 100644 --- a/OpenCL/m13100_a1-pure.cl +++ b/OpenCL/m13100_a1-pure.cl @@ -6,11 +6,13 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5tgs { diff --git a/OpenCL/m13100_a3-optimized.cl b/OpenCL/m13100_a3-optimized.cl index 2fc7b73d1..60fa57490 100644 --- a/OpenCL/m13100_a3-optimized.cl +++ b/OpenCL/m13100_a3-optimized.cl @@ -6,12 +6,14 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5tgs { diff --git a/OpenCL/m13100_a3-pure.cl b/OpenCL/m13100_a3-pure.cl index b107f858f..dbbba29ac 100644 --- a/OpenCL/m13100_a3-pure.cl +++ b/OpenCL/m13100_a3-pure.cl @@ -6,11 +6,13 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5tgs { diff --git a/OpenCL/m13200-pure.cl b/OpenCL/m13200-pure.cl index 00d499c2a..f48107322 100644 --- a/OpenCL/m13200-pure.cl +++ b/OpenCL/m13200-pure.cl @@ -3,11 +3,13 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha1.cl" #include "inc_cipher_aes.cl" +#endif typedef struct axcrypt_tmp { diff --git a/OpenCL/m13300_a0-optimized.cl b/OpenCL/m13300_a0-optimized.cl index edb2bd850..2560129f0 100644 --- a/OpenCL/m13300_a0-optimized.cl +++ b/OpenCL/m13300_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m13300_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m13300_a0-pure.cl b/OpenCL/m13300_a0-pure.cl index 359e4b06d..7ca0849a3 100644 --- a/OpenCL/m13300_a0-pure.cl +++ b/OpenCL/m13300_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m13300_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m13300_a1-optimized.cl b/OpenCL/m13300_a1-optimized.cl index 7552dfd7c..f067e2923 100644 --- a/OpenCL/m13300_a1-optimized.cl +++ b/OpenCL/m13300_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m13300_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m13300_a1-pure.cl b/OpenCL/m13300_a1-pure.cl index 0d16a1145..71cb3aae5 100644 --- a/OpenCL/m13300_a1-pure.cl +++ b/OpenCL/m13300_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m13300_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m13300_a3-optimized.cl b/OpenCL/m13300_a3-optimized.cl index 281bdb4f3..d7e764af7 100644 --- a/OpenCL/m13300_a3-optimized.cl +++ b/OpenCL/m13300_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m13300m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m13300_a3-pure.cl b/OpenCL/m13300_a3-pure.cl index 3dd31a378..d7400de5a 100644 --- a/OpenCL/m13300_a3-pure.cl +++ b/OpenCL/m13300_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m13300_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m13400-pure.cl b/OpenCL/m13400-pure.cl index 60bc3b341..380a4c016 100644 --- a/OpenCL/m13400-pure.cl +++ b/OpenCL/m13400-pure.cl @@ -3,12 +3,14 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" #include "inc_cipher_twofish.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -696,5 +698,7 @@ __kernel void m13400_comp (KERN_ATTR_TMPS_ESALT (keepass_tmp_t, keepass_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m13500_a0-optimized.cl b/OpenCL/m13500_a0-optimized.cl index 845dac235..e35ec1643 100644 --- a/OpenCL/m13500_a0-optimized.cl +++ b/OpenCL/m13500_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct pstoken { diff --git a/OpenCL/m13500_a0-pure.cl b/OpenCL/m13500_a0-pure.cl index b3ca83e66..38a1daa2e 100644 --- a/OpenCL/m13500_a0-pure.cl +++ b/OpenCL/m13500_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct pstoken { diff --git a/OpenCL/m13500_a1-optimized.cl b/OpenCL/m13500_a1-optimized.cl index e34a62153..ce7d3e706 100644 --- a/OpenCL/m13500_a1-optimized.cl +++ b/OpenCL/m13500_a1-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct pstoken { diff --git a/OpenCL/m13500_a1-pure.cl b/OpenCL/m13500_a1-pure.cl index 00cc63bc4..ecd7630a2 100644 --- a/OpenCL/m13500_a1-pure.cl +++ b/OpenCL/m13500_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct pstoken { diff --git a/OpenCL/m13500_a3-optimized.cl b/OpenCL/m13500_a3-optimized.cl index 58bf31caa..92dcbabda 100644 --- a/OpenCL/m13500_a3-optimized.cl +++ b/OpenCL/m13500_a3-optimized.cl @@ -6,11 +6,13 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct pstoken { diff --git a/OpenCL/m13500_a3-pure.cl b/OpenCL/m13500_a3-pure.cl index e657f81b1..bf6fb4585 100644 --- a/OpenCL/m13500_a3-pure.cl +++ b/OpenCL/m13500_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct pstoken { diff --git a/OpenCL/m13600-pure.cl b/OpenCL/m13600-pure.cl index 589914e9c..f7470da67 100644 --- a/OpenCL/m13600-pure.cl +++ b/OpenCL/m13600-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -372,5 +374,7 @@ __kernel void m13600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha1_tmp_t, zip2_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m13711-pure.cl b/OpenCL/m13711-pure.cl index 20aa31b36..e2b3f76cf 100644 --- a/OpenCL/m13711-pure.cl +++ b/OpenCL/m13711-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc_tmp { diff --git a/OpenCL/m13712-pure.cl b/OpenCL/m13712-pure.cl index 82cd300cb..03e5ecda2 100644 --- a/OpenCL/m13712-pure.cl +++ b/OpenCL/m13712-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc_tmp { diff --git a/OpenCL/m13713-pure.cl b/OpenCL/m13713-pure.cl index c2aab8f1c..230b667c5 100644 --- a/OpenCL/m13713-pure.cl +++ b/OpenCL/m13713-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc_tmp { diff --git a/OpenCL/m13721-pure.cl b/OpenCL/m13721-pure.cl index 642c38c3d..0cfed382e 100644 --- a/OpenCL/m13721-pure.cl +++ b/OpenCL/m13721-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc64_tmp { diff --git a/OpenCL/m13722-pure.cl b/OpenCL/m13722-pure.cl index e76fa4071..d0370a2d4 100644 --- a/OpenCL/m13722-pure.cl +++ b/OpenCL/m13722-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc64_tmp { diff --git a/OpenCL/m13723-pure.cl b/OpenCL/m13723-pure.cl index 805e39e2c..a44c1acc0 100644 --- a/OpenCL/m13723-pure.cl +++ b/OpenCL/m13723-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc64_tmp { diff --git a/OpenCL/m13731-pure.cl b/OpenCL/m13731-pure.cl index be2babb8b..f150a723f 100644 --- a/OpenCL/m13731-pure.cl +++ b/OpenCL/m13731-pure.cl @@ -8,6 +8,7 @@ //#undef LOCAL_MEM_TYPE //#define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc_tmp { diff --git a/OpenCL/m13732-pure.cl b/OpenCL/m13732-pure.cl index 8b4b379aa..c4f6e7433 100644 --- a/OpenCL/m13732-pure.cl +++ b/OpenCL/m13732-pure.cl @@ -8,6 +8,7 @@ //#undef LOCAL_MEM_TYPE //#define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc_tmp { diff --git a/OpenCL/m13733-pure.cl b/OpenCL/m13733-pure.cl index e882d13f8..d9482075c 100644 --- a/OpenCL/m13733-pure.cl +++ b/OpenCL/m13733-pure.cl @@ -8,6 +8,7 @@ //#undef LOCAL_MEM_TYPE //#define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc_tmp { diff --git a/OpenCL/m13751-pure.cl b/OpenCL/m13751-pure.cl index a255d94a5..3292c39b7 100644 --- a/OpenCL/m13751-pure.cl +++ b/OpenCL/m13751-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc_tmp { diff --git a/OpenCL/m13752-pure.cl b/OpenCL/m13752-pure.cl index ec0ae2c85..c10cfcffd 100644 --- a/OpenCL/m13752-pure.cl +++ b/OpenCL/m13752-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc_tmp { diff --git a/OpenCL/m13753-pure.cl b/OpenCL/m13753-pure.cl index 468a26625..9e57010f9 100644 --- a/OpenCL/m13753-pure.cl +++ b/OpenCL/m13753-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc_tmp { diff --git a/OpenCL/m13771-pure.cl b/OpenCL/m13771-pure.cl index 27228fa20..d05e2984a 100644 --- a/OpenCL/m13771-pure.cl +++ b/OpenCL/m13771-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc64_sbog_tmp { diff --git a/OpenCL/m13772-pure.cl b/OpenCL/m13772-pure.cl index 8cba6c2fc..958fc9845 100644 --- a/OpenCL/m13772-pure.cl +++ b/OpenCL/m13772-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc64_sbog_tmp { diff --git a/OpenCL/m13773-pure.cl b/OpenCL/m13773-pure.cl index 46afa39db..52c6d894a 100644 --- a/OpenCL/m13773-pure.cl +++ b/OpenCL/m13773-pure.cl @@ -8,6 +8,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_cipher_serpent.cl" #include "inc_cipher_camellia.cl" #include "inc_cipher_kuznyechik.cl" +#endif typedef struct vc { @@ -35,10 +37,12 @@ typedef struct vc } vc_t; +#ifdef KERNEL_STATIC #include "inc_truecrypt_keyfile.cl" #include "inc_truecrypt_crc32.cl" #include "inc_truecrypt_xts.cl" #include "inc_veracrypt_xts.cl" +#endif typedef struct vc64_sbog_tmp { diff --git a/OpenCL/m13800_a0-optimized.cl b/OpenCL/m13800_a0-optimized.cl index 22755bf5e..865cb8a21 100644 --- a/OpenCL/m13800_a0-optimized.cl +++ b/OpenCL/m13800_a0-optimized.cl @@ -6,6 +6,7 @@ //not compatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif typedef struct win8phone { diff --git a/OpenCL/m13800_a0-pure.cl b/OpenCL/m13800_a0-pure.cl index 796d38782..96132e6c1 100644 --- a/OpenCL/m13800_a0-pure.cl +++ b/OpenCL/m13800_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif typedef struct win8phone { diff --git a/OpenCL/m13800_a1-optimized.cl b/OpenCL/m13800_a1-optimized.cl index 81b2e0b5b..934ec8d43 100644 --- a/OpenCL/m13800_a1-optimized.cl +++ b/OpenCL/m13800_a1-optimized.cl @@ -6,11 +6,13 @@ //not compatible //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif typedef struct win8phone { diff --git a/OpenCL/m13800_a1-pure.cl b/OpenCL/m13800_a1-pure.cl index 2afad41dd..cbd0c6a4c 100644 --- a/OpenCL/m13800_a1-pure.cl +++ b/OpenCL/m13800_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif typedef struct win8phone { diff --git a/OpenCL/m13800_a3-optimized.cl b/OpenCL/m13800_a3-optimized.cl index d06b49365..628485509 100644 --- a/OpenCL/m13800_a3-optimized.cl +++ b/OpenCL/m13800_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif typedef struct win8phone { diff --git a/OpenCL/m13800_a3-pure.cl b/OpenCL/m13800_a3-pure.cl index b0d7acf16..276fc9d03 100644 --- a/OpenCL/m13800_a3-pure.cl +++ b/OpenCL/m13800_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif typedef struct win8phone { diff --git a/OpenCL/m13900_a0-optimized.cl b/OpenCL/m13900_a0-optimized.cl index 988fa4bbf..0c42ac5b4 100644 --- a/OpenCL/m13900_a0-optimized.cl +++ b/OpenCL/m13900_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m13900_a0-pure.cl b/OpenCL/m13900_a0-pure.cl index f965d810b..eb7ccb010 100644 --- a/OpenCL/m13900_a0-pure.cl +++ b/OpenCL/m13900_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m13900_a1-optimized.cl b/OpenCL/m13900_a1-optimized.cl index 4016b1e37..4a42886d2 100644 --- a/OpenCL/m13900_a1-optimized.cl +++ b/OpenCL/m13900_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m13900_a1-pure.cl b/OpenCL/m13900_a1-pure.cl index 31b3de0a1..80f7cfa5d 100644 --- a/OpenCL/m13900_a1-pure.cl +++ b/OpenCL/m13900_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m13900_a3-optimized.cl b/OpenCL/m13900_a3-optimized.cl index 297711529..47c47da20 100644 --- a/OpenCL/m13900_a3-optimized.cl +++ b/OpenCL/m13900_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m13900_a3-pure.cl b/OpenCL/m13900_a3-pure.cl index 7503acfa5..9b5bbdb25 100644 --- a/OpenCL/m13900_a3-pure.cl +++ b/OpenCL/m13900_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m14000_a0-pure.cl b/OpenCL/m14000_a0-pure.cl index 1bece0c35..28218680f 100644 --- a/OpenCL/m14000_a0-pure.cl +++ b/OpenCL/m14000_a0-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m14000_a1-pure.cl b/OpenCL/m14000_a1-pure.cl index 88e86f2b6..63f3f0463 100644 --- a/OpenCL/m14000_a1-pure.cl +++ b/OpenCL/m14000_a1-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m14000_a3-pure.cl b/OpenCL/m14000_a3-pure.cl index eabe397aa..a92c806d6 100644 --- a/OpenCL/m14000_a3-pure.cl +++ b/OpenCL/m14000_a3-pure.cl @@ -5,9 +5,11 @@ * : sboxes for others were takes fron JtR, license below */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" +#endif #define COMPARE_S "inc_comp_single_bs.cl" #define COMPARE_M "inc_comp_multi_bs.cl" @@ -2225,7 +2227,9 @@ __kernel void m14000_mxx (KERN_ATTR_BITSLICE ()) const u32 r2 = 0; const u32 r3 = 0; + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } } else @@ -2255,7 +2259,9 @@ __kernel void m14000_mxx (KERN_ATTR_BITSLICE ()) const u32 r2 = 0; const u32 r3 = 0; + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } } } @@ -2710,5 +2716,7 @@ __kernel void m14000_sxx (KERN_ATTR_BITSLICE ()) const u32 slice = ffz (tmpResult); + #ifdef KERNEL_STATIC #include COMPARE_S + #endif } diff --git a/OpenCL/m14100_a0-pure.cl b/OpenCL/m14100_a0-pure.cl index 43ff09855..3db95dab8 100644 --- a/OpenCL/m14100_a0-pure.cl +++ b/OpenCL/m14100_a0-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m14100_a1-pure.cl b/OpenCL/m14100_a1-pure.cl index 569362b8f..7c4c2228f 100644 --- a/OpenCL/m14100_a1-pure.cl +++ b/OpenCL/m14100_a1-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m14100_a3-pure.cl b/OpenCL/m14100_a3-pure.cl index 08dcacab1..f01488bab 100644 --- a/OpenCL/m14100_a3-pure.cl +++ b/OpenCL/m14100_a3-pure.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m14400_a0-optimized.cl b/OpenCL/m14400_a0-optimized.cl index bf476e746..c5fe2d196 100644 --- a/OpenCL/m14400_a0-optimized.cl +++ b/OpenCL/m14400_a0-optimized.cl @@ -3,6 +3,7 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -10,6 +11,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m14400_a0-pure.cl b/OpenCL/m14400_a0-pure.cl index 46d513207..9bbb6c163 100644 --- a/OpenCL/m14400_a0-pure.cl +++ b/OpenCL/m14400_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m14400_a1-optimized.cl b/OpenCL/m14400_a1-optimized.cl index 50ed4d012..fc4789ffe 100644 --- a/OpenCL/m14400_a1-optimized.cl +++ b/OpenCL/m14400_a1-optimized.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m14400_a1-pure.cl b/OpenCL/m14400_a1-pure.cl index 6b00dbc05..e6d9b7663 100644 --- a/OpenCL/m14400_a1-pure.cl +++ b/OpenCL/m14400_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m14400_a3-optimized.cl b/OpenCL/m14400_a3-optimized.cl index 91529052d..ba5e189f4 100644 --- a/OpenCL/m14400_a3-optimized.cl +++ b/OpenCL/m14400_a3-optimized.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m14400_a3-pure.cl b/OpenCL/m14400_a3-pure.cl index 06517d664..fbc240010 100644 --- a/OpenCL/m14400_a3-pure.cl +++ b/OpenCL/m14400_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8_le(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m14611-pure.cl b/OpenCL/m14611-pure.cl index 43dabdd73..b1c3a554a 100644 --- a/OpenCL/m14611-pure.cl +++ b/OpenCL/m14611-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -14,6 +15,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_aes.cl" +#endif #define LUKS_STRIPES 4000 @@ -80,10 +82,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14612-pure.cl b/OpenCL/m14612-pure.cl index ffd76e86c..d101bf5ba 100644 --- a/OpenCL/m14612-pure.cl +++ b/OpenCL/m14612-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -14,6 +15,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_serpent.cl" +#endif #define LUKS_STRIPES 4000 @@ -80,10 +82,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_serpent.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14613-pure.cl b/OpenCL/m14613-pure.cl index 3e2f9ead0..1c61d9a64 100644 --- a/OpenCL/m14613-pure.cl +++ b/OpenCL/m14613-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -14,6 +15,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_twofish.cl" +#endif #define LUKS_STRIPES 4000 @@ -80,10 +82,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_twofish.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14621-pure.cl b/OpenCL/m14621-pure.cl index 6ad7741d8..4896f88bc 100644 --- a/OpenCL/m14621-pure.cl +++ b/OpenCL/m14621-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_aes.cl" +#endif #define LUKS_STRIPES 4000 @@ -79,10 +81,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14622-pure.cl b/OpenCL/m14622-pure.cl index 43ad60fe0..54f737336 100644 --- a/OpenCL/m14622-pure.cl +++ b/OpenCL/m14622-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_serpent.cl" +#endif #define LUKS_STRIPES 4000 @@ -79,10 +81,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_serpent.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14623-pure.cl b/OpenCL/m14623-pure.cl index 768396085..97274d694 100644 --- a/OpenCL/m14623-pure.cl +++ b/OpenCL/m14623-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_twofish.cl" +#endif #define LUKS_STRIPES 4000 @@ -79,10 +81,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_twofish.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14631-pure.cl b/OpenCL/m14631-pure.cl index 3c9bb4de7..ae5cc6678 100644 --- a/OpenCL/m14631-pure.cl +++ b/OpenCL/m14631-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_aes.cl" +#endif #define LUKS_STRIPES 4000 @@ -79,10 +81,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14632-pure.cl b/OpenCL/m14632-pure.cl index 05e9e4216..7c95fe502 100644 --- a/OpenCL/m14632-pure.cl +++ b/OpenCL/m14632-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_serpent.cl" +#endif #define LUKS_STRIPES 4000 @@ -79,10 +81,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_serpent.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14633-pure.cl b/OpenCL/m14633-pure.cl index 85cf8a667..6cd5628f7 100644 --- a/OpenCL/m14633-pure.cl +++ b/OpenCL/m14633-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_twofish.cl" +#endif #define LUKS_STRIPES 4000 @@ -79,10 +81,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_twofish.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14641-pure.cl b/OpenCL/m14641-pure.cl index 851aebff0..1a53b65ef 100644 --- a/OpenCL/m14641-pure.cl +++ b/OpenCL/m14641-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_aes.cl" +#endif #define LUKS_STRIPES 4000 @@ -79,10 +81,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14642-pure.cl b/OpenCL/m14642-pure.cl index be731fc7b..d08023e9a 100644 --- a/OpenCL/m14642-pure.cl +++ b/OpenCL/m14642-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_serpent.cl" +#endif #define LUKS_STRIPES 4000 @@ -79,10 +81,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_serpent.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14643-pure.cl b/OpenCL/m14643-pure.cl index a18d9a6c7..7a8a57d6a 100644 --- a/OpenCL/m14643-pure.cl +++ b/OpenCL/m14643-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha512.cl" #include "inc_hash_ripemd160.cl" #include "inc_cipher_twofish.cl" +#endif #define LUKS_STRIPES 4000 @@ -79,10 +81,12 @@ typedef struct luks_tmp } luks_tmp_t; +#ifdef KERNEL_STATIC #include "inc_luks_af.cl" #include "inc_luks_essiv.cl" #include "inc_luks_xts.cl" #include "inc_luks_twofish.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14700-pure.cl b/OpenCL/m14700-pure.cl index 5b2476df3..974e24bdf 100644 --- a/OpenCL/m14700-pure.cl +++ b/OpenCL/m14700-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m14800-pure.cl b/OpenCL/m14800-pure.cl index 90a6b265f..042cb9455 100644 --- a/OpenCL/m14800-pure.cl +++ b/OpenCL/m14800-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif typedef struct itunes_backup { diff --git a/OpenCL/m14900_a0-optimized.cl b/OpenCL/m14900_a0-optimized.cl index cda0cf955..a09996f16 100644 --- a/OpenCL/m14900_a0-optimized.cl +++ b/OpenCL/m14900_a0-optimized.cl @@ -6,12 +6,14 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u8a c_ftable[256] = { diff --git a/OpenCL/m14900_a1-optimized.cl b/OpenCL/m14900_a1-optimized.cl index 8e49bdb4e..98b37a526 100644 --- a/OpenCL/m14900_a1-optimized.cl +++ b/OpenCL/m14900_a1-optimized.cl @@ -6,10 +6,12 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u8a c_ftable[256] = { diff --git a/OpenCL/m14900_a3-optimized.cl b/OpenCL/m14900_a3-optimized.cl index 4a397e986..41533554f 100644 --- a/OpenCL/m14900_a3-optimized.cl +++ b/OpenCL/m14900_a3-optimized.cl @@ -6,10 +6,12 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u8a c_ftable[256] = { diff --git a/OpenCL/m15000_a0-optimized.cl b/OpenCL/m15000_a0-optimized.cl index 75bbe61e5..fc3655781 100644 --- a/OpenCL/m15000_a0-optimized.cl +++ b/OpenCL/m15000_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7, u64x *digest) { diff --git a/OpenCL/m15000_a0-pure.cl b/OpenCL/m15000_a0-pure.cl index 8903062ff..e7f5b40c4 100644 --- a/OpenCL/m15000_a0-pure.cl +++ b/OpenCL/m15000_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m15000_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m15000_a1-optimized.cl b/OpenCL/m15000_a1-optimized.cl index c6860b5f0..7c6746bee 100644 --- a/OpenCL/m15000_a1-optimized.cl +++ b/OpenCL/m15000_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7, u64x *digest) { diff --git a/OpenCL/m15000_a1-pure.cl b/OpenCL/m15000_a1-pure.cl index a7ecf2e90..63b5ef56b 100644 --- a/OpenCL/m15000_a1-pure.cl +++ b/OpenCL/m15000_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m15000_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m15000_a3-optimized.cl b/OpenCL/m15000_a3-optimized.cl index af2727268..cae2645b7 100644 --- a/OpenCL/m15000_a3-optimized.cl +++ b/OpenCL/m15000_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif DECLSPEC void sha512_transform_intern (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, const u32x *w4, const u32x *w5, const u32x *w6, const u32x *w7, u64x *digest) { diff --git a/OpenCL/m15000_a3-pure.cl b/OpenCL/m15000_a3-pure.cl index 0aeed308b..c27289742 100644 --- a/OpenCL/m15000_a3-pure.cl +++ b/OpenCL/m15000_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif __kernel void m15000_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m15100-pure.cl b/OpenCL/m15100-pure.cl index 5d7d51433..6c3be4bb8 100644 --- a/OpenCL/m15100-pure.cl +++ b/OpenCL/m15100-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -180,5 +182,7 @@ __kernel void m15100_comp (KERN_ATTR_TMPS (pbkdf1_sha1_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m15300-pure.cl b/OpenCL/m15300-pure.cl index 6e89b6c3c..d2f1c023f 100644 --- a/OpenCL/m15300-pure.cl +++ b/OpenCL/m15300-pure.cl @@ -11,6 +11,7 @@ #undef LOCAL_MEM_TYPE #define LOCAL_MEM_TYPE LOCAL_MEM_TYPE_GLOBAL +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -18,6 +19,7 @@ #include "inc_hash_md4.cl" #include "inc_hash_sha1.cl" #include "inc_cipher_des.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m15400_a0-optimized.cl b/OpenCL/m15400_a0-optimized.cl index 2066e66a9..5e1d1335c 100644 --- a/OpenCL/m15400_a0-optimized.cl +++ b/OpenCL/m15400_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif typedef struct chacha20 { diff --git a/OpenCL/m15400_a1-optimized.cl b/OpenCL/m15400_a1-optimized.cl index 44dcbb6d4..10d2c22e5 100644 --- a/OpenCL/m15400_a1-optimized.cl +++ b/OpenCL/m15400_a1-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif typedef struct chacha20 { diff --git a/OpenCL/m15400_a3-optimized.cl b/OpenCL/m15400_a3-optimized.cl index afc185971..57c08fc49 100644 --- a/OpenCL/m15400_a3-optimized.cl +++ b/OpenCL/m15400_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif typedef struct chacha20 { diff --git a/OpenCL/m15500_a0-optimized.cl b/OpenCL/m15500_a0-optimized.cl index de114b8ab..15eaebf8a 100644 --- a/OpenCL/m15500_a0-optimized.cl +++ b/OpenCL/m15500_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m15500_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m15500_a0-pure.cl b/OpenCL/m15500_a0-pure.cl index 02b4e4aad..cb87d526c 100644 --- a/OpenCL/m15500_a0-pure.cl +++ b/OpenCL/m15500_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m15500_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m15500_a1-optimized.cl b/OpenCL/m15500_a1-optimized.cl index af78db81b..561f72717 100644 --- a/OpenCL/m15500_a1-optimized.cl +++ b/OpenCL/m15500_a1-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m15500_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m15500_a1-pure.cl b/OpenCL/m15500_a1-pure.cl index 3ac316173..e85c44a5a 100644 --- a/OpenCL/m15500_a1-pure.cl +++ b/OpenCL/m15500_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m15500_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m15500_a3-optimized.cl b/OpenCL/m15500_a3-optimized.cl index 43e662a78..3db066bb7 100644 --- a/OpenCL/m15500_a3-optimized.cl +++ b/OpenCL/m15500_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif DECLSPEC void m15500m (u32 *w, const u32 pw_len, KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m15500_a3-pure.cl b/OpenCL/m15500_a3-pure.cl index 9579b00b6..24302f852 100644 --- a/OpenCL/m15500_a3-pure.cl +++ b/OpenCL/m15500_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m15500_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m15600-pure.cl b/OpenCL/m15600-pure.cl index 10ebe4648..bc2edf2af 100644 --- a/OpenCL/m15600-pure.cl +++ b/OpenCL/m15600-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif typedef struct pbkdf2_sha256_tmp { @@ -473,5 +475,7 @@ __kernel void m15600_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_p #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m15700-pure.cl b/OpenCL/m15700-pure.cl index de721672f..e263e124d 100644 --- a/OpenCL/m15700-pure.cl +++ b/OpenCL/m15700-pure.cl @@ -3,10 +3,12 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -601,5 +603,7 @@ __kernel void m15700_comp (KERN_ATTR_TMPS_ESALT (scrypt_tmp_t, ethereum_scrypt_t #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m15900-pure.cl b/OpenCL/m15900-pure.cl index 14d740883..7e037e914 100644 --- a/OpenCL/m15900-pure.cl +++ b/OpenCL/m15900-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_hash_sha1.cl" #include "inc_hash_sha512.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m16000_a0-pure.cl b/OpenCL/m16000_a0-pure.cl index ef58ca427..2a7e175c2 100644 --- a/OpenCL/m16000_a0-pure.cl +++ b/OpenCL/m16000_a0-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp.h" #include "inc_rp.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m16000_a1-pure.cl b/OpenCL/m16000_a1-pure.cl index a55869fb5..8c0c2ebbb 100644 --- a/OpenCL/m16000_a1-pure.cl +++ b/OpenCL/m16000_a1-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m16000_a3-pure.cl b/OpenCL/m16000_a3-pure.cl index 9b05699ce..0bc1d2830 100644 --- a/OpenCL/m16000_a3-pure.cl +++ b/OpenCL/m16000_a3-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif #define PERM_OP(a,b,tt,n,m) \ { \ diff --git a/OpenCL/m16100_a0-optimized.cl b/OpenCL/m16100_a0-optimized.cl index da2d7cea8..f83ae2060 100644 --- a/OpenCL/m16100_a0-optimized.cl +++ b/OpenCL/m16100_a0-optimized.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct tacacs_plus { diff --git a/OpenCL/m16100_a0-pure.cl b/OpenCL/m16100_a0-pure.cl index 970e2af0c..a5949a70b 100644 --- a/OpenCL/m16100_a0-pure.cl +++ b/OpenCL/m16100_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif typedef struct tacacs_plus { diff --git a/OpenCL/m16100_a1-optimized.cl b/OpenCL/m16100_a1-optimized.cl index 1b0b1f3d8..e17acc6ac 100644 --- a/OpenCL/m16100_a1-optimized.cl +++ b/OpenCL/m16100_a1-optimized.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct tacacs_plus { diff --git a/OpenCL/m16100_a1-pure.cl b/OpenCL/m16100_a1-pure.cl index 11854711f..5520e108c 100644 --- a/OpenCL/m16100_a1-pure.cl +++ b/OpenCL/m16100_a1-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md5.cl" +#endif typedef struct tacacs_plus { diff --git a/OpenCL/m16100_a3-optimized.cl b/OpenCL/m16100_a3-optimized.cl index c81249f67..715a4d3cb 100644 --- a/OpenCL/m16100_a3-optimized.cl +++ b/OpenCL/m16100_a3-optimized.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif typedef struct tacacs_plus { diff --git a/OpenCL/m16100_a3-pure.cl b/OpenCL/m16100_a3-pure.cl index 68657a878..5e21877d5 100644 --- a/OpenCL/m16100_a3-pure.cl +++ b/OpenCL/m16100_a3-pure.cl @@ -5,10 +5,12 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md5.cl" +#endif typedef struct tacacs_plus { diff --git a/OpenCL/m16200-pure.cl b/OpenCL/m16200-pure.cl index c4f77c946..69a985a3a 100644 --- a/OpenCL/m16200-pure.cl +++ b/OpenCL/m16200-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m16300-pure.cl b/OpenCL/m16300-pure.cl index 82a04079e..86b4ed2eb 100644 --- a/OpenCL/m16300-pure.cl +++ b/OpenCL/m16300-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -769,5 +771,7 @@ __kernel void m16300_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ethereum_p #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m16400_a0-optimized.cl b/OpenCL/m16400_a0-optimized.cl index 1ab304fe9..03aacf74a 100644 --- a/OpenCL/m16400_a0-optimized.cl +++ b/OpenCL/m16400_a0-optimized.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp_optimized.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m16400_m04 (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m16400_a0-pure.cl b/OpenCL/m16400_a0-pure.cl index 1318f0c80..2f821b761 100644 --- a/OpenCL/m16400_a0-pure.cl +++ b/OpenCL/m16400_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void cram_md5_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) { diff --git a/OpenCL/m16400_a1-optimized.cl b/OpenCL/m16400_a1-optimized.cl index 39521b883..9c196d6eb 100644 --- a/OpenCL/m16400_a1-optimized.cl +++ b/OpenCL/m16400_a1-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif __kernel void m16400_m04 (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m16400_a1-pure.cl b/OpenCL/m16400_a1-pure.cl index 5a7e81188..59bea3282 100644 --- a/OpenCL/m16400_a1-pure.cl +++ b/OpenCL/m16400_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void cram_md5_transform (const u32 *w0, const u32 *w1, const u32 *w2, const u32 *w3, u32 *digest) { diff --git a/OpenCL/m16400_a3-optimized.cl b/OpenCL/m16400_a3-optimized.cl index a0d872f58..9fac67bcc 100644 --- a/OpenCL/m16400_a3-optimized.cl +++ b/OpenCL/m16400_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define MD5_STEP_REV(f,a,b,c,d,x,t,s) \ { \ diff --git a/OpenCL/m16400_a3-pure.cl b/OpenCL/m16400_a3-pure.cl index 20dfb7a8c..927b1a981 100644 --- a/OpenCL/m16400_a3-pure.cl +++ b/OpenCL/m16400_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC void cram_md5_transform_vector (const u32x *w0, const u32x *w1, const u32x *w2, const u32x *w3, u32x *digest) { diff --git a/OpenCL/m16511_a0-pure.cl b/OpenCL/m16511_a0-pure.cl index af246f531..cb8885996 100644 --- a/OpenCL/m16511_a0-pure.cl +++ b/OpenCL/m16511_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif typedef struct jwt { diff --git a/OpenCL/m16511_a1-pure.cl b/OpenCL/m16511_a1-pure.cl index 3354ef3f6..9a530d4fc 100644 --- a/OpenCL/m16511_a1-pure.cl +++ b/OpenCL/m16511_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" +#endif typedef struct jwt { diff --git a/OpenCL/m16511_a3-pure.cl b/OpenCL/m16511_a3-pure.cl index 2d1546578..cf4199e5c 100644 --- a/OpenCL/m16511_a3-pure.cl +++ b/OpenCL/m16511_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif typedef struct jwt { diff --git a/OpenCL/m16512_a0-pure.cl b/OpenCL/m16512_a0-pure.cl index 141b67993..f2b68c57b 100644 --- a/OpenCL/m16512_a0-pure.cl +++ b/OpenCL/m16512_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha384.cl" +#endif typedef struct jwt { diff --git a/OpenCL/m16512_a1-pure.cl b/OpenCL/m16512_a1-pure.cl index 786d1f922..5e0b693e9 100644 --- a/OpenCL/m16512_a1-pure.cl +++ b/OpenCL/m16512_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha384.cl" +#endif typedef struct jwt { diff --git a/OpenCL/m16512_a3-pure.cl b/OpenCL/m16512_a3-pure.cl index 2dfdaca85..b7db02107 100644 --- a/OpenCL/m16512_a3-pure.cl +++ b/OpenCL/m16512_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha384.cl" +#endif typedef struct jwt { diff --git a/OpenCL/m16513_a0-pure.cl b/OpenCL/m16513_a0-pure.cl index 199110b15..00cb81c03 100644 --- a/OpenCL/m16513_a0-pure.cl +++ b/OpenCL/m16513_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif typedef struct jwt { diff --git a/OpenCL/m16513_a1-pure.cl b/OpenCL/m16513_a1-pure.cl index 3027c98e3..6acbfaf27 100644 --- a/OpenCL/m16513_a1-pure.cl +++ b/OpenCL/m16513_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha512.cl" +#endif typedef struct jwt { diff --git a/OpenCL/m16513_a3-pure.cl b/OpenCL/m16513_a3-pure.cl index aa03687f8..34b1d518d 100644 --- a/OpenCL/m16513_a3-pure.cl +++ b/OpenCL/m16513_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif typedef struct jwt { diff --git a/OpenCL/m16600_a0-optimized.cl b/OpenCL/m16600_a0-optimized.cl index 523bcfc87..eea99b907 100644 --- a/OpenCL/m16600_a0-optimized.cl +++ b/OpenCL/m16600_a0-optimized.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_simd.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif typedef struct electrum_wallet { diff --git a/OpenCL/m16600_a0-pure.cl b/OpenCL/m16600_a0-pure.cl index 6fc47615e..0244cc3f9 100644 --- a/OpenCL/m16600_a0-pure.cl +++ b/OpenCL/m16600_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_scalar.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif typedef struct electrum_wallet { diff --git a/OpenCL/m16600_a1-optimized.cl b/OpenCL/m16600_a1-optimized.cl index 5ea1e7d06..91726187a 100644 --- a/OpenCL/m16600_a1-optimized.cl +++ b/OpenCL/m16600_a1-optimized.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif typedef struct electrum_wallet { diff --git a/OpenCL/m16600_a1-pure.cl b/OpenCL/m16600_a1-pure.cl index 2f7207a22..32aec90e6 100644 --- a/OpenCL/m16600_a1-pure.cl +++ b/OpenCL/m16600_a1-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif typedef struct electrum_wallet { diff --git a/OpenCL/m16600_a3-optimized.cl b/OpenCL/m16600_a3-optimized.cl index 52fd599d9..78f6fd207 100644 --- a/OpenCL/m16600_a3-optimized.cl +++ b/OpenCL/m16600_a3-optimized.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif typedef struct electrum_wallet { diff --git a/OpenCL/m16600_a3-pure.cl b/OpenCL/m16600_a3-pure.cl index 015740810..71b95f21d 100644 --- a/OpenCL/m16600_a3-pure.cl +++ b/OpenCL/m16600_a3-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif typedef struct electrum_wallet { diff --git a/OpenCL/m16800-pure.cl b/OpenCL/m16800-pure.cl index f1189cecc..4fc3c235b 100644 --- a/OpenCL/m16800-pure.cl +++ b/OpenCL/m16800-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -280,5 +282,7 @@ __kernel void m16800_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pbkdf2_tmp_t, wpa_pmkid_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m16801-pure.cl b/OpenCL/m16801-pure.cl index bd1f10932..5beac4b72 100644 --- a/OpenCL/m16801-pure.cl +++ b/OpenCL/m16801-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -151,5 +153,7 @@ __kernel void m16801_aux1 (KERN_ATTR_TMPS_ESALT (wpa_pmk_tmp_t, wpa_pmkid_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m16900-pure.cl b/OpenCL/m16900-pure.cl index ea1444378..f28580de8 100644 --- a/OpenCL/m16900-pure.cl +++ b/OpenCL/m16900-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -303,5 +305,7 @@ __kernel void m16900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, ansible_va #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m17300_a0-optimized.cl b/OpenCL/m17300_a0-optimized.cl index d7e902edf..5a9d2d615 100644 --- a/OpenCL/m17300_a0-optimized.cl +++ b/OpenCL/m17300_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17300_a1-optimized.cl b/OpenCL/m17300_a1-optimized.cl index 6fcb80f8c..84268a223 100644 --- a/OpenCL/m17300_a1-optimized.cl +++ b/OpenCL/m17300_a1-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17300_a3-optimized.cl b/OpenCL/m17300_a3-optimized.cl index fcb9fc080..f97a10011 100644 --- a/OpenCL/m17300_a3-optimized.cl +++ b/OpenCL/m17300_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17400_a0-optimized.cl b/OpenCL/m17400_a0-optimized.cl index e4e3e5d21..491b77230 100644 --- a/OpenCL/m17400_a0-optimized.cl +++ b/OpenCL/m17400_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17400_a1-optimized.cl b/OpenCL/m17400_a1-optimized.cl index b0eac5054..b412eabd6 100644 --- a/OpenCL/m17400_a1-optimized.cl +++ b/OpenCL/m17400_a1-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17400_a3-optimized.cl b/OpenCL/m17400_a3-optimized.cl index 14c76a9e1..ea4b40714 100644 --- a/OpenCL/m17400_a3-optimized.cl +++ b/OpenCL/m17400_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17500_a0-optimized.cl b/OpenCL/m17500_a0-optimized.cl index 07662bcf7..de3d21e03 100644 --- a/OpenCL/m17500_a0-optimized.cl +++ b/OpenCL/m17500_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17500_a1-optimized.cl b/OpenCL/m17500_a1-optimized.cl index 91cec2946..d62db0cfa 100644 --- a/OpenCL/m17500_a1-optimized.cl +++ b/OpenCL/m17500_a1-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17500_a3-optimized.cl b/OpenCL/m17500_a3-optimized.cl index 616f174c0..39ebc1f7d 100644 --- a/OpenCL/m17500_a3-optimized.cl +++ b/OpenCL/m17500_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17600_a0-optimized.cl b/OpenCL/m17600_a0-optimized.cl index d9139e154..48d711eac 100644 --- a/OpenCL/m17600_a0-optimized.cl +++ b/OpenCL/m17600_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17600_a1-optimized.cl b/OpenCL/m17600_a1-optimized.cl index 4f366a0eb..c24e8f0dc 100644 --- a/OpenCL/m17600_a1-optimized.cl +++ b/OpenCL/m17600_a1-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17600_a3-optimized.cl b/OpenCL/m17600_a3-optimized.cl index e063761a7..b3f7ce45a 100644 --- a/OpenCL/m17600_a3-optimized.cl +++ b/OpenCL/m17600_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17700_a0-optimized.cl b/OpenCL/m17700_a0-optimized.cl index 12201e58e..e3ab85fd9 100644 --- a/OpenCL/m17700_a0-optimized.cl +++ b/OpenCL/m17700_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17700_a1-optimized.cl b/OpenCL/m17700_a1-optimized.cl index 68e9432c6..4bda1d9b4 100644 --- a/OpenCL/m17700_a1-optimized.cl +++ b/OpenCL/m17700_a1-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17700_a3-optimized.cl b/OpenCL/m17700_a3-optimized.cl index bfd9cf8bb..77ecf40fe 100644 --- a/OpenCL/m17700_a3-optimized.cl +++ b/OpenCL/m17700_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17800_a0-optimized.cl b/OpenCL/m17800_a0-optimized.cl index 12c2b5fd6..877206757 100644 --- a/OpenCL/m17800_a0-optimized.cl +++ b/OpenCL/m17800_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17800_a1-optimized.cl b/OpenCL/m17800_a1-optimized.cl index a227aef15..26e53c921 100644 --- a/OpenCL/m17800_a1-optimized.cl +++ b/OpenCL/m17800_a1-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17800_a3-optimized.cl b/OpenCL/m17800_a3-optimized.cl index 6343da7ac..8ee2055b8 100644 --- a/OpenCL/m17800_a3-optimized.cl +++ b/OpenCL/m17800_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17900_a0-optimized.cl b/OpenCL/m17900_a0-optimized.cl index aa0573d9e..ac0a4dc1a 100644 --- a/OpenCL/m17900_a0-optimized.cl +++ b/OpenCL/m17900_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17900_a1-optimized.cl b/OpenCL/m17900_a1-optimized.cl index a87e3da23..f8c92f6e7 100644 --- a/OpenCL/m17900_a1-optimized.cl +++ b/OpenCL/m17900_a1-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m17900_a3-optimized.cl b/OpenCL/m17900_a3-optimized.cl index 7b7d9d5ea..0cb85e708 100644 --- a/OpenCL/m17900_a3-optimized.cl +++ b/OpenCL/m17900_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m18000_a0-optimized.cl b/OpenCL/m18000_a0-optimized.cl index cc56a2d97..5588eae0c 100644 --- a/OpenCL/m18000_a0-optimized.cl +++ b/OpenCL/m18000_a0-optimized.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m18000_a1-optimized.cl b/OpenCL/m18000_a1-optimized.cl index 8bbd7ab18..265384f66 100644 --- a/OpenCL/m18000_a1-optimized.cl +++ b/OpenCL/m18000_a1-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m18000_a3-optimized.cl b/OpenCL/m18000_a3-optimized.cl index 97932266d..77e137cfc 100644 --- a/OpenCL/m18000_a3-optimized.cl +++ b/OpenCL/m18000_a3-optimized.cl @@ -5,10 +5,12 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" +#endif __constant u64a keccakf_rndc[24] = { diff --git a/OpenCL/m18100_a0-pure.cl b/OpenCL/m18100_a0-pure.cl index 9ebed9879..8dd349b3a 100644 --- a/OpenCL/m18100_a0-pure.cl +++ b/OpenCL/m18100_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m18100_mxx (KERN_ATTR_RULES ()) { diff --git a/OpenCL/m18100_a1-pure.cl b/OpenCL/m18100_a1-pure.cl index cdd0c7a6b..8dc5b14c0 100644 --- a/OpenCL/m18100_a1-pure.cl +++ b/OpenCL/m18100_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m18100_mxx (KERN_ATTR_BASIC ()) { diff --git a/OpenCL/m18100_a3-pure.cl b/OpenCL/m18100_a3-pure.cl index e5ac128e9..6e73e1ec0 100644 --- a/OpenCL/m18100_a3-pure.cl +++ b/OpenCL/m18100_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif __kernel void m18100_mxx (KERN_ATTR_VECTOR ()) { diff --git a/OpenCL/m18200_a0-optimized.cl b/OpenCL/m18200_a0-optimized.cl index 7564b8e24..ac767827c 100644 --- a/OpenCL/m18200_a0-optimized.cl +++ b/OpenCL/m18200_a0-optimized.cl @@ -6,6 +6,7 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -14,6 +15,7 @@ #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5asrep { diff --git a/OpenCL/m18200_a0-pure.cl b/OpenCL/m18200_a0-pure.cl index d23831e31..d845a893d 100644 --- a/OpenCL/m18200_a0-pure.cl +++ b/OpenCL/m18200_a0-pure.cl @@ -6,6 +6,7 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_rp.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5asrep { diff --git a/OpenCL/m18200_a1-optimized.cl b/OpenCL/m18200_a1-optimized.cl index 4c599bb46..5cd961bae 100644 --- a/OpenCL/m18200_a1-optimized.cl +++ b/OpenCL/m18200_a1-optimized.cl @@ -6,12 +6,14 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5asrep { diff --git a/OpenCL/m18200_a1-pure.cl b/OpenCL/m18200_a1-pure.cl index ad35ce560..a8af74c5c 100644 --- a/OpenCL/m18200_a1-pure.cl +++ b/OpenCL/m18200_a1-pure.cl @@ -6,11 +6,13 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5asrep { diff --git a/OpenCL/m18200_a3-optimized.cl b/OpenCL/m18200_a3-optimized.cl index 8607e756f..82c25972c 100644 --- a/OpenCL/m18200_a3-optimized.cl +++ b/OpenCL/m18200_a3-optimized.cl @@ -6,12 +6,14 @@ //too much register pressure //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5asrep { diff --git a/OpenCL/m18200_a3-pure.cl b/OpenCL/m18200_a3-pure.cl index fa7333f16..e6c19f0b0 100644 --- a/OpenCL/m18200_a3-pure.cl +++ b/OpenCL/m18200_a3-pure.cl @@ -6,11 +6,13 @@ //shared mem too small //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_hash_md4.cl" #include "inc_hash_md5.cl" +#endif typedef struct krb5asrep { diff --git a/OpenCL/m18300-pure.cl b/OpenCL/m18300-pure.cl index 1502d1f1e..0790759e4 100644 --- a/OpenCL/m18300-pure.cl +++ b/OpenCL/m18300-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m18400-pure.cl b/OpenCL/m18400-pure.cl index 841284af4..73fd018a2 100644 --- a/OpenCL/m18400-pure.cl +++ b/OpenCL/m18400-pure.cl @@ -5,6 +5,7 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_hash_sha1.cl" #include "inc_hash_sha256.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -465,5 +467,7 @@ __kernel void m18400_comp (KERN_ATTR_TMPS_ESALT (odf12_tmp_t, odf12_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m18500_a0-pure.cl b/OpenCL/m18500_a0-pure.cl index 1e0035728..eb2aa4b6b 100644 --- a/OpenCL/m18500_a0-pure.cl +++ b/OpenCL/m18500_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_scalar.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m18500_a1-pure.cl b/OpenCL/m18500_a1-pure.cl index f3321ed95..00a594e14 100644 --- a/OpenCL/m18500_a1-pure.cl +++ b/OpenCL/m18500_a1-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -13,6 +14,7 @@ #include "inc_scalar.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m18500_a3-pure.cl b/OpenCL/m18500_a3-pure.cl index 5ae04c661..333354ebf 100644 --- a/OpenCL/m18500_a3-pure.cl +++ b/OpenCL/m18500_a3-pure.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" #include "inc_hash_sha1.cl" +#endif #if VECT_SIZE == 1 #define uint_to_hex_lower8(i) (u32x) (l_bin2asc[(i)]) diff --git a/OpenCL/m18600-pure.cl b/OpenCL/m18600-pure.cl index 5638ce2f2..34f6fda7d 100644 --- a/OpenCL/m18600-pure.cl +++ b/OpenCL/m18600-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -817,5 +819,7 @@ __kernel void __attribute__((reqd_work_group_size(FIXED_LOCAL_SIZE, 1, 1))) m186 #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m18700_a0-optimized.cl b/OpenCL/m18700_a0-optimized.cl index 3b16fe3d3..24b860c2a 100644 --- a/OpenCL/m18700_a0-optimized.cl +++ b/OpenCL/m18700_a0-optimized.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_rp_optimized.h" #include "inc_rp_optimized.cl" #include "inc_simd.cl" +#endif DECLSPEC u32 hashCode (const u32 init, const u32 *w, const u32 pw_len) { diff --git a/OpenCL/m18700_a0-pure.cl b/OpenCL/m18700_a0-pure.cl index b07fa951f..7dd4072ef 100644 --- a/OpenCL/m18700_a0-pure.cl +++ b/OpenCL/m18700_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC u32 hashCode (const u32 init, const u32 *w, const u32 pw_len) { diff --git a/OpenCL/m18700_a1-optimized.cl b/OpenCL/m18700_a1-optimized.cl index fb73ee6c1..b3aa1614a 100644 --- a/OpenCL/m18700_a1-optimized.cl +++ b/OpenCL/m18700_a1-optimized.cl @@ -5,12 +5,14 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC u32 hashCode_g (const u32 init, __global u32 * restrict w, const u32 pw_len) { diff --git a/OpenCL/m18700_a1-pure.cl b/OpenCL/m18700_a1-pure.cl index af2666d40..7b619baa1 100644 --- a/OpenCL/m18700_a1-pure.cl +++ b/OpenCL/m18700_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC u32 hashCode_g (const u32 init, __global u32 * restrict w, const u32 pw_len) { diff --git a/OpenCL/m18700_a3-optimized.cl b/OpenCL/m18700_a3-optimized.cl index 8c3158ed5..ba8c0182b 100644 --- a/OpenCL/m18700_a3-optimized.cl +++ b/OpenCL/m18700_a3-optimized.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC u32x hashCode_w0 (const u32x init, const u32x w0, const u32 *w, const u32 pw_len) { diff --git a/OpenCL/m18700_a3-pure.cl b/OpenCL/m18700_a3-pure.cl index 8e6a26f61..ed0bcf2de 100644 --- a/OpenCL/m18700_a3-pure.cl +++ b/OpenCL/m18700_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif DECLSPEC u32x hashCode_w0 (const u32x init, const u32x w0, const u32 *w, const u32 pw_len) { diff --git a/OpenCL/m18800-pure.cl b/OpenCL/m18800-pure.cl index 21bc8853d..2a8df5c5e 100644 --- a/OpenCL/m18800-pure.cl +++ b/OpenCL/m18800-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -136,5 +138,7 @@ __kernel void m18800_comp (KERN_ATTR_TMPS (bsp_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m18900-pure.cl b/OpenCL/m18900-pure.cl index 95a1efaa8..274be7c6a 100644 --- a/OpenCL/m18900-pure.cl +++ b/OpenCL/m18900-pure.cl @@ -5,12 +5,14 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" #include "inc_cipher_aes.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" diff --git a/OpenCL/m19000-pure.cl b/OpenCL/m19000-pure.cl index 39a6806d2..e79bce4e7 100644 --- a/OpenCL/m19000-pure.cl +++ b/OpenCL/m19000-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_md5.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -87,5 +89,7 @@ __kernel void m19000_comp (KERN_ATTR_TMPS (qnx_md5_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m19100-pure.cl b/OpenCL/m19100-pure.cl index 34cfa82cb..f91d26778 100644 --- a/OpenCL/m19100-pure.cl +++ b/OpenCL/m19100-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha256.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -87,5 +89,7 @@ __kernel void m19100_comp (KERN_ATTR_TMPS (qnx_sha256_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } diff --git a/OpenCL/m19200-pure.cl b/OpenCL/m19200-pure.cl index 587dd1e6a..2ed165a24 100644 --- a/OpenCL/m19200-pure.cl +++ b/OpenCL/m19200-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha512.cl" +#endif #define COMPARE_S "inc_comp_single.cl" #define COMPARE_M "inc_comp_multi.cl" @@ -431,7 +433,9 @@ __kernel void m19200_comp (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) #define il_pos 0 + #ifdef KERNEL_STATIC #include COMPARE_M + #endif // we should also handle the buggy qnx sha512 implementation // see https://github.com/magnumripper/JohnTheRipper/blob/bleeding-jumbo/src/sha2.c#L578-L595 @@ -448,6 +452,8 @@ __kernel void m19200_comp (KERN_ATTR_TMPS (qnx_sha512_tmp_t)) const u32 r2 = l32_from_64_S (swap64_S (sha512_ctx2.h[1])); const u32 r3 = h32_from_64_S (swap64_S (sha512_ctx2.h[1])); + #ifdef KERNEL_STATIC #include COMPARE_M + #endif } } diff --git a/OpenCL/m19300_a0-pure.cl b/OpenCL/m19300_a0-pure.cl index bb4f39648..e1684b6b5 100644 --- a/OpenCL/m19300_a0-pure.cl +++ b/OpenCL/m19300_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct sha1_double_salt { diff --git a/OpenCL/m19300_a1-pure.cl b/OpenCL/m19300_a1-pure.cl index ec41bed2a..55d1f0247 100644 --- a/OpenCL/m19300_a1-pure.cl +++ b/OpenCL/m19300_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct sha1_double_salt { diff --git a/OpenCL/m19300_a3-pure.cl b/OpenCL/m19300_a3-pure.cl index 541b30253..e8b40742a 100644 --- a/OpenCL/m19300_a3-pure.cl +++ b/OpenCL/m19300_a3-pure.cl @@ -5,11 +5,13 @@ #define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct sha1_double_salt { diff --git a/OpenCL/m19500_a0-pure.cl b/OpenCL/m19500_a0-pure.cl index 158ed27e5..1a37691cc 100644 --- a/OpenCL/m19500_a0-pure.cl +++ b/OpenCL/m19500_a0-pure.cl @@ -5,6 +5,7 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" @@ -12,6 +13,7 @@ #include "inc_rp.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct devise_hash { diff --git a/OpenCL/m19500_a1-pure.cl b/OpenCL/m19500_a1-pure.cl index c24a75e0a..651c26305 100644 --- a/OpenCL/m19500_a1-pure.cl +++ b/OpenCL/m19500_a1-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_scalar.cl" #include "inc_hash_sha1.cl" +#endif typedef struct devise_hash { diff --git a/OpenCL/m19500_a3-pure.cl b/OpenCL/m19500_a3-pure.cl index 991f3c92b..780d33cdd 100644 --- a/OpenCL/m19500_a3-pure.cl +++ b/OpenCL/m19500_a3-pure.cl @@ -5,11 +5,13 @@ //#define NEW_SIMD_CODE +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" #include "inc_common.cl" #include "inc_simd.cl" #include "inc_hash_sha1.cl" +#endif typedef struct devise_hash { diff --git a/OpenCL/m19600-pure.cl b/OpenCL/m19600-pure.cl index 2a2402db9..0ad89c663 100644 --- a/OpenCL/m19600-pure.cl +++ b/OpenCL/m19600-pure.cl @@ -1,1005 +1,1007 @@ -/** - * Author......: See docs/credits.txt - * License.....: MIT - */ - -#define NEW_SIMD_CODE - -#include "inc_vendor.h" -#include "inc_types.h" -#include "inc_common.cl" -#include "inc_simd.cl" -#include "inc_hash_sha1.cl" -#include "inc_cipher_aes.cl" - -typedef struct krb5tgs_17 -{ - u32 user[128]; - u32 domain[128]; - u32 account_info[512]; - u32 account_info_len; - - u32 checksum[3]; - u32 edata2[5120]; - u32 edata2_len; - -} krb5tgs_17_t; - -typedef struct krb5tgs_17_tmp -{ - u32 ipad[5]; - u32 opad[5]; - u32 dgst[10]; - u32 out[10]; - -} krb5tgs_17_tmp_t; - -DECLSPEC void aes128_encrypt_cbc (const u32 *aes_ks, u32 *aes_iv, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -{ - u32 data[4]; - - data[0] = swap32_S (in[0]); - data[1] = swap32_S (in[1]); - data[2] = swap32_S (in[2]); - data[3] = swap32_S (in[3]); - - data[0] ^= aes_iv[0]; - data[1] ^= aes_iv[1]; - data[2] ^= aes_iv[2]; - data[3] ^= aes_iv[3]; - - aes128_encrypt (aes_ks, data, out, s_te0, s_te1, s_te2, s_te3, s_te4); - - aes_iv[0] = out[0]; - aes_iv[1] = out[1]; - aes_iv[2] = out[2]; - aes_iv[3] = out[3]; - - out[0] = swap32_S (out[0]); - out[1] = swap32_S (out[1]); - out[2] = swap32_S (out[2]); - out[3] = swap32_S (out[3]); -} - -DECLSPEC void aes128_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -{ - aes128_decrypt (ks1, in, out, s_td0, s_td1, s_td2, s_td3, s_td4); - - out[0] ^= essiv[0]; - out[1] ^= essiv[1]; - out[2] ^= essiv[2]; - out[3] ^= essiv[3]; - - essiv[0] = in[0]; - essiv[1] = in[1]; - essiv[2] = in[2]; - essiv[3] = in[3]; -} - -DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) -{ - digest[0] = ipad[0]; - digest[1] = ipad[1]; - digest[2] = ipad[2]; - digest[3] = ipad[3]; - digest[4] = ipad[4]; - - sha1_transform_vector (w0, w1, w2, w3, digest); - - w0[0] = digest[0]; - w0[1] = digest[1]; - w0[2] = digest[2]; - w0[3] = digest[3]; - w1[0] = digest[4]; - w1[1] = 0x80000000; - 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] = (64 + 20) * 8; - - digest[0] = opad[0]; - digest[1] = opad[1]; - digest[2] = opad[2]; - digest[3] = opad[3]; - digest[4] = opad[4]; - - sha1_transform_vector (w0, w1, w2, w3, digest); -} - -__kernel void m19600_init (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) -{ - /** - * base - */ - - const u64 gid = get_global_id (0); - - if (gid >= gid_max) return; - - /** - * main - */ - - /* initialize hmac-sha1 for pbkdf2(password, account, 4096, account_len) */ - - sha1_hmac_ctx_t sha1_hmac_ctx; - - sha1_hmac_init_global_swap (&sha1_hmac_ctx, pws[gid].i, pws[gid].pw_len); - - tmps[gid].ipad[0] = sha1_hmac_ctx.ipad.h[0]; - tmps[gid].ipad[1] = sha1_hmac_ctx.ipad.h[1]; - tmps[gid].ipad[2] = sha1_hmac_ctx.ipad.h[2]; - tmps[gid].ipad[3] = sha1_hmac_ctx.ipad.h[3]; - tmps[gid].ipad[4] = sha1_hmac_ctx.ipad.h[4]; - - tmps[gid].opad[0] = sha1_hmac_ctx.opad.h[0]; - tmps[gid].opad[1] = sha1_hmac_ctx.opad.h[1]; - tmps[gid].opad[2] = sha1_hmac_ctx.opad.h[2]; - tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; - tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - - sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[digests_offset].account_info, esalt_bufs[digests_offset].account_info_len); - - for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) - { - sha1_hmac_ctx_t sha1_hmac_ctx2 = sha1_hmac_ctx; - - u32 w0[4]; - u32 w1[4]; - u32 w2[4]; - u32 w3[4]; - - w0[0] = j; - 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; - - sha1_hmac_update_64 (&sha1_hmac_ctx2, w0, w1, w2, w3, 4); - - sha1_hmac_final (&sha1_hmac_ctx2); - - tmps[gid].dgst[i + 0] = sha1_hmac_ctx2.opad.h[0]; - tmps[gid].dgst[i + 1] = sha1_hmac_ctx2.opad.h[1]; - tmps[gid].dgst[i + 2] = sha1_hmac_ctx2.opad.h[2]; - tmps[gid].dgst[i + 3] = sha1_hmac_ctx2.opad.h[3]; - tmps[gid].dgst[i + 4] = sha1_hmac_ctx2.opad.h[4]; - - tmps[gid].out[i + 0] = tmps[gid].dgst[i + 0]; - tmps[gid].out[i + 1] = tmps[gid].dgst[i + 1]; - tmps[gid].out[i + 2] = tmps[gid].dgst[i + 2]; - tmps[gid].out[i + 3] = tmps[gid].dgst[i + 3]; - tmps[gid].out[i + 4] = tmps[gid].dgst[i + 4]; - } -} - -__kernel void m19600_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) -{ - /** - * base - */ - const u64 gid = get_global_id (0); - - if ((gid * VECT_SIZE) >= gid_max) return; - - u32x ipad[5]; - u32x opad[5]; - - ipad[0] = packv (tmps, ipad, gid, 0); - ipad[1] = packv (tmps, ipad, gid, 1); - ipad[2] = packv (tmps, ipad, gid, 2); - ipad[3] = packv (tmps, ipad, gid, 3); - ipad[4] = packv (tmps, ipad, gid, 4); - - opad[0] = packv (tmps, opad, gid, 0); - opad[1] = packv (tmps, opad, gid, 1); - opad[2] = packv (tmps, opad, gid, 2); - opad[3] = packv (tmps, opad, gid, 3); - opad[4] = packv (tmps, opad, gid, 4); - - for (u32 i = 0; i < 4; i += 5) - { - u32x dgst[5]; - u32x out[5]; - - dgst[0] = packv (tmps, dgst, gid, i + 0); - dgst[1] = packv (tmps, dgst, gid, i + 1); - dgst[2] = packv (tmps, dgst, gid, i + 2); - dgst[3] = packv (tmps, dgst, gid, i + 3); - dgst[4] = packv (tmps, dgst, gid, i + 4); - - out[0] = packv (tmps, out, gid, i + 0); - out[1] = packv (tmps, out, gid, i + 1); - out[2] = packv (tmps, out, gid, i + 2); - out[3] = packv (tmps, out, gid, i + 3); - out[4] = packv (tmps, out, gid, i + 4); - - for (u32 j = 0; j < loop_cnt; j++) - { - u32x w0[4]; - u32x w1[4]; - u32x w2[4]; - u32x w3[4]; - - w0[0] = dgst[0]; - w0[1] = dgst[1]; - w0[2] = dgst[2]; - w0[3] = dgst[3]; - w1[0] = dgst[4]; - w1[1] = 0x80000000; - 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] = (64 + 20) * 8; - - hmac_sha1_run_V (w0, w1, w2, w3, ipad, opad, dgst); - - out[0] ^= dgst[0]; - out[1] ^= dgst[1]; - out[2] ^= dgst[2]; - out[3] ^= dgst[3]; - out[4] ^= dgst[4]; - } - - unpackv (tmps, dgst, gid, i + 0, dgst[0]); - unpackv (tmps, dgst, gid, i + 1, dgst[1]); - unpackv (tmps, dgst, gid, i + 2, dgst[2]); - unpackv (tmps, dgst, gid, i + 3, dgst[3]); - unpackv (tmps, dgst, gid, i + 4, dgst[4]); - - unpackv (tmps, out, gid, i + 0, out[0]); - unpackv (tmps, out, gid, i + 1, out[1]); - unpackv (tmps, out, gid, i + 2, out[2]); - unpackv (tmps, out, gid, i + 3, out[3]); - unpackv (tmps, out, gid, i + 4, out[4]); - } -} - -__kernel void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) -{ - /** - * base - */ - - const u64 gid = get_global_id (0); - const u64 lid = get_local_id (0); - const u64 lsz = get_local_size (0); - - /** - * aes shared - */ - - #ifdef REAL_SHM - - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; - - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; - - for (u32 i = lid; i < 256; i += lsz) - { - s_te0[i] = te0[i]; - s_te1[i] = te1[i]; - s_te2[i] = te2[i]; - s_te3[i] = te3[i]; - s_te4[i] = te4[i]; - - s_td0[i] = td0[i]; - s_td1[i] = td1[i]; - s_td2[i] = td2[i]; - s_td3[i] = td3[i]; - s_td4[i] = td4[i]; - } - - barrier (CLK_LOCAL_MEM_FENCE); - - #else - - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; - - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; - - #endif - - if (gid >= gid_max) return; - - /* - at this point, the output ('seed') will be used to generate AES keys: - - key_bytes = derive(seed, 'kerberos'.encode(), seedsize) - - 'key_bytes' will be the AES key used to generate 'ke' and 'ki' - 'ke' will be the AES key to decrypt the ticket - 'ki' will be the key to compute the final HMAC - */ - - u32 nfolded[4]; - - // we can precompute _nfold('kerberos', 16) - nfolded[0] = 0x6b657262; - nfolded[1] = 0x65726f73; - nfolded[2] = 0x7b9b5b2b; - nfolded[3] = 0x93132b93; - - // then aes_cbc encrypt this nfolded value with 'seed' as key along with a null IV - u32 aes_key[4]; - - aes_key[0] = swap32_S (tmps[gid].out[0]); - aes_key[1] = swap32_S (tmps[gid].out[1]); - aes_key[2] = swap32_S (tmps[gid].out[2]); - aes_key[3] = swap32_S (tmps[gid].out[3]); - - u32 aes_iv[4]; - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - u32 aes_ks[44]; - - aes128_set_encrypt_key (aes_ks, aes_key, s_te0, s_te1, s_te2, s_te3, s_te4); - - u32 key_bytes[4]; - - aes128_encrypt_cbc (aes_ks, aes_iv, nfolded, key_bytes, s_te0, s_te1, s_te2, s_te3, s_te4); - - /* we will now compute 'ki', having 'key_bytes' */ - - u32 ki[4]; - - key_bytes[0] = swap32_S (key_bytes[0]); - key_bytes[1] = swap32_S (key_bytes[1]); - key_bytes[2] = swap32_S (key_bytes[2]); - key_bytes[3] = swap32_S (key_bytes[3]); - - // we can precompute _nfold(pack('>IB', 2, 0x55), 16) - nfolded[0] = 0x62dc6e37; - nfolded[1] = 0x1a63a809; - nfolded[2] = 0x58ac562b; - nfolded[3] = 0x15404ac5; - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - // then aes_cbc encrypt this nfolded value with 'key_bytes' as key along with a null IV - aes128_set_encrypt_key (aes_ks, key_bytes, s_te0, s_te1, s_te2, s_te3, s_te4); - - aes128_encrypt_cbc (aes_ks, aes_iv, nfolded, ki, s_te0, s_te1, s_te2, s_te3, s_te4); - - /* we will now compute 'ke' */ - - u32 ke[4]; - - // we can precompute _nfold(pack('>IB', 2, 0xAA), 16) - nfolded[0] = 0xb5b0582c; - nfolded[1] = 0x14b6500a; - nfolded[2] = 0xad56ab55; - nfolded[3] = 0xaa80556a; - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - // then aes_cbc encrypt this nfolded value with 'key_bytes' as key along with a null IV - aes128_encrypt_cbc (aes_ks, aes_iv, nfolded, ke, s_te0, s_te1, s_te2, s_te3, s_te4); - - /* - we now have 'ke' and 'ki' - - we will decrypt (with 'ke') the 32 first bytes to search for ASN.1 structs - and if we find ASN.1 structs, we will compute the hmac (with 'ki') - - if length >= 128 bytes: - length is on 2 bytes and type is \x63\x82 (encode_krb5_enc_tkt_part) and data is an ASN1 sequence \x30\x82 - else: - length is on 1 byte and type is \x63\x81 and data is an ASN1 sequence \x30\x81 - - next headers follow the same ASN1 "type-length-data" scheme - */ - - u32 first_blocks[16]; - - u32 decrypted_block[4]; - - first_blocks[0] = esalt_bufs[digests_offset].edata2[0]; - first_blocks[1] = esalt_bufs[digests_offset].edata2[1]; - first_blocks[2] = esalt_bufs[digests_offset].edata2[2]; - first_blocks[3] = esalt_bufs[digests_offset].edata2[3]; - - first_blocks[4] = esalt_bufs[digests_offset].edata2[4]; // possible ASN1 structs - first_blocks[5] = esalt_bufs[digests_offset].edata2[5]; - first_blocks[6] = esalt_bufs[digests_offset].edata2[6]; // possible ASN1 structs - first_blocks[7] = esalt_bufs[digests_offset].edata2[7]; - - /* - we will decrypt them here in order to be able to compute hmac directly - if ASN1 structs were to be found - */ - first_blocks[8] = esalt_bufs[digests_offset].edata2[8]; - first_blocks[9] = esalt_bufs[digests_offset].edata2[9]; - first_blocks[10] = esalt_bufs[digests_offset].edata2[10]; - first_blocks[11] = esalt_bufs[digests_offset].edata2[11]; - - first_blocks[12] = esalt_bufs[digests_offset].edata2[12]; - first_blocks[13] = esalt_bufs[digests_offset].edata2[13]; - first_blocks[14] = esalt_bufs[digests_offset].edata2[14]; - first_blocks[15] = esalt_bufs[digests_offset].edata2[15]; - - u32 w0[4]; - u32 w1[4]; - u32 w2[4]; - u32 w3[4]; - - u32 aes_cts_decrypt_ks[44]; - - AES128_set_decrypt_key (aes_cts_decrypt_ks, ke, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - aes128_decrypt_cbc (aes_cts_decrypt_ks, first_blocks, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - aes128_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w1[0] = swap32_S (decrypted_block[0]); - w1[1] = swap32_S (decrypted_block[1]); - w1[2] = swap32_S (decrypted_block[2]); - w1[3] = swap32_S (decrypted_block[3]); - - if (((decrypted_block[0] & 0xff00ffff) == 0x30008163) || ((decrypted_block[0] & 0x0000ffff) == 0x00008263)) - { - if (((decrypted_block[2] & 0x00ffffff) == 0x00000503) || (decrypted_block[2] == 0x050307A0)) - { - // now we decrypt all the ticket to verify checksum - int block_position; - - int edata2_len = esalt_bufs[digests_offset].edata2_len; - - int edata2_left; - - u32 block[16]; - - int last_block_size = edata2_len % 16; - - if(last_block_size == 0) - { - last_block_size = 16; - } - - int last_part = last_block_size + 16; - - int need = edata2_len - last_part; - - int last_block_cbc_position = (need - 16) / 4; - - // we need to decrypt also the 2 following blocks in order to be able to compute the hmac directly - aes128_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w2[0] = swap32_S (decrypted_block[0]); - w2[1] = swap32_S (decrypted_block[1]); - w2[2] = swap32_S (decrypted_block[2]); - w2[3] = swap32_S (decrypted_block[3]); - - aes128_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 12, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w3[0] = swap32_S (decrypted_block[0]); - w3[1] = swap32_S (decrypted_block[1]); - w3[2] = swap32_S (decrypted_block[2]); - w3[3] = swap32_S (decrypted_block[3]); - - sha1_hmac_ctx_t sha1_hmac_ctx; - - /* - hmac message = plaintext - hmac key = ki - */ - - u32 k0[4]; - u32 k1[4]; - u32 k2[4]; - u32 k3[4]; - - k0[0] = ki[0]; - k0[1] = ki[1]; - k0[2] = ki[2]; - k0[3] = ki[3]; - - k1[0] = 0; - k1[1] = 0; - k1[2] = 0; - k1[3] = 0; - - k2[0] = 0; - k2[1] = 0; - k2[2] = 0; - k2[3] = 0; - - k3[0] = 0; - k3[1] = 0; - k3[2] = 0; - k3[3] = 0; - - sha1_hmac_init_64 (&sha1_hmac_ctx, k0, k1, k2, k3); - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 64); - - block_position = 16; - - // first 4 blocks are already decrypted - for (edata2_left = need - 64; edata2_left >= 64; edata2_left -= 64) - { - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; - block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; - block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; - block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; - block[8] = esalt_bufs[digests_offset].edata2[block_position + 8]; - block[9] = esalt_bufs[digests_offset].edata2[block_position + 9]; - block[10] = esalt_bufs[digests_offset].edata2[block_position + 10]; - block[11] = esalt_bufs[digests_offset].edata2[block_position + 11]; - block[12] = esalt_bufs[digests_offset].edata2[block_position + 12]; - block[13] = esalt_bufs[digests_offset].edata2[block_position + 13]; - block[14] = esalt_bufs[digests_offset].edata2[block_position + 14]; - block[15] = esalt_bufs[digests_offset].edata2[block_position + 15]; - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w1[0] = swap32_S (decrypted_block[0]); - w1[1] = swap32_S (decrypted_block[1]); - w1[2] = swap32_S (decrypted_block[2]); - w1[3] = swap32_S (decrypted_block[3]); - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w2[0] = swap32_S (decrypted_block[0]); - w2[1] = swap32_S (decrypted_block[1]); - w2[2] = swap32_S (decrypted_block[2]); - w2[3] = swap32_S (decrypted_block[3]); - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 12, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w3[0] = swap32_S (decrypted_block[0]); - w3[1] = swap32_S (decrypted_block[1]); - w3[2] = swap32_S (decrypted_block[2]); - w3[3] = swap32_S (decrypted_block[3]); - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 64); - - block_position += 16; - } - - if (edata2_left == 16) - { - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - 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; - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 16); - - block_position += 4; - } - else if (edata2_left == 32) - { - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; - block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; - block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; - block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w1[0] = swap32_S (decrypted_block[0]); - w1[1] = swap32_S (decrypted_block[1]); - w1[2] = swap32_S (decrypted_block[2]); - w1[3] = swap32_S (decrypted_block[3]); - - w2[0] = 0; - w2[1] = 0; - w2[2] = 0; - w2[3] = 0; - - w3[0] = 0; - w3[1] = 0; - w3[2] = 0; - w3[3] = 0; - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 32); - - block_position += 8; - } - else if (edata2_left == 48) - { - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; - block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; - block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; - block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; - block[8] = esalt_bufs[digests_offset].edata2[block_position + 8]; - block[9] = esalt_bufs[digests_offset].edata2[block_position + 9]; - block[10] = esalt_bufs[digests_offset].edata2[block_position + 10]; - block[11] = esalt_bufs[digests_offset].edata2[block_position + 11]; - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w1[0] = swap32_S (decrypted_block[0]); - w1[1] = swap32_S (decrypted_block[1]); - w1[2] = swap32_S (decrypted_block[2]); - w1[3] = swap32_S (decrypted_block[3]); - - aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w2[0] = swap32_S (decrypted_block[0]); - w2[1] = swap32_S (decrypted_block[1]); - w2[2] = swap32_S (decrypted_block[2]); - w2[3] = swap32_S (decrypted_block[3]); - - w3[0] = 0; - w3[1] = 0; - w3[2] = 0; - w3[3] = 0; - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 48); - - block_position += 12; - } - - /* - now all the ticket should be decrypted until block n-1 (not included) - and n - */ - - // this is block n-2, it will be xored with the n-1 block later crafted - u32 last_block_cbc[4]; - - last_block_cbc[0] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 0]; - last_block_cbc[1] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 1]; - last_block_cbc[2] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 2]; - last_block_cbc[3] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 3]; - - // n-1 block is decrypted separately from the previous blocks which were cbc decrypted - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - - aes128_decrypt (aes_cts_decrypt_ks, block, decrypted_block, s_td0, s_td1, s_td2, s_td3, s_td4); - - u32 last_block[4]; - - int last_block_position = (edata2_len - last_block_size) / 4; - - u32 n_1_crafted[4]; - - u32 last_plaintext[4]; - - last_plaintext[0] = 0; - last_plaintext[1] = 0; - last_plaintext[2] = 0; - last_plaintext[3] = 0; - - /* - n-1 block is first computed as follows: - - fill n-1 block with the X first bytes of the encrypted last block (n) - with X == length of last block - - complete the rest of the block with - - Final block (n) is computed as follows: - - fill with the X first bytes from n-1 block decrypted and xor them with last block (n) - with X == length of last block - */ - int remaining_blocks = last_block_size / 4; - - /* - last block is not necessarily aligned on 4 bytes so we will have - to shift values for the CTS crap... - */ - u32 shift = last_block_size % 4; - - switch (remaining_blocks) - { - case 0: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - - u32 mask = (0xffffffff >> ((4 - last_block_size) * 8)); - - last_plaintext[0] = last_block[0] ^ (decrypted_block[0] & mask); - last_plaintext[0] = swap32_S (last_plaintext[0]); - - n_1_crafted[0] = (last_block[0] & mask) | (decrypted_block[0] & (mask ^ 0xffffffff)); - n_1_crafted[1] = decrypted_block[1]; - n_1_crafted[2] = decrypted_block[2]; - n_1_crafted[3] = decrypted_block[3]; - break; - - case 1: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - - if (shift == 0) - { - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = decrypted_block[1]; - n_1_crafted[2] = decrypted_block[2]; - n_1_crafted[3] = decrypted_block[3]; - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[0] = swap32_S (last_plaintext[0]); - } - else - { - last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; - - u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ (decrypted_block[1] & mask); - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = (last_block[1] & mask) | (decrypted_block[1] & (mask ^ 0xffffffff)); - n_1_crafted[2] = decrypted_block[2]; - n_1_crafted[3] = decrypted_block[3]; - } - break; - - case 2: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; - - if (shift == 0) - { - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = decrypted_block[2]; - n_1_crafted[3] = decrypted_block[3]; - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - } - else - { - last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; - - u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - last_plaintext[2] = last_block[2] ^ (decrypted_block[2] & mask); - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - last_plaintext[2] = swap32_S (last_plaintext[2]); - - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = (last_block[2] & mask) | (decrypted_block[2] & (mask ^ 0xffffffff)); - n_1_crafted[3] = decrypted_block[3]; - } - break; - - case 3: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; - last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; - - if (shift == 0) - { - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = last_block[2]; - n_1_crafted[3] = decrypted_block[3]; - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - last_plaintext[2] = last_block[2] ^ decrypted_block[2]; - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - last_plaintext[2] = swap32_S (last_plaintext[2]); - } - else - { - last_block[3] = esalt_bufs[digests_offset].edata2[last_block_position + 3]; - - u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - last_plaintext[2] = last_block[2] ^ decrypted_block[2]; - last_plaintext[3] = last_block[3] ^ (decrypted_block[3] & mask); - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - last_plaintext[2] = swap32_S (last_plaintext[2]); - last_plaintext[3] = swap32_S (last_plaintext[3]); - - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = last_block[2]; - n_1_crafted[3] = (last_block[3] & mask) | (decrypted_block[3] & (mask ^ 0xffffffff)); - } - break; - - case 4: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; - last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; - last_block[3] = esalt_bufs[digests_offset].edata2[last_block_position + 3]; - - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = last_block[2]; - n_1_crafted[3] = last_block[3]; - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - last_plaintext[2] = last_block[2] ^ decrypted_block[2]; - last_plaintext[3] = last_block[3] ^ decrypted_block[3]; - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - last_plaintext[2] = swap32_S (last_plaintext[2]); - last_plaintext[3] = swap32_S (last_plaintext[3]); - break; - - default: - return; - } - - // then decrypt this newly created n-1 with 'ke' - aes128_decrypt (aes_cts_decrypt_ks, n_1_crafted, n_1_crafted, s_td0, s_td1, s_td2, s_td3, s_td4); - - // then xor with the encrypted n-2 block - n_1_crafted[0] ^= last_block_cbc[0]; - n_1_crafted[1] ^= last_block_cbc[1]; - n_1_crafted[2] ^= last_block_cbc[2]; - n_1_crafted[3] ^= last_block_cbc[3]; - - w0[0] = swap32_S (n_1_crafted[0]); - w0[1] = swap32_S (n_1_crafted[1]); - w0[2] = swap32_S (n_1_crafted[2]); - w0[3] = swap32_S (n_1_crafted[3]); - - w1[0] = last_plaintext[0]; - w1[1] = last_plaintext[1]; - w1[2] = last_plaintext[2]; - w1[3] = last_plaintext[3]; - - w2[0] = 0; - w2[1] = 0; - w2[2] = 0; - w2[3] = 0; - - w3[0] = 0; - w3[1] = 0; - w3[2] = 0; - w3[3] = 0; - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 16 + last_block_size); - - sha1_hmac_final(&sha1_hmac_ctx); - - if(sha1_hmac_ctx.opad.h[0] == esalt_bufs[digests_offset].checksum[0] - && sha1_hmac_ctx.opad.h[1] == esalt_bufs[digests_offset].checksum[1] - && sha1_hmac_ctx.opad.h[2] == esalt_bufs[digests_offset].checksum[2]) - { - if (atomic_inc (&hashes_shown[digests_offset]) == 0) - { - #define il_pos 0 - mark_hash (plains_buf, d_return_buf, salt_pos, digests_cnt, 0, digests_offset + 0, gid, il_pos, 0, 0); - } - } - } - } +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#define NEW_SIMD_CODE + +#ifdef KERNEL_STATIC +#include "inc_vendor.h" +#include "inc_types.h" +#include "inc_common.cl" +#include "inc_simd.cl" +#include "inc_hash_sha1.cl" +#include "inc_cipher_aes.cl" +#endif + +typedef struct krb5tgs_17 +{ + u32 user[128]; + u32 domain[128]; + u32 account_info[512]; + u32 account_info_len; + + u32 checksum[3]; + u32 edata2[5120]; + u32 edata2_len; + +} krb5tgs_17_t; + +typedef struct krb5tgs_17_tmp +{ + u32 ipad[5]; + u32 opad[5]; + u32 dgst[10]; + u32 out[10]; + +} krb5tgs_17_tmp_t; + +DECLSPEC void aes128_encrypt_cbc (const u32 *aes_ks, u32 *aes_iv, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) +{ + u32 data[4]; + + data[0] = swap32_S (in[0]); + data[1] = swap32_S (in[1]); + data[2] = swap32_S (in[2]); + data[3] = swap32_S (in[3]); + + data[0] ^= aes_iv[0]; + data[1] ^= aes_iv[1]; + data[2] ^= aes_iv[2]; + data[3] ^= aes_iv[3]; + + aes128_encrypt (aes_ks, data, out, s_te0, s_te1, s_te2, s_te3, s_te4); + + aes_iv[0] = out[0]; + aes_iv[1] = out[1]; + aes_iv[2] = out[2]; + aes_iv[3] = out[3]; + + out[0] = swap32_S (out[0]); + out[1] = swap32_S (out[1]); + out[2] = swap32_S (out[2]); + out[3] = swap32_S (out[3]); +} + +DECLSPEC void aes128_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +{ + aes128_decrypt (ks1, in, out, s_td0, s_td1, s_td2, s_td3, s_td4); + + out[0] ^= essiv[0]; + out[1] ^= essiv[1]; + out[2] ^= essiv[2]; + out[3] ^= essiv[3]; + + essiv[0] = in[0]; + essiv[1] = in[1]; + essiv[2] = in[2]; + essiv[3] = in[3]; +} + +DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) +{ + digest[0] = ipad[0]; + digest[1] = ipad[1]; + digest[2] = ipad[2]; + digest[3] = ipad[3]; + digest[4] = ipad[4]; + + sha1_transform_vector (w0, w1, w2, w3, digest); + + w0[0] = digest[0]; + w0[1] = digest[1]; + w0[2] = digest[2]; + w0[3] = digest[3]; + w1[0] = digest[4]; + w1[1] = 0x80000000; + 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] = (64 + 20) * 8; + + digest[0] = opad[0]; + digest[1] = opad[1]; + digest[2] = opad[2]; + digest[3] = opad[3]; + digest[4] = opad[4]; + + sha1_transform_vector (w0, w1, w2, w3, digest); +} + +__kernel void m19600_init (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + /** + * main + */ + + /* initialize hmac-sha1 for pbkdf2(password, account, 4096, account_len) */ + + sha1_hmac_ctx_t sha1_hmac_ctx; + + sha1_hmac_init_global_swap (&sha1_hmac_ctx, pws[gid].i, pws[gid].pw_len); + + tmps[gid].ipad[0] = sha1_hmac_ctx.ipad.h[0]; + tmps[gid].ipad[1] = sha1_hmac_ctx.ipad.h[1]; + tmps[gid].ipad[2] = sha1_hmac_ctx.ipad.h[2]; + tmps[gid].ipad[3] = sha1_hmac_ctx.ipad.h[3]; + tmps[gid].ipad[4] = sha1_hmac_ctx.ipad.h[4]; + + tmps[gid].opad[0] = sha1_hmac_ctx.opad.h[0]; + tmps[gid].opad[1] = sha1_hmac_ctx.opad.h[1]; + tmps[gid].opad[2] = sha1_hmac_ctx.opad.h[2]; + tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; + tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; + + sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[digests_offset].account_info, esalt_bufs[digests_offset].account_info_len); + + for (u32 i = 0, j = 1; i < 4; i += 5, j += 1) + { + sha1_hmac_ctx_t sha1_hmac_ctx2 = sha1_hmac_ctx; + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + + w0[0] = j; + 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; + + sha1_hmac_update_64 (&sha1_hmac_ctx2, w0, w1, w2, w3, 4); + + sha1_hmac_final (&sha1_hmac_ctx2); + + tmps[gid].dgst[i + 0] = sha1_hmac_ctx2.opad.h[0]; + tmps[gid].dgst[i + 1] = sha1_hmac_ctx2.opad.h[1]; + tmps[gid].dgst[i + 2] = sha1_hmac_ctx2.opad.h[2]; + tmps[gid].dgst[i + 3] = sha1_hmac_ctx2.opad.h[3]; + tmps[gid].dgst[i + 4] = sha1_hmac_ctx2.opad.h[4]; + + tmps[gid].out[i + 0] = tmps[gid].dgst[i + 0]; + tmps[gid].out[i + 1] = tmps[gid].dgst[i + 1]; + tmps[gid].out[i + 2] = tmps[gid].dgst[i + 2]; + tmps[gid].out[i + 3] = tmps[gid].dgst[i + 3]; + tmps[gid].out[i + 4] = tmps[gid].dgst[i + 4]; + } +} + +__kernel void m19600_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) +{ + /** + * base + */ + const u64 gid = get_global_id (0); + + if ((gid * VECT_SIZE) >= gid_max) return; + + u32x ipad[5]; + u32x opad[5]; + + ipad[0] = packv (tmps, ipad, gid, 0); + ipad[1] = packv (tmps, ipad, gid, 1); + ipad[2] = packv (tmps, ipad, gid, 2); + ipad[3] = packv (tmps, ipad, gid, 3); + ipad[4] = packv (tmps, ipad, gid, 4); + + opad[0] = packv (tmps, opad, gid, 0); + opad[1] = packv (tmps, opad, gid, 1); + opad[2] = packv (tmps, opad, gid, 2); + opad[3] = packv (tmps, opad, gid, 3); + opad[4] = packv (tmps, opad, gid, 4); + + for (u32 i = 0; i < 4; i += 5) + { + u32x dgst[5]; + u32x out[5]; + + dgst[0] = packv (tmps, dgst, gid, i + 0); + dgst[1] = packv (tmps, dgst, gid, i + 1); + dgst[2] = packv (tmps, dgst, gid, i + 2); + dgst[3] = packv (tmps, dgst, gid, i + 3); + dgst[4] = packv (tmps, dgst, gid, i + 4); + + out[0] = packv (tmps, out, gid, i + 0); + out[1] = packv (tmps, out, gid, i + 1); + out[2] = packv (tmps, out, gid, i + 2); + out[3] = packv (tmps, out, gid, i + 3); + out[4] = packv (tmps, out, gid, i + 4); + + for (u32 j = 0; j < loop_cnt; j++) + { + u32x w0[4]; + u32x w1[4]; + u32x w2[4]; + u32x w3[4]; + + w0[0] = dgst[0]; + w0[1] = dgst[1]; + w0[2] = dgst[2]; + w0[3] = dgst[3]; + w1[0] = dgst[4]; + w1[1] = 0x80000000; + 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] = (64 + 20) * 8; + + hmac_sha1_run_V (w0, w1, w2, w3, ipad, opad, dgst); + + out[0] ^= dgst[0]; + out[1] ^= dgst[1]; + out[2] ^= dgst[2]; + out[3] ^= dgst[3]; + out[4] ^= dgst[4]; + } + + unpackv (tmps, dgst, gid, i + 0, dgst[0]); + unpackv (tmps, dgst, gid, i + 1, dgst[1]); + unpackv (tmps, dgst, gid, i + 2, dgst[2]); + unpackv (tmps, dgst, gid, i + 3, dgst[3]); + unpackv (tmps, dgst, gid, i + 4, dgst[4]); + + unpackv (tmps, out, gid, i + 0, out[0]); + unpackv (tmps, out, gid, i + 1, out[1]); + unpackv (tmps, out, gid, i + 2, out[2]); + unpackv (tmps, out, gid, i + 3, out[3]); + unpackv (tmps, out, gid, i + 4, out[4]); + } +} + +__kernel void m19600_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_17_tmp_t, krb5tgs_17_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + const u64 lid = get_local_id (0); + const u64 lsz = get_local_size (0); + + /** + * aes shared + */ + + #ifdef REAL_SHM + + __local u32 s_te0[256]; + __local u32 s_te1[256]; + __local u32 s_te2[256]; + __local u32 s_te3[256]; + __local u32 s_te4[256]; + + __local u32 s_td0[256]; + __local u32 s_td1[256]; + __local u32 s_td2[256]; + __local u32 s_td3[256]; + __local u32 s_td4[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + s_te0[i] = te0[i]; + s_te1[i] = te1[i]; + s_te2[i] = te2[i]; + s_te3[i] = te3[i]; + s_te4[i] = te4[i]; + + s_td0[i] = td0[i]; + s_td1[i] = td1[i]; + s_td2[i] = td2[i]; + s_td3[i] = td3[i]; + s_td4[i] = td4[i]; + } + + barrier (CLK_LOCAL_MEM_FENCE); + + #else + + __constant u32a *s_te0 = te0; + __constant u32a *s_te1 = te1; + __constant u32a *s_te2 = te2; + __constant u32a *s_te3 = te3; + __constant u32a *s_te4 = te4; + + __constant u32a *s_td0 = td0; + __constant u32a *s_td1 = td1; + __constant u32a *s_td2 = td2; + __constant u32a *s_td3 = td3; + __constant u32a *s_td4 = td4; + + #endif + + if (gid >= gid_max) return; + + /* + at this point, the output ('seed') will be used to generate AES keys: + + key_bytes = derive(seed, 'kerberos'.encode(), seedsize) + + 'key_bytes' will be the AES key used to generate 'ke' and 'ki' + 'ke' will be the AES key to decrypt the ticket + 'ki' will be the key to compute the final HMAC + */ + + u32 nfolded[4]; + + // we can precompute _nfold('kerberos', 16) + nfolded[0] = 0x6b657262; + nfolded[1] = 0x65726f73; + nfolded[2] = 0x7b9b5b2b; + nfolded[3] = 0x93132b93; + + // then aes_cbc encrypt this nfolded value with 'seed' as key along with a null IV + u32 aes_key[4]; + + aes_key[0] = swap32_S (tmps[gid].out[0]); + aes_key[1] = swap32_S (tmps[gid].out[1]); + aes_key[2] = swap32_S (tmps[gid].out[2]); + aes_key[3] = swap32_S (tmps[gid].out[3]); + + u32 aes_iv[4]; + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + u32 aes_ks[44]; + + aes128_set_encrypt_key (aes_ks, aes_key, s_te0, s_te1, s_te2, s_te3, s_te4); + + u32 key_bytes[4]; + + aes128_encrypt_cbc (aes_ks, aes_iv, nfolded, key_bytes, s_te0, s_te1, s_te2, s_te3, s_te4); + + /* we will now compute 'ki', having 'key_bytes' */ + + u32 ki[4]; + + key_bytes[0] = swap32_S (key_bytes[0]); + key_bytes[1] = swap32_S (key_bytes[1]); + key_bytes[2] = swap32_S (key_bytes[2]); + key_bytes[3] = swap32_S (key_bytes[3]); + + // we can precompute _nfold(pack('>IB', 2, 0x55), 16) + nfolded[0] = 0x62dc6e37; + nfolded[1] = 0x1a63a809; + nfolded[2] = 0x58ac562b; + nfolded[3] = 0x15404ac5; + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + // then aes_cbc encrypt this nfolded value with 'key_bytes' as key along with a null IV + aes128_set_encrypt_key (aes_ks, key_bytes, s_te0, s_te1, s_te2, s_te3, s_te4); + + aes128_encrypt_cbc (aes_ks, aes_iv, nfolded, ki, s_te0, s_te1, s_te2, s_te3, s_te4); + + /* we will now compute 'ke' */ + + u32 ke[4]; + + // we can precompute _nfold(pack('>IB', 2, 0xAA), 16) + nfolded[0] = 0xb5b0582c; + nfolded[1] = 0x14b6500a; + nfolded[2] = 0xad56ab55; + nfolded[3] = 0xaa80556a; + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + // then aes_cbc encrypt this nfolded value with 'key_bytes' as key along with a null IV + aes128_encrypt_cbc (aes_ks, aes_iv, nfolded, ke, s_te0, s_te1, s_te2, s_te3, s_te4); + + /* + we now have 'ke' and 'ki' + + we will decrypt (with 'ke') the 32 first bytes to search for ASN.1 structs + and if we find ASN.1 structs, we will compute the hmac (with 'ki') + + if length >= 128 bytes: + length is on 2 bytes and type is \x63\x82 (encode_krb5_enc_tkt_part) and data is an ASN1 sequence \x30\x82 + else: + length is on 1 byte and type is \x63\x81 and data is an ASN1 sequence \x30\x81 + + next headers follow the same ASN1 "type-length-data" scheme + */ + + u32 first_blocks[16]; + + u32 decrypted_block[4]; + + first_blocks[0] = esalt_bufs[digests_offset].edata2[0]; + first_blocks[1] = esalt_bufs[digests_offset].edata2[1]; + first_blocks[2] = esalt_bufs[digests_offset].edata2[2]; + first_blocks[3] = esalt_bufs[digests_offset].edata2[3]; + + first_blocks[4] = esalt_bufs[digests_offset].edata2[4]; // possible ASN1 structs + first_blocks[5] = esalt_bufs[digests_offset].edata2[5]; + first_blocks[6] = esalt_bufs[digests_offset].edata2[6]; // possible ASN1 structs + first_blocks[7] = esalt_bufs[digests_offset].edata2[7]; + + /* + we will decrypt them here in order to be able to compute hmac directly + if ASN1 structs were to be found + */ + first_blocks[8] = esalt_bufs[digests_offset].edata2[8]; + first_blocks[9] = esalt_bufs[digests_offset].edata2[9]; + first_blocks[10] = esalt_bufs[digests_offset].edata2[10]; + first_blocks[11] = esalt_bufs[digests_offset].edata2[11]; + + first_blocks[12] = esalt_bufs[digests_offset].edata2[12]; + first_blocks[13] = esalt_bufs[digests_offset].edata2[13]; + first_blocks[14] = esalt_bufs[digests_offset].edata2[14]; + first_blocks[15] = esalt_bufs[digests_offset].edata2[15]; + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + + u32 aes_cts_decrypt_ks[44]; + + AES128_set_decrypt_key (aes_cts_decrypt_ks, ke, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + aes128_decrypt_cbc (aes_cts_decrypt_ks, first_blocks, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + aes128_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w1[0] = swap32_S (decrypted_block[0]); + w1[1] = swap32_S (decrypted_block[1]); + w1[2] = swap32_S (decrypted_block[2]); + w1[3] = swap32_S (decrypted_block[3]); + + if (((decrypted_block[0] & 0xff00ffff) == 0x30008163) || ((decrypted_block[0] & 0x0000ffff) == 0x00008263)) + { + if (((decrypted_block[2] & 0x00ffffff) == 0x00000503) || (decrypted_block[2] == 0x050307A0)) + { + // now we decrypt all the ticket to verify checksum + int block_position; + + int edata2_len = esalt_bufs[digests_offset].edata2_len; + + int edata2_left; + + u32 block[16]; + + int last_block_size = edata2_len % 16; + + if(last_block_size == 0) + { + last_block_size = 16; + } + + int last_part = last_block_size + 16; + + int need = edata2_len - last_part; + + int last_block_cbc_position = (need - 16) / 4; + + // we need to decrypt also the 2 following blocks in order to be able to compute the hmac directly + aes128_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w2[0] = swap32_S (decrypted_block[0]); + w2[1] = swap32_S (decrypted_block[1]); + w2[2] = swap32_S (decrypted_block[2]); + w2[3] = swap32_S (decrypted_block[3]); + + aes128_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 12, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w3[0] = swap32_S (decrypted_block[0]); + w3[1] = swap32_S (decrypted_block[1]); + w3[2] = swap32_S (decrypted_block[2]); + w3[3] = swap32_S (decrypted_block[3]); + + sha1_hmac_ctx_t sha1_hmac_ctx; + + /* + hmac message = plaintext + hmac key = ki + */ + + u32 k0[4]; + u32 k1[4]; + u32 k2[4]; + u32 k3[4]; + + k0[0] = ki[0]; + k0[1] = ki[1]; + k0[2] = ki[2]; + k0[3] = ki[3]; + + k1[0] = 0; + k1[1] = 0; + k1[2] = 0; + k1[3] = 0; + + k2[0] = 0; + k2[1] = 0; + k2[2] = 0; + k2[3] = 0; + + k3[0] = 0; + k3[1] = 0; + k3[2] = 0; + k3[3] = 0; + + sha1_hmac_init_64 (&sha1_hmac_ctx, k0, k1, k2, k3); + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 64); + + block_position = 16; + + // first 4 blocks are already decrypted + for (edata2_left = need - 64; edata2_left >= 64; edata2_left -= 64) + { + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; + block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; + block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; + block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; + block[8] = esalt_bufs[digests_offset].edata2[block_position + 8]; + block[9] = esalt_bufs[digests_offset].edata2[block_position + 9]; + block[10] = esalt_bufs[digests_offset].edata2[block_position + 10]; + block[11] = esalt_bufs[digests_offset].edata2[block_position + 11]; + block[12] = esalt_bufs[digests_offset].edata2[block_position + 12]; + block[13] = esalt_bufs[digests_offset].edata2[block_position + 13]; + block[14] = esalt_bufs[digests_offset].edata2[block_position + 14]; + block[15] = esalt_bufs[digests_offset].edata2[block_position + 15]; + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w1[0] = swap32_S (decrypted_block[0]); + w1[1] = swap32_S (decrypted_block[1]); + w1[2] = swap32_S (decrypted_block[2]); + w1[3] = swap32_S (decrypted_block[3]); + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w2[0] = swap32_S (decrypted_block[0]); + w2[1] = swap32_S (decrypted_block[1]); + w2[2] = swap32_S (decrypted_block[2]); + w2[3] = swap32_S (decrypted_block[3]); + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 12, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w3[0] = swap32_S (decrypted_block[0]); + w3[1] = swap32_S (decrypted_block[1]); + w3[2] = swap32_S (decrypted_block[2]); + w3[3] = swap32_S (decrypted_block[3]); + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 64); + + block_position += 16; + } + + if (edata2_left == 16) + { + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + 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; + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 16); + + block_position += 4; + } + else if (edata2_left == 32) + { + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; + block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; + block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; + block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w1[0] = swap32_S (decrypted_block[0]); + w1[1] = swap32_S (decrypted_block[1]); + w1[2] = swap32_S (decrypted_block[2]); + w1[3] = swap32_S (decrypted_block[3]); + + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 32); + + block_position += 8; + } + else if (edata2_left == 48) + { + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; + block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; + block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; + block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; + block[8] = esalt_bufs[digests_offset].edata2[block_position + 8]; + block[9] = esalt_bufs[digests_offset].edata2[block_position + 9]; + block[10] = esalt_bufs[digests_offset].edata2[block_position + 10]; + block[11] = esalt_bufs[digests_offset].edata2[block_position + 11]; + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w1[0] = swap32_S (decrypted_block[0]); + w1[1] = swap32_S (decrypted_block[1]); + w1[2] = swap32_S (decrypted_block[2]); + w1[3] = swap32_S (decrypted_block[3]); + + aes128_decrypt_cbc (aes_cts_decrypt_ks, block + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w2[0] = swap32_S (decrypted_block[0]); + w2[1] = swap32_S (decrypted_block[1]); + w2[2] = swap32_S (decrypted_block[2]); + w2[3] = swap32_S (decrypted_block[3]); + + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 48); + + block_position += 12; + } + + /* + now all the ticket should be decrypted until block n-1 (not included) + and n + */ + + // this is block n-2, it will be xored with the n-1 block later crafted + u32 last_block_cbc[4]; + + last_block_cbc[0] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 0]; + last_block_cbc[1] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 1]; + last_block_cbc[2] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 2]; + last_block_cbc[3] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 3]; + + // n-1 block is decrypted separately from the previous blocks which were cbc decrypted + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + + aes128_decrypt (aes_cts_decrypt_ks, block, decrypted_block, s_td0, s_td1, s_td2, s_td3, s_td4); + + u32 last_block[4]; + + int last_block_position = (edata2_len - last_block_size) / 4; + + u32 n_1_crafted[4]; + + u32 last_plaintext[4]; + + last_plaintext[0] = 0; + last_plaintext[1] = 0; + last_plaintext[2] = 0; + last_plaintext[3] = 0; + + /* + n-1 block is first computed as follows: + - fill n-1 block with the X first bytes of the encrypted last block (n) + with X == length of last block + - complete the rest of the block with + + Final block (n) is computed as follows: + - fill with the X first bytes from n-1 block decrypted and xor them with last block (n) + with X == length of last block + */ + int remaining_blocks = last_block_size / 4; + + /* + last block is not necessarily aligned on 4 bytes so we will have + to shift values for the CTS crap... + */ + u32 shift = last_block_size % 4; + + switch (remaining_blocks) + { + case 0: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + + u32 mask = (0xffffffff >> ((4 - last_block_size) * 8)); + + last_plaintext[0] = last_block[0] ^ (decrypted_block[0] & mask); + last_plaintext[0] = swap32_S (last_plaintext[0]); + + n_1_crafted[0] = (last_block[0] & mask) | (decrypted_block[0] & (mask ^ 0xffffffff)); + n_1_crafted[1] = decrypted_block[1]; + n_1_crafted[2] = decrypted_block[2]; + n_1_crafted[3] = decrypted_block[3]; + break; + + case 1: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + + if (shift == 0) + { + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = decrypted_block[1]; + n_1_crafted[2] = decrypted_block[2]; + n_1_crafted[3] = decrypted_block[3]; + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[0] = swap32_S (last_plaintext[0]); + } + else + { + last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; + + u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ (decrypted_block[1] & mask); + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = (last_block[1] & mask) | (decrypted_block[1] & (mask ^ 0xffffffff)); + n_1_crafted[2] = decrypted_block[2]; + n_1_crafted[3] = decrypted_block[3]; + } + break; + + case 2: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; + + if (shift == 0) + { + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = decrypted_block[2]; + n_1_crafted[3] = decrypted_block[3]; + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + } + else + { + last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; + + u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + last_plaintext[2] = last_block[2] ^ (decrypted_block[2] & mask); + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + last_plaintext[2] = swap32_S (last_plaintext[2]); + + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = (last_block[2] & mask) | (decrypted_block[2] & (mask ^ 0xffffffff)); + n_1_crafted[3] = decrypted_block[3]; + } + break; + + case 3: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; + last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; + + if (shift == 0) + { + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = last_block[2]; + n_1_crafted[3] = decrypted_block[3]; + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + last_plaintext[2] = last_block[2] ^ decrypted_block[2]; + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + last_plaintext[2] = swap32_S (last_plaintext[2]); + } + else + { + last_block[3] = esalt_bufs[digests_offset].edata2[last_block_position + 3]; + + u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + last_plaintext[2] = last_block[2] ^ decrypted_block[2]; + last_plaintext[3] = last_block[3] ^ (decrypted_block[3] & mask); + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + last_plaintext[2] = swap32_S (last_plaintext[2]); + last_plaintext[3] = swap32_S (last_plaintext[3]); + + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = last_block[2]; + n_1_crafted[3] = (last_block[3] & mask) | (decrypted_block[3] & (mask ^ 0xffffffff)); + } + break; + + case 4: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; + last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; + last_block[3] = esalt_bufs[digests_offset].edata2[last_block_position + 3]; + + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = last_block[2]; + n_1_crafted[3] = last_block[3]; + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + last_plaintext[2] = last_block[2] ^ decrypted_block[2]; + last_plaintext[3] = last_block[3] ^ decrypted_block[3]; + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + last_plaintext[2] = swap32_S (last_plaintext[2]); + last_plaintext[3] = swap32_S (last_plaintext[3]); + break; + + default: + return; + } + + // then decrypt this newly created n-1 with 'ke' + aes128_decrypt (aes_cts_decrypt_ks, n_1_crafted, n_1_crafted, s_td0, s_td1, s_td2, s_td3, s_td4); + + // then xor with the encrypted n-2 block + n_1_crafted[0] ^= last_block_cbc[0]; + n_1_crafted[1] ^= last_block_cbc[1]; + n_1_crafted[2] ^= last_block_cbc[2]; + n_1_crafted[3] ^= last_block_cbc[3]; + + w0[0] = swap32_S (n_1_crafted[0]); + w0[1] = swap32_S (n_1_crafted[1]); + w0[2] = swap32_S (n_1_crafted[2]); + w0[3] = swap32_S (n_1_crafted[3]); + + w1[0] = last_plaintext[0]; + w1[1] = last_plaintext[1]; + w1[2] = last_plaintext[2]; + w1[3] = last_plaintext[3]; + + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 16 + last_block_size); + + sha1_hmac_final(&sha1_hmac_ctx); + + if(sha1_hmac_ctx.opad.h[0] == esalt_bufs[digests_offset].checksum[0] + && sha1_hmac_ctx.opad.h[1] == esalt_bufs[digests_offset].checksum[1] + && sha1_hmac_ctx.opad.h[2] == esalt_bufs[digests_offset].checksum[2]) + { + if (atomic_inc (&hashes_shown[digests_offset]) == 0) + { + #define il_pos 0 + mark_hash (plains_buf, d_return_buf, salt_pos, digests_cnt, 0, digests_offset + 0, gid, il_pos, 0, 0); + } + } + } + } } \ No newline at end of file diff --git a/OpenCL/m19700-pure.cl b/OpenCL/m19700-pure.cl index 547273992..eec42571d 100644 --- a/OpenCL/m19700-pure.cl +++ b/OpenCL/m19700-pure.cl @@ -1,1069 +1,1071 @@ -/** - * Author......: See docs/credits.txt - * License.....: MIT - */ - -#define NEW_SIMD_CODE - -#include "inc_vendor.h" -#include "inc_types.h" -#include "inc_common.cl" -#include "inc_simd.cl" -#include "inc_hash_sha1.cl" -#include "inc_cipher_aes.cl" - -typedef struct krb5tgs_18 -{ - u32 user[128]; - u32 domain[128]; - u32 account_info[512]; - u32 account_info_len; - - u32 checksum[3]; - u32 edata2[5120]; - u32 edata2_len; - -} krb5tgs_18_t; - -typedef struct krb5tgs_18_tmp -{ - u32 ipad[5]; - u32 opad[5]; - u32 dgst[16]; - u32 out[16]; - -} krb5tgs_18_tmp_t; - -DECLSPEC void aes256_encrypt_cbc (const u32 *aes_ks, u32 *aes_iv, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) -{ - u32 data[4]; - - data[0] = swap32_S (in[0]); - data[1] = swap32_S (in[1]); - data[2] = swap32_S (in[2]); - data[3] = swap32_S (in[3]); - - data[0] ^= aes_iv[0]; - data[1] ^= aes_iv[1]; - data[2] ^= aes_iv[2]; - data[3] ^= aes_iv[3]; - - aes256_encrypt (aes_ks, data, out, s_te0, s_te1, s_te2, s_te3, s_te4); - - aes_iv[0] = out[0]; - aes_iv[1] = out[1]; - aes_iv[2] = out[2]; - aes_iv[3] = out[3]; - - out[0] = swap32_S (out[0]); - out[1] = swap32_S (out[1]); - out[2] = swap32_S (out[2]); - out[3] = swap32_S (out[3]); -} - -DECLSPEC void aes256_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) -{ - aes256_decrypt (ks1, in, out, s_td0, s_td1, s_td2, s_td3, s_td4); - - out[0] ^= essiv[0]; - out[1] ^= essiv[1]; - out[2] ^= essiv[2]; - out[3] ^= essiv[3]; - - essiv[0] = in[0]; - essiv[1] = in[1]; - essiv[2] = in[2]; - essiv[3] = in[3]; -} - -DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) -{ - digest[0] = ipad[0]; - digest[1] = ipad[1]; - digest[2] = ipad[2]; - digest[3] = ipad[3]; - digest[4] = ipad[4]; - - sha1_transform_vector (w0, w1, w2, w3, digest); - - w0[0] = digest[0]; - w0[1] = digest[1]; - w0[2] = digest[2]; - w0[3] = digest[3]; - w1[0] = digest[4]; - w1[1] = 0x80000000; - 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] = (64 + 20) * 8; - - digest[0] = opad[0]; - digest[1] = opad[1]; - digest[2] = opad[2]; - digest[3] = opad[3]; - digest[4] = opad[4]; - - sha1_transform_vector (w0, w1, w2, w3, digest); -} - -__kernel void m19700_init (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) -{ - /** - * base - */ - - const u64 gid = get_global_id (0); - - if (gid >= gid_max) return; - - /** - * main - */ - - /* initialize hmac-sha1 for pbkdf2(password, account, 4096, account_len) */ - - sha1_hmac_ctx_t sha1_hmac_ctx; - - sha1_hmac_init_global_swap (&sha1_hmac_ctx, pws[gid].i, pws[gid].pw_len); - - tmps[gid].ipad[0] = sha1_hmac_ctx.ipad.h[0]; - tmps[gid].ipad[1] = sha1_hmac_ctx.ipad.h[1]; - tmps[gid].ipad[2] = sha1_hmac_ctx.ipad.h[2]; - tmps[gid].ipad[3] = sha1_hmac_ctx.ipad.h[3]; - tmps[gid].ipad[4] = sha1_hmac_ctx.ipad.h[4]; - - tmps[gid].opad[0] = sha1_hmac_ctx.opad.h[0]; - tmps[gid].opad[1] = sha1_hmac_ctx.opad.h[1]; - tmps[gid].opad[2] = sha1_hmac_ctx.opad.h[2]; - tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; - tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; - - sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[digests_offset].account_info, esalt_bufs[digests_offset].account_info_len); - - for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) - { - sha1_hmac_ctx_t sha1_hmac_ctx2 = sha1_hmac_ctx; - - u32 w0[4]; - u32 w1[4]; - u32 w2[4]; - u32 w3[4]; - - w0[0] = j; - 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; - - sha1_hmac_update_64 (&sha1_hmac_ctx2, w0, w1, w2, w3, 4); - - sha1_hmac_final (&sha1_hmac_ctx2); - - tmps[gid].dgst[i + 0] = sha1_hmac_ctx2.opad.h[0]; - tmps[gid].dgst[i + 1] = sha1_hmac_ctx2.opad.h[1]; - tmps[gid].dgst[i + 2] = sha1_hmac_ctx2.opad.h[2]; - tmps[gid].dgst[i + 3] = sha1_hmac_ctx2.opad.h[3]; - tmps[gid].dgst[i + 4] = sha1_hmac_ctx2.opad.h[4]; - - tmps[gid].out[i + 0] = tmps[gid].dgst[i + 0]; - tmps[gid].out[i + 1] = tmps[gid].dgst[i + 1]; - tmps[gid].out[i + 2] = tmps[gid].dgst[i + 2]; - tmps[gid].out[i + 3] = tmps[gid].dgst[i + 3]; - tmps[gid].out[i + 4] = tmps[gid].dgst[i + 4]; - } -} - -__kernel void m19700_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) -{ - /** - * base - */ - const u64 gid = get_global_id (0); - - if ((gid * VECT_SIZE) >= gid_max) return; - - u32x ipad[5]; - u32x opad[5]; - - ipad[0] = packv (tmps, ipad, gid, 0); - ipad[1] = packv (tmps, ipad, gid, 1); - ipad[2] = packv (tmps, ipad, gid, 2); - ipad[3] = packv (tmps, ipad, gid, 3); - ipad[4] = packv (tmps, ipad, gid, 4); - - opad[0] = packv (tmps, opad, gid, 0); - opad[1] = packv (tmps, opad, gid, 1); - opad[2] = packv (tmps, opad, gid, 2); - opad[3] = packv (tmps, opad, gid, 3); - opad[4] = packv (tmps, opad, gid, 4); - - for (u32 i = 0; i < 8; i += 5) - { - u32x dgst[5]; - u32x out[5]; - - dgst[0] = packv (tmps, dgst, gid, i + 0); - dgst[1] = packv (tmps, dgst, gid, i + 1); - dgst[2] = packv (tmps, dgst, gid, i + 2); - dgst[3] = packv (tmps, dgst, gid, i + 3); - dgst[4] = packv (tmps, dgst, gid, i + 4); - - out[0] = packv (tmps, out, gid, i + 0); - out[1] = packv (tmps, out, gid, i + 1); - out[2] = packv (tmps, out, gid, i + 2); - out[3] = packv (tmps, out, gid, i + 3); - out[4] = packv (tmps, out, gid, i + 4); - - for (u32 j = 0; j < loop_cnt; j++) - { - u32x w0[4]; - u32x w1[4]; - u32x w2[4]; - u32x w3[4]; - - w0[0] = dgst[0]; - w0[1] = dgst[1]; - w0[2] = dgst[2]; - w0[3] = dgst[3]; - w1[0] = dgst[4]; - w1[1] = 0x80000000; - 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] = (64 + 20) * 8; - - hmac_sha1_run_V (w0, w1, w2, w3, ipad, opad, dgst); - - out[0] ^= dgst[0]; - out[1] ^= dgst[1]; - out[2] ^= dgst[2]; - out[3] ^= dgst[3]; - out[4] ^= dgst[4]; - } - - unpackv (tmps, dgst, gid, i + 0, dgst[0]); - unpackv (tmps, dgst, gid, i + 1, dgst[1]); - unpackv (tmps, dgst, gid, i + 2, dgst[2]); - unpackv (tmps, dgst, gid, i + 3, dgst[3]); - unpackv (tmps, dgst, gid, i + 4, dgst[4]); - - unpackv (tmps, out, gid, i + 0, out[0]); - unpackv (tmps, out, gid, i + 1, out[1]); - unpackv (tmps, out, gid, i + 2, out[2]); - unpackv (tmps, out, gid, i + 3, out[3]); - unpackv (tmps, out, gid, i + 4, out[4]); - } -} - -__kernel void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) -{ - /** - * base - */ - - const u64 gid = get_global_id (0); - const u64 lid = get_local_id (0); - const u64 lsz = get_local_size (0); - - /** - * aes shared - */ - - #ifdef REAL_SHM - - __local u32 s_td0[256]; - __local u32 s_td1[256]; - __local u32 s_td2[256]; - __local u32 s_td3[256]; - __local u32 s_td4[256]; - - __local u32 s_te0[256]; - __local u32 s_te1[256]; - __local u32 s_te2[256]; - __local u32 s_te3[256]; - __local u32 s_te4[256]; - - for (u32 i = lid; i < 256; i += lsz) - { - s_td0[i] = td0[i]; - s_td1[i] = td1[i]; - s_td2[i] = td2[i]; - s_td3[i] = td3[i]; - s_td4[i] = td4[i]; - - s_te0[i] = te0[i]; - s_te1[i] = te1[i]; - s_te2[i] = te2[i]; - s_te3[i] = te3[i]; - s_te4[i] = te4[i]; - } - - barrier (CLK_LOCAL_MEM_FENCE); - - #else - - __constant u32a *s_td0 = td0; - __constant u32a *s_td1 = td1; - __constant u32a *s_td2 = td2; - __constant u32a *s_td3 = td3; - __constant u32a *s_td4 = td4; - - __constant u32a *s_te0 = te0; - __constant u32a *s_te1 = te1; - __constant u32a *s_te2 = te2; - __constant u32a *s_te3 = te3; - __constant u32a *s_te4 = te4; - - #endif - - if (gid >= gid_max) return; - - /* - at this point, the output ('seed') will be used to generate AES keys: - - key_bytes = derive(seed, 'kerberos'.encode(), seedsize) - - 'key_bytes' will be the AES key used to generate 'ke' and 'ki' - 'ke' will be the AES key to decrypt the ticket - 'ki' will be the key to compute the final HMAC - */ - - u32 nfolded[4]; - - // we can precompute _nfold('kerberos', 16) - nfolded[0] = 0x6b657262; - nfolded[1] = 0x65726f73; - nfolded[2] = 0x7b9b5b2b; - nfolded[3] = 0x93132b93; - - // then aes_cbc encrypt this nfolded value with 'seed' as key along with a null IV - u32 aes_key[8]; - - aes_key[0] = swap32_S (tmps[gid].out[0]); - aes_key[1] = swap32_S (tmps[gid].out[1]); - aes_key[2] = swap32_S (tmps[gid].out[2]); - aes_key[3] = swap32_S (tmps[gid].out[3]); - aes_key[4] = swap32_S (tmps[gid].out[4]); - aes_key[5] = swap32_S (tmps[gid].out[5]); - aes_key[6] = swap32_S (tmps[gid].out[6]); - aes_key[7] = swap32_S (tmps[gid].out[7]); - - u32 aes_iv[4]; - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - u32 aes_ks[60]; - - aes256_set_encrypt_key (aes_ks, aes_key, s_te0, s_te1, s_te2, s_te3, s_te4); - - u32 key_bytes[8]; - - u32 out[4]; - aes256_encrypt_cbc (aes_ks, aes_iv, nfolded, out, s_te0, s_te1, s_te2, s_te3, s_te4); - - key_bytes[0] = out[0]; - key_bytes[1] = out[1]; - key_bytes[2] = out[2]; - key_bytes[3] = out[3]; - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - aes256_encrypt_cbc (aes_ks, aes_iv, out, out, s_te0, s_te1, s_te2, s_te3, s_te4); - - key_bytes[4] = out[0]; - key_bytes[5] = out[1]; - key_bytes[6] = out[2]; - key_bytes[7] = out[3]; - - /* we will now compute 'ki', having 'key_bytes' */ - - u32 ki[8]; - - // we can precompute _nfold(pack('>IB', 2, 0x55), 16) - nfolded[0] = 0x62dc6e37; - nfolded[1] = 0x1a63a809; - nfolded[2] = 0x58ac562b; - nfolded[3] = 0x15404ac5; - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - key_bytes[0] = swap32_S (key_bytes[0]); - key_bytes[1] = swap32_S (key_bytes[1]); - key_bytes[2] = swap32_S (key_bytes[2]); - key_bytes[3] = swap32_S (key_bytes[3]); - key_bytes[4] = swap32_S (key_bytes[4]); - key_bytes[5] = swap32_S (key_bytes[5]); - key_bytes[6] = swap32_S (key_bytes[6]); - key_bytes[7] = swap32_S (key_bytes[7]); - - // then aes_cbc encrypt this nfolded value with 'key_bytes' as key along with a null IV - aes256_set_encrypt_key (aes_ks, key_bytes, s_te0, s_te1, s_te2, s_te3, s_te4); - - aes256_encrypt_cbc (aes_ks, aes_iv, nfolded, out, s_te0, s_te1, s_te2, s_te3, s_te4); - - ki[0] = out[0]; - ki[1] = out[1]; - ki[2] = out[2]; - ki[3] = out[3]; - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - aes256_encrypt_cbc (aes_ks, aes_iv, out, out, s_te0, s_te1, s_te2, s_te3, s_te4); - - ki[4] = out[0]; - ki[5] = out[1]; - ki[6] = out[2]; - ki[7] = out[3]; - - /* we will now compute 'ke' */ - - u32 ke[8]; - - // we can precompute _nfold(pack('>IB', 2, 0xAA), 16) - nfolded[0] = 0xb5b0582c; - nfolded[1] = 0x14b6500a; - nfolded[2] = 0xad56ab55; - nfolded[3] = 0xaa80556a; - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - // then aes_cbc encrypt this nfolded value with 'key_bytes' as key along with a null IV - aes256_encrypt_cbc (aes_ks, aes_iv, nfolded, out, s_te0, s_te1, s_te2, s_te3, s_te4); - - ke[0] = out[0]; - ke[1] = out[1]; - ke[2] = out[2]; - ke[3] = out[3]; - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - aes256_encrypt_cbc (aes_ks, aes_iv, out, out, s_te0, s_te1, s_te2, s_te3, s_te4); - - ke[4] = out[0]; - ke[5] = out[1]; - ke[6] = out[2]; - ke[7] = out[3]; - - /* - we now have 'ke' and 'ki' - - we will decrypt (with 'ke') the 32 first bytes to search for ASN.1 structs - and if we find ASN.1 structs, we will compute the hmac (with 'ki') - - if length >= 128 bytes: - length is on 2 bytes and type is \x63\x82 (encode_krb5_enc_tkt_part) and data is an ASN1 sequence \x30\x82 - else: - length is on 1 byte and type is \x63\x81 and data is an ASN1 sequence \x30\x81 - - next headers follow the same ASN1 "type-length-data" scheme - */ - - u32 first_blocks[16]; - - u32 decrypted_block[8]; - - first_blocks[0] = esalt_bufs[digests_offset].edata2[0]; - first_blocks[1] = esalt_bufs[digests_offset].edata2[1]; - first_blocks[2] = esalt_bufs[digests_offset].edata2[2]; - first_blocks[3] = esalt_bufs[digests_offset].edata2[3]; - - first_blocks[4] = esalt_bufs[digests_offset].edata2[4]; // possible ASN1 structs - first_blocks[5] = esalt_bufs[digests_offset].edata2[5]; - first_blocks[6] = esalt_bufs[digests_offset].edata2[6]; // possible ASN1 structs - first_blocks[7] = esalt_bufs[digests_offset].edata2[7]; - - /* - we will decrypt them here in order to be able to compute hmac directly - if ASN1 structs were to be found - */ - first_blocks[8] = esalt_bufs[digests_offset].edata2[8]; - first_blocks[9] = esalt_bufs[digests_offset].edata2[9]; - first_blocks[10] = esalt_bufs[digests_offset].edata2[10]; - first_blocks[11] = esalt_bufs[digests_offset].edata2[11]; - - first_blocks[12] = esalt_bufs[digests_offset].edata2[12]; - first_blocks[13] = esalt_bufs[digests_offset].edata2[13]; - first_blocks[14] = esalt_bufs[digests_offset].edata2[14]; - first_blocks[15] = esalt_bufs[digests_offset].edata2[15]; - - u32 w0[4]; - u32 w1[4]; - u32 w2[4]; - u32 w3[4]; - - u32 aes_cts_decrypt_ks[60]; - - AES256_set_decrypt_key (aes_cts_decrypt_ks, ke, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); - - aes_iv[0] = 0; - aes_iv[1] = 0; - aes_iv[2] = 0; - aes_iv[3] = 0; - - aes256_decrypt_cbc (aes_cts_decrypt_ks, first_blocks, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - aes256_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w1[0] = swap32_S (decrypted_block[0]); - w1[1] = swap32_S (decrypted_block[1]); - w1[2] = swap32_S (decrypted_block[2]); - w1[3] = swap32_S (decrypted_block[3]); - - if (((decrypted_block[0] & 0xff00ffff) == 0x30008163) || ((decrypted_block[0] & 0x0000ffff) == 0x00008263)) - { - if (((decrypted_block[2] & 0x00ffffff) == 0x00000503) || (decrypted_block[2] == 0x050307A0)) - { - - // now we decrypt all the ticket to verify checksum - - // we need to decrypt also the 2 following blocks in order to be able to compute the hmac directly - aes256_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w2[0] = swap32_S (decrypted_block[0]); - w2[1] = swap32_S (decrypted_block[1]); - w2[2] = swap32_S (decrypted_block[2]); - w2[3] = swap32_S (decrypted_block[3]); - - aes256_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 12, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w3[0] = swap32_S (decrypted_block[0]); - w3[1] = swap32_S (decrypted_block[1]); - w3[2] = swap32_S (decrypted_block[2]); - w3[3] = swap32_S (decrypted_block[3]); - - int block_position; - - int edata2_len = esalt_bufs[digests_offset].edata2_len; - - int edata2_left; - - u32 block[16]; - - int last_block_size = edata2_len % 16; - - if(last_block_size == 0) - { - last_block_size = 16; - } - - int last_part = last_block_size + 16; - - int need = edata2_len - last_part; - - int last_block_cbc_position = (need - 16) / 4; - - sha1_hmac_ctx_t sha1_hmac_ctx; - - /* - hmac message = plaintext - hmac key = ki - */ - - u32 k0[4]; - u32 k1[4]; - u32 k2[4]; - u32 k3[4]; - - k0[0] = ki[0]; - k0[1] = ki[1]; - k0[2] = ki[2]; - k0[3] = ki[3]; - - k1[0] = ki[4]; - k1[1] = ki[5]; - k1[2] = ki[6]; - k1[3] = ki[7]; - - k2[0] = 0; - k2[1] = 0; - k2[2] = 0; - k2[3] = 0; - - k3[0] = 0; - k3[1] = 0; - k3[2] = 0; - k3[3] = 0; - - sha1_hmac_init_64 (&sha1_hmac_ctx, k0, k1, k2, k3); - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 64); - - block_position = 16; - - // first 4 blocks are already decrypted - for (edata2_left = need - 64; edata2_left >= 64; edata2_left -= 64) - { - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; - block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; - block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; - block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; - block[8] = esalt_bufs[digests_offset].edata2[block_position + 8]; - block[9] = esalt_bufs[digests_offset].edata2[block_position + 9]; - block[10] = esalt_bufs[digests_offset].edata2[block_position + 10]; - block[11] = esalt_bufs[digests_offset].edata2[block_position + 11]; - block[12] = esalt_bufs[digests_offset].edata2[block_position + 12]; - block[13] = esalt_bufs[digests_offset].edata2[block_position + 13]; - block[14] = esalt_bufs[digests_offset].edata2[block_position + 14]; - block[15] = esalt_bufs[digests_offset].edata2[block_position + 15]; - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w1[0] = swap32_S (decrypted_block[0]); - w1[1] = swap32_S (decrypted_block[1]); - w1[2] = swap32_S (decrypted_block[2]); - w1[3] = swap32_S (decrypted_block[3]); - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w2[0] = swap32_S (decrypted_block[0]); - w2[1] = swap32_S (decrypted_block[1]); - w2[2] = swap32_S (decrypted_block[2]); - w2[3] = swap32_S (decrypted_block[3]); - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 12, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w3[0] = swap32_S (decrypted_block[0]); - w3[1] = swap32_S (decrypted_block[1]); - w3[2] = swap32_S (decrypted_block[2]); - w3[3] = swap32_S (decrypted_block[3]); - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 64); - - block_position += 16; - } - - if (edata2_left == 16) - { - - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - 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; - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 16); - - block_position += 4; - } - else if (edata2_left == 32) - { - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; - block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; - block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; - block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w1[0] = swap32_S (decrypted_block[0]); - w1[1] = swap32_S (decrypted_block[1]); - w1[2] = swap32_S (decrypted_block[2]); - w1[3] = swap32_S (decrypted_block[3]); - - w2[0] = 0; - w2[1] = 0; - w2[2] = 0; - w2[3] = 0; - - w3[0] = 0; - w3[1] = 0; - w3[2] = 0; - w3[3] = 0; - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 32); - - block_position += 8; - } - else if (edata2_left == 48) - { - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; - block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; - block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; - block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; - block[8] = esalt_bufs[digests_offset].edata2[block_position + 8]; - block[9] = esalt_bufs[digests_offset].edata2[block_position + 9]; - block[10] = esalt_bufs[digests_offset].edata2[block_position + 10]; - block[11] = esalt_bufs[digests_offset].edata2[block_position + 11]; - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w0[0] = swap32_S (decrypted_block[0]); - w0[1] = swap32_S (decrypted_block[1]); - w0[2] = swap32_S (decrypted_block[2]); - w0[3] = swap32_S (decrypted_block[3]); - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w1[0] = swap32_S (decrypted_block[0]); - w1[1] = swap32_S (decrypted_block[1]); - w1[2] = swap32_S (decrypted_block[2]); - w1[3] = swap32_S (decrypted_block[3]); - - aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); - - w2[0] = swap32_S (decrypted_block[0]); - w2[1] = swap32_S (decrypted_block[1]); - w2[2] = swap32_S (decrypted_block[2]); - w2[3] = swap32_S (decrypted_block[3]); - - w3[0] = 0; - w3[1] = 0; - w3[2] = 0; - w3[3] = 0; - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 48); - - block_position += 12; - } - - /* - now all the ticket should be decrypted until block n-1 (not included) - and n - */ - - // this is block n-2, it will be xored with the n-1 block later crafted - u32 last_block_cbc[4]; - - last_block_cbc[0] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 0]; - last_block_cbc[1] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 1]; - last_block_cbc[2] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 2]; - last_block_cbc[3] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 3]; - - // n-1 block is decrypted separately from the previous blocks which were cbc decrypted - block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; - block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; - block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; - block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; - - aes256_decrypt (aes_cts_decrypt_ks, block, decrypted_block, s_td0, s_td1, s_td2, s_td3, s_td4); - - u32 last_block[4]; - - int last_block_position = (edata2_len - last_block_size) / 4; - - u32 n_1_crafted[4]; - - u32 last_plaintext[4]; - - last_plaintext[0] = 0; - last_plaintext[1] = 0; - last_plaintext[2] = 0; - last_plaintext[3] = 0; - - /* - n-1 block is first computed as follows: - - fill n-1 block with the X first bytes of the encrypted last block (n) - with X == length of last block - - complete the rest of the block with - - Final block (n) is computed as follows: - - fill with the X first bytes from n-1 block decrypted and xor them with last block (n) - with X == length of last block - */ - int remaining_blocks = last_block_size / 4; - - /* - last block is not necessarily aligned on 4 bytes so we will have - to shift values for the CTS crap... - */ - u32 shift = last_block_size % 4; - - switch (remaining_blocks) - { - case 0: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - - u32 mask = (0xffffffff >> ((4 - last_block_size) * 8)); - - last_plaintext[0] = last_block[0] ^ (decrypted_block[0] & mask); - last_plaintext[0] = swap32_S (last_plaintext[0]); - - n_1_crafted[0] = (last_block[0] & mask) | (decrypted_block[0] & (mask ^ 0xffffffff)); - n_1_crafted[1] = decrypted_block[1]; - n_1_crafted[2] = decrypted_block[2]; - n_1_crafted[3] = decrypted_block[3]; - break; - - case 1: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - - if (shift == 0) - { - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = decrypted_block[1]; - n_1_crafted[2] = decrypted_block[2]; - n_1_crafted[3] = decrypted_block[3]; - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[0] = swap32_S (last_plaintext[0]); - } - else - { - last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; - - u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ (decrypted_block[1] & mask); - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = (last_block[1] & mask) | (decrypted_block[1] & (mask ^ 0xffffffff)); - n_1_crafted[2] = decrypted_block[2]; - n_1_crafted[3] = decrypted_block[3]; - } - break; - - case 2: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; - - if (shift == 0) - { - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = decrypted_block[2]; - n_1_crafted[3] = decrypted_block[3]; - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - } - else - { - last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; - - u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - last_plaintext[2] = last_block[2] ^ (decrypted_block[2] & mask); - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - last_plaintext[2] = swap32_S (last_plaintext[2]); - - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = (last_block[2] & mask) | (decrypted_block[2] & (mask ^ 0xffffffff)); - n_1_crafted[3] = decrypted_block[3]; - } - break; - - case 3: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; - last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; - - if (shift == 0) - { - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = last_block[2]; - n_1_crafted[3] = decrypted_block[3]; - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - last_plaintext[2] = last_block[2] ^ decrypted_block[2]; - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - last_plaintext[2] = swap32_S (last_plaintext[2]); - } - else - { - last_block[3] = esalt_bufs[digests_offset].edata2[last_block_position + 3]; - - u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - last_plaintext[2] = last_block[2] ^ decrypted_block[2]; - last_plaintext[3] = last_block[3] ^ (decrypted_block[3] & mask); - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - last_plaintext[2] = swap32_S (last_plaintext[2]); - last_plaintext[3] = swap32_S (last_plaintext[3]); - - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = last_block[2]; - n_1_crafted[3] = (last_block[3] & mask) | (decrypted_block[3] & (mask ^ 0xffffffff)); - } - break; - - case 4: - - last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; - last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; - last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; - last_block[3] = esalt_bufs[digests_offset].edata2[last_block_position + 3]; - - n_1_crafted[0] = last_block[0]; - n_1_crafted[1] = last_block[1]; - n_1_crafted[2] = last_block[2]; - n_1_crafted[3] = last_block[3]; - - last_plaintext[0] = last_block[0] ^ decrypted_block[0]; - last_plaintext[1] = last_block[1] ^ decrypted_block[1]; - last_plaintext[2] = last_block[2] ^ decrypted_block[2]; - last_plaintext[3] = last_block[3] ^ decrypted_block[3]; - - last_plaintext[0] = swap32_S (last_plaintext[0]); - last_plaintext[1] = swap32_S (last_plaintext[1]); - last_plaintext[2] = swap32_S (last_plaintext[2]); - last_plaintext[3] = swap32_S (last_plaintext[3]); - break; - - default: - return; - } - - - // then decrypt this newly created n-1 with 'ke' - aes256_decrypt (aes_cts_decrypt_ks, n_1_crafted, n_1_crafted, s_td0, s_td1, s_td2, s_td3, s_td4); - - // then xor with the encrypted n-2 block - n_1_crafted[0] ^= last_block_cbc[0]; - n_1_crafted[1] ^= last_block_cbc[1]; - n_1_crafted[2] ^= last_block_cbc[2]; - n_1_crafted[3] ^= last_block_cbc[3]; - - w0[0] = swap32_S (n_1_crafted[0]); - w0[1] = swap32_S (n_1_crafted[1]); - w0[2] = swap32_S (n_1_crafted[2]); - w0[3] = swap32_S (n_1_crafted[3]); - - w1[0] = last_plaintext[0]; - w1[1] = last_plaintext[1]; - w1[2] = last_plaintext[2]; - w1[3] = last_plaintext[3]; - - w2[0] = 0; - w2[1] = 0; - w2[2] = 0; - w2[3] = 0; - - w3[0] = 0; - w3[1] = 0; - w3[2] = 0; - w3[3] = 0; - - sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 16 + last_block_size); - - sha1_hmac_final(&sha1_hmac_ctx); - - if(sha1_hmac_ctx.opad.h[0] == esalt_bufs[digests_offset].checksum[0] - && sha1_hmac_ctx.opad.h[1] == esalt_bufs[digests_offset].checksum[1] - && sha1_hmac_ctx.opad.h[2] == esalt_bufs[digests_offset].checksum[2]) - { - if (atomic_inc (&hashes_shown[digests_offset]) == 0) - { - #define il_pos 0 - mark_hash (plains_buf, d_return_buf, salt_pos, digests_cnt, 0, digests_offset + 0, gid, il_pos, 0, 0); - } - } - } - } +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#define NEW_SIMD_CODE + +#ifdef KERNEL_STATIC +#include "inc_vendor.h" +#include "inc_types.h" +#include "inc_common.cl" +#include "inc_simd.cl" +#include "inc_hash_sha1.cl" +#include "inc_cipher_aes.cl" +#endif + +typedef struct krb5tgs_18 +{ + u32 user[128]; + u32 domain[128]; + u32 account_info[512]; + u32 account_info_len; + + u32 checksum[3]; + u32 edata2[5120]; + u32 edata2_len; + +} krb5tgs_18_t; + +typedef struct krb5tgs_18_tmp +{ + u32 ipad[5]; + u32 opad[5]; + u32 dgst[16]; + u32 out[16]; + +} krb5tgs_18_tmp_t; + +DECLSPEC void aes256_encrypt_cbc (const u32 *aes_ks, u32 *aes_iv, const u32 *in, u32 *out, SHM_TYPE u32 *s_te0, SHM_TYPE u32 *s_te1, SHM_TYPE u32 *s_te2, SHM_TYPE u32 *s_te3, SHM_TYPE u32 *s_te4) +{ + u32 data[4]; + + data[0] = swap32_S (in[0]); + data[1] = swap32_S (in[1]); + data[2] = swap32_S (in[2]); + data[3] = swap32_S (in[3]); + + data[0] ^= aes_iv[0]; + data[1] ^= aes_iv[1]; + data[2] ^= aes_iv[2]; + data[3] ^= aes_iv[3]; + + aes256_encrypt (aes_ks, data, out, s_te0, s_te1, s_te2, s_te3, s_te4); + + aes_iv[0] = out[0]; + aes_iv[1] = out[1]; + aes_iv[2] = out[2]; + aes_iv[3] = out[3]; + + out[0] = swap32_S (out[0]); + out[1] = swap32_S (out[1]); + out[2] = swap32_S (out[2]); + out[3] = swap32_S (out[3]); +} + +DECLSPEC void aes256_decrypt_cbc (const u32 *ks1, const u32 *in, u32 *out, u32 *essiv, SHM_TYPE u32 *s_td0, SHM_TYPE u32 *s_td1, SHM_TYPE u32 *s_td2, SHM_TYPE u32 *s_td3, SHM_TYPE u32 *s_td4) +{ + aes256_decrypt (ks1, in, out, s_td0, s_td1, s_td2, s_td3, s_td4); + + out[0] ^= essiv[0]; + out[1] ^= essiv[1]; + out[2] ^= essiv[2]; + out[3] ^= essiv[3]; + + essiv[0] = in[0]; + essiv[1] = in[1]; + essiv[2] = in[2]; + essiv[3] = in[3]; +} + +DECLSPEC void hmac_sha1_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, u32x *digest) +{ + digest[0] = ipad[0]; + digest[1] = ipad[1]; + digest[2] = ipad[2]; + digest[3] = ipad[3]; + digest[4] = ipad[4]; + + sha1_transform_vector (w0, w1, w2, w3, digest); + + w0[0] = digest[0]; + w0[1] = digest[1]; + w0[2] = digest[2]; + w0[3] = digest[3]; + w1[0] = digest[4]; + w1[1] = 0x80000000; + 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] = (64 + 20) * 8; + + digest[0] = opad[0]; + digest[1] = opad[1]; + digest[2] = opad[2]; + digest[3] = opad[3]; + digest[4] = opad[4]; + + sha1_transform_vector (w0, w1, w2, w3, digest); +} + +__kernel void m19700_init (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + /** + * main + */ + + /* initialize hmac-sha1 for pbkdf2(password, account, 4096, account_len) */ + + sha1_hmac_ctx_t sha1_hmac_ctx; + + sha1_hmac_init_global_swap (&sha1_hmac_ctx, pws[gid].i, pws[gid].pw_len); + + tmps[gid].ipad[0] = sha1_hmac_ctx.ipad.h[0]; + tmps[gid].ipad[1] = sha1_hmac_ctx.ipad.h[1]; + tmps[gid].ipad[2] = sha1_hmac_ctx.ipad.h[2]; + tmps[gid].ipad[3] = sha1_hmac_ctx.ipad.h[3]; + tmps[gid].ipad[4] = sha1_hmac_ctx.ipad.h[4]; + + tmps[gid].opad[0] = sha1_hmac_ctx.opad.h[0]; + tmps[gid].opad[1] = sha1_hmac_ctx.opad.h[1]; + tmps[gid].opad[2] = sha1_hmac_ctx.opad.h[2]; + tmps[gid].opad[3] = sha1_hmac_ctx.opad.h[3]; + tmps[gid].opad[4] = sha1_hmac_ctx.opad.h[4]; + + sha1_hmac_update_global_swap (&sha1_hmac_ctx, esalt_bufs[digests_offset].account_info, esalt_bufs[digests_offset].account_info_len); + + for (u32 i = 0, j = 1; i < 8; i += 5, j += 1) + { + sha1_hmac_ctx_t sha1_hmac_ctx2 = sha1_hmac_ctx; + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + + w0[0] = j; + 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; + + sha1_hmac_update_64 (&sha1_hmac_ctx2, w0, w1, w2, w3, 4); + + sha1_hmac_final (&sha1_hmac_ctx2); + + tmps[gid].dgst[i + 0] = sha1_hmac_ctx2.opad.h[0]; + tmps[gid].dgst[i + 1] = sha1_hmac_ctx2.opad.h[1]; + tmps[gid].dgst[i + 2] = sha1_hmac_ctx2.opad.h[2]; + tmps[gid].dgst[i + 3] = sha1_hmac_ctx2.opad.h[3]; + tmps[gid].dgst[i + 4] = sha1_hmac_ctx2.opad.h[4]; + + tmps[gid].out[i + 0] = tmps[gid].dgst[i + 0]; + tmps[gid].out[i + 1] = tmps[gid].dgst[i + 1]; + tmps[gid].out[i + 2] = tmps[gid].dgst[i + 2]; + tmps[gid].out[i + 3] = tmps[gid].dgst[i + 3]; + tmps[gid].out[i + 4] = tmps[gid].dgst[i + 4]; + } +} + +__kernel void m19700_loop (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) +{ + /** + * base + */ + const u64 gid = get_global_id (0); + + if ((gid * VECT_SIZE) >= gid_max) return; + + u32x ipad[5]; + u32x opad[5]; + + ipad[0] = packv (tmps, ipad, gid, 0); + ipad[1] = packv (tmps, ipad, gid, 1); + ipad[2] = packv (tmps, ipad, gid, 2); + ipad[3] = packv (tmps, ipad, gid, 3); + ipad[4] = packv (tmps, ipad, gid, 4); + + opad[0] = packv (tmps, opad, gid, 0); + opad[1] = packv (tmps, opad, gid, 1); + opad[2] = packv (tmps, opad, gid, 2); + opad[3] = packv (tmps, opad, gid, 3); + opad[4] = packv (tmps, opad, gid, 4); + + for (u32 i = 0; i < 8; i += 5) + { + u32x dgst[5]; + u32x out[5]; + + dgst[0] = packv (tmps, dgst, gid, i + 0); + dgst[1] = packv (tmps, dgst, gid, i + 1); + dgst[2] = packv (tmps, dgst, gid, i + 2); + dgst[3] = packv (tmps, dgst, gid, i + 3); + dgst[4] = packv (tmps, dgst, gid, i + 4); + + out[0] = packv (tmps, out, gid, i + 0); + out[1] = packv (tmps, out, gid, i + 1); + out[2] = packv (tmps, out, gid, i + 2); + out[3] = packv (tmps, out, gid, i + 3); + out[4] = packv (tmps, out, gid, i + 4); + + for (u32 j = 0; j < loop_cnt; j++) + { + u32x w0[4]; + u32x w1[4]; + u32x w2[4]; + u32x w3[4]; + + w0[0] = dgst[0]; + w0[1] = dgst[1]; + w0[2] = dgst[2]; + w0[3] = dgst[3]; + w1[0] = dgst[4]; + w1[1] = 0x80000000; + 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] = (64 + 20) * 8; + + hmac_sha1_run_V (w0, w1, w2, w3, ipad, opad, dgst); + + out[0] ^= dgst[0]; + out[1] ^= dgst[1]; + out[2] ^= dgst[2]; + out[3] ^= dgst[3]; + out[4] ^= dgst[4]; + } + + unpackv (tmps, dgst, gid, i + 0, dgst[0]); + unpackv (tmps, dgst, gid, i + 1, dgst[1]); + unpackv (tmps, dgst, gid, i + 2, dgst[2]); + unpackv (tmps, dgst, gid, i + 3, dgst[3]); + unpackv (tmps, dgst, gid, i + 4, dgst[4]); + + unpackv (tmps, out, gid, i + 0, out[0]); + unpackv (tmps, out, gid, i + 1, out[1]); + unpackv (tmps, out, gid, i + 2, out[2]); + unpackv (tmps, out, gid, i + 3, out[3]); + unpackv (tmps, out, gid, i + 4, out[4]); + } +} + +__kernel void m19700_comp (KERN_ATTR_TMPS_ESALT (krb5tgs_18_tmp_t, krb5tgs_18_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + const u64 lid = get_local_id (0); + const u64 lsz = get_local_size (0); + + /** + * aes shared + */ + + #ifdef REAL_SHM + + __local u32 s_td0[256]; + __local u32 s_td1[256]; + __local u32 s_td2[256]; + __local u32 s_td3[256]; + __local u32 s_td4[256]; + + __local u32 s_te0[256]; + __local u32 s_te1[256]; + __local u32 s_te2[256]; + __local u32 s_te3[256]; + __local u32 s_te4[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + s_td0[i] = td0[i]; + s_td1[i] = td1[i]; + s_td2[i] = td2[i]; + s_td3[i] = td3[i]; + s_td4[i] = td4[i]; + + s_te0[i] = te0[i]; + s_te1[i] = te1[i]; + s_te2[i] = te2[i]; + s_te3[i] = te3[i]; + s_te4[i] = te4[i]; + } + + barrier (CLK_LOCAL_MEM_FENCE); + + #else + + __constant u32a *s_td0 = td0; + __constant u32a *s_td1 = td1; + __constant u32a *s_td2 = td2; + __constant u32a *s_td3 = td3; + __constant u32a *s_td4 = td4; + + __constant u32a *s_te0 = te0; + __constant u32a *s_te1 = te1; + __constant u32a *s_te2 = te2; + __constant u32a *s_te3 = te3; + __constant u32a *s_te4 = te4; + + #endif + + if (gid >= gid_max) return; + + /* + at this point, the output ('seed') will be used to generate AES keys: + + key_bytes = derive(seed, 'kerberos'.encode(), seedsize) + + 'key_bytes' will be the AES key used to generate 'ke' and 'ki' + 'ke' will be the AES key to decrypt the ticket + 'ki' will be the key to compute the final HMAC + */ + + u32 nfolded[4]; + + // we can precompute _nfold('kerberos', 16) + nfolded[0] = 0x6b657262; + nfolded[1] = 0x65726f73; + nfolded[2] = 0x7b9b5b2b; + nfolded[3] = 0x93132b93; + + // then aes_cbc encrypt this nfolded value with 'seed' as key along with a null IV + u32 aes_key[8]; + + aes_key[0] = swap32_S (tmps[gid].out[0]); + aes_key[1] = swap32_S (tmps[gid].out[1]); + aes_key[2] = swap32_S (tmps[gid].out[2]); + aes_key[3] = swap32_S (tmps[gid].out[3]); + aes_key[4] = swap32_S (tmps[gid].out[4]); + aes_key[5] = swap32_S (tmps[gid].out[5]); + aes_key[6] = swap32_S (tmps[gid].out[6]); + aes_key[7] = swap32_S (tmps[gid].out[7]); + + u32 aes_iv[4]; + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + u32 aes_ks[60]; + + aes256_set_encrypt_key (aes_ks, aes_key, s_te0, s_te1, s_te2, s_te3, s_te4); + + u32 key_bytes[8]; + + u32 out[4]; + aes256_encrypt_cbc (aes_ks, aes_iv, nfolded, out, s_te0, s_te1, s_te2, s_te3, s_te4); + + key_bytes[0] = out[0]; + key_bytes[1] = out[1]; + key_bytes[2] = out[2]; + key_bytes[3] = out[3]; + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + aes256_encrypt_cbc (aes_ks, aes_iv, out, out, s_te0, s_te1, s_te2, s_te3, s_te4); + + key_bytes[4] = out[0]; + key_bytes[5] = out[1]; + key_bytes[6] = out[2]; + key_bytes[7] = out[3]; + + /* we will now compute 'ki', having 'key_bytes' */ + + u32 ki[8]; + + // we can precompute _nfold(pack('>IB', 2, 0x55), 16) + nfolded[0] = 0x62dc6e37; + nfolded[1] = 0x1a63a809; + nfolded[2] = 0x58ac562b; + nfolded[3] = 0x15404ac5; + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + key_bytes[0] = swap32_S (key_bytes[0]); + key_bytes[1] = swap32_S (key_bytes[1]); + key_bytes[2] = swap32_S (key_bytes[2]); + key_bytes[3] = swap32_S (key_bytes[3]); + key_bytes[4] = swap32_S (key_bytes[4]); + key_bytes[5] = swap32_S (key_bytes[5]); + key_bytes[6] = swap32_S (key_bytes[6]); + key_bytes[7] = swap32_S (key_bytes[7]); + + // then aes_cbc encrypt this nfolded value with 'key_bytes' as key along with a null IV + aes256_set_encrypt_key (aes_ks, key_bytes, s_te0, s_te1, s_te2, s_te3, s_te4); + + aes256_encrypt_cbc (aes_ks, aes_iv, nfolded, out, s_te0, s_te1, s_te2, s_te3, s_te4); + + ki[0] = out[0]; + ki[1] = out[1]; + ki[2] = out[2]; + ki[3] = out[3]; + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + aes256_encrypt_cbc (aes_ks, aes_iv, out, out, s_te0, s_te1, s_te2, s_te3, s_te4); + + ki[4] = out[0]; + ki[5] = out[1]; + ki[6] = out[2]; + ki[7] = out[3]; + + /* we will now compute 'ke' */ + + u32 ke[8]; + + // we can precompute _nfold(pack('>IB', 2, 0xAA), 16) + nfolded[0] = 0xb5b0582c; + nfolded[1] = 0x14b6500a; + nfolded[2] = 0xad56ab55; + nfolded[3] = 0xaa80556a; + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + // then aes_cbc encrypt this nfolded value with 'key_bytes' as key along with a null IV + aes256_encrypt_cbc (aes_ks, aes_iv, nfolded, out, s_te0, s_te1, s_te2, s_te3, s_te4); + + ke[0] = out[0]; + ke[1] = out[1]; + ke[2] = out[2]; + ke[3] = out[3]; + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + aes256_encrypt_cbc (aes_ks, aes_iv, out, out, s_te0, s_te1, s_te2, s_te3, s_te4); + + ke[4] = out[0]; + ke[5] = out[1]; + ke[6] = out[2]; + ke[7] = out[3]; + + /* + we now have 'ke' and 'ki' + + we will decrypt (with 'ke') the 32 first bytes to search for ASN.1 structs + and if we find ASN.1 structs, we will compute the hmac (with 'ki') + + if length >= 128 bytes: + length is on 2 bytes and type is \x63\x82 (encode_krb5_enc_tkt_part) and data is an ASN1 sequence \x30\x82 + else: + length is on 1 byte and type is \x63\x81 and data is an ASN1 sequence \x30\x81 + + next headers follow the same ASN1 "type-length-data" scheme + */ + + u32 first_blocks[16]; + + u32 decrypted_block[8]; + + first_blocks[0] = esalt_bufs[digests_offset].edata2[0]; + first_blocks[1] = esalt_bufs[digests_offset].edata2[1]; + first_blocks[2] = esalt_bufs[digests_offset].edata2[2]; + first_blocks[3] = esalt_bufs[digests_offset].edata2[3]; + + first_blocks[4] = esalt_bufs[digests_offset].edata2[4]; // possible ASN1 structs + first_blocks[5] = esalt_bufs[digests_offset].edata2[5]; + first_blocks[6] = esalt_bufs[digests_offset].edata2[6]; // possible ASN1 structs + first_blocks[7] = esalt_bufs[digests_offset].edata2[7]; + + /* + we will decrypt them here in order to be able to compute hmac directly + if ASN1 structs were to be found + */ + first_blocks[8] = esalt_bufs[digests_offset].edata2[8]; + first_blocks[9] = esalt_bufs[digests_offset].edata2[9]; + first_blocks[10] = esalt_bufs[digests_offset].edata2[10]; + first_blocks[11] = esalt_bufs[digests_offset].edata2[11]; + + first_blocks[12] = esalt_bufs[digests_offset].edata2[12]; + first_blocks[13] = esalt_bufs[digests_offset].edata2[13]; + first_blocks[14] = esalt_bufs[digests_offset].edata2[14]; + first_blocks[15] = esalt_bufs[digests_offset].edata2[15]; + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + + u32 aes_cts_decrypt_ks[60]; + + AES256_set_decrypt_key (aes_cts_decrypt_ks, ke, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4); + + aes_iv[0] = 0; + aes_iv[1] = 0; + aes_iv[2] = 0; + aes_iv[3] = 0; + + aes256_decrypt_cbc (aes_cts_decrypt_ks, first_blocks, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + aes256_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w1[0] = swap32_S (decrypted_block[0]); + w1[1] = swap32_S (decrypted_block[1]); + w1[2] = swap32_S (decrypted_block[2]); + w1[3] = swap32_S (decrypted_block[3]); + + if (((decrypted_block[0] & 0xff00ffff) == 0x30008163) || ((decrypted_block[0] & 0x0000ffff) == 0x00008263)) + { + if (((decrypted_block[2] & 0x00ffffff) == 0x00000503) || (decrypted_block[2] == 0x050307A0)) + { + + // now we decrypt all the ticket to verify checksum + + // we need to decrypt also the 2 following blocks in order to be able to compute the hmac directly + aes256_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w2[0] = swap32_S (decrypted_block[0]); + w2[1] = swap32_S (decrypted_block[1]); + w2[2] = swap32_S (decrypted_block[2]); + w2[3] = swap32_S (decrypted_block[3]); + + aes256_decrypt_cbc (aes_cts_decrypt_ks, first_blocks + 12, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w3[0] = swap32_S (decrypted_block[0]); + w3[1] = swap32_S (decrypted_block[1]); + w3[2] = swap32_S (decrypted_block[2]); + w3[3] = swap32_S (decrypted_block[3]); + + int block_position; + + int edata2_len = esalt_bufs[digests_offset].edata2_len; + + int edata2_left; + + u32 block[16]; + + int last_block_size = edata2_len % 16; + + if(last_block_size == 0) + { + last_block_size = 16; + } + + int last_part = last_block_size + 16; + + int need = edata2_len - last_part; + + int last_block_cbc_position = (need - 16) / 4; + + sha1_hmac_ctx_t sha1_hmac_ctx; + + /* + hmac message = plaintext + hmac key = ki + */ + + u32 k0[4]; + u32 k1[4]; + u32 k2[4]; + u32 k3[4]; + + k0[0] = ki[0]; + k0[1] = ki[1]; + k0[2] = ki[2]; + k0[3] = ki[3]; + + k1[0] = ki[4]; + k1[1] = ki[5]; + k1[2] = ki[6]; + k1[3] = ki[7]; + + k2[0] = 0; + k2[1] = 0; + k2[2] = 0; + k2[3] = 0; + + k3[0] = 0; + k3[1] = 0; + k3[2] = 0; + k3[3] = 0; + + sha1_hmac_init_64 (&sha1_hmac_ctx, k0, k1, k2, k3); + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 64); + + block_position = 16; + + // first 4 blocks are already decrypted + for (edata2_left = need - 64; edata2_left >= 64; edata2_left -= 64) + { + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; + block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; + block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; + block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; + block[8] = esalt_bufs[digests_offset].edata2[block_position + 8]; + block[9] = esalt_bufs[digests_offset].edata2[block_position + 9]; + block[10] = esalt_bufs[digests_offset].edata2[block_position + 10]; + block[11] = esalt_bufs[digests_offset].edata2[block_position + 11]; + block[12] = esalt_bufs[digests_offset].edata2[block_position + 12]; + block[13] = esalt_bufs[digests_offset].edata2[block_position + 13]; + block[14] = esalt_bufs[digests_offset].edata2[block_position + 14]; + block[15] = esalt_bufs[digests_offset].edata2[block_position + 15]; + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w1[0] = swap32_S (decrypted_block[0]); + w1[1] = swap32_S (decrypted_block[1]); + w1[2] = swap32_S (decrypted_block[2]); + w1[3] = swap32_S (decrypted_block[3]); + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w2[0] = swap32_S (decrypted_block[0]); + w2[1] = swap32_S (decrypted_block[1]); + w2[2] = swap32_S (decrypted_block[2]); + w2[3] = swap32_S (decrypted_block[3]); + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 12, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w3[0] = swap32_S (decrypted_block[0]); + w3[1] = swap32_S (decrypted_block[1]); + w3[2] = swap32_S (decrypted_block[2]); + w3[3] = swap32_S (decrypted_block[3]); + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 64); + + block_position += 16; + } + + if (edata2_left == 16) + { + + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + 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; + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 16); + + block_position += 4; + } + else if (edata2_left == 32) + { + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; + block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; + block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; + block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w1[0] = swap32_S (decrypted_block[0]); + w1[1] = swap32_S (decrypted_block[1]); + w1[2] = swap32_S (decrypted_block[2]); + w1[3] = swap32_S (decrypted_block[3]); + + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 32); + + block_position += 8; + } + else if (edata2_left == 48) + { + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + block[4] = esalt_bufs[digests_offset].edata2[block_position + 4]; + block[5] = esalt_bufs[digests_offset].edata2[block_position + 5]; + block[6] = esalt_bufs[digests_offset].edata2[block_position + 6]; + block[7] = esalt_bufs[digests_offset].edata2[block_position + 7]; + block[8] = esalt_bufs[digests_offset].edata2[block_position + 8]; + block[9] = esalt_bufs[digests_offset].edata2[block_position + 9]; + block[10] = esalt_bufs[digests_offset].edata2[block_position + 10]; + block[11] = esalt_bufs[digests_offset].edata2[block_position + 11]; + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w0[0] = swap32_S (decrypted_block[0]); + w0[1] = swap32_S (decrypted_block[1]); + w0[2] = swap32_S (decrypted_block[2]); + w0[3] = swap32_S (decrypted_block[3]); + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 4, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w1[0] = swap32_S (decrypted_block[0]); + w1[1] = swap32_S (decrypted_block[1]); + w1[2] = swap32_S (decrypted_block[2]); + w1[3] = swap32_S (decrypted_block[3]); + + aes256_decrypt_cbc (aes_cts_decrypt_ks, block + 8, decrypted_block, aes_iv, s_td0, s_td1, s_td2, s_td3, s_td4); + + w2[0] = swap32_S (decrypted_block[0]); + w2[1] = swap32_S (decrypted_block[1]); + w2[2] = swap32_S (decrypted_block[2]); + w2[3] = swap32_S (decrypted_block[3]); + + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 48); + + block_position += 12; + } + + /* + now all the ticket should be decrypted until block n-1 (not included) + and n + */ + + // this is block n-2, it will be xored with the n-1 block later crafted + u32 last_block_cbc[4]; + + last_block_cbc[0] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 0]; + last_block_cbc[1] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 1]; + last_block_cbc[2] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 2]; + last_block_cbc[3] = esalt_bufs[digests_offset].edata2[last_block_cbc_position + 3]; + + // n-1 block is decrypted separately from the previous blocks which were cbc decrypted + block[0] = esalt_bufs[digests_offset].edata2[block_position + 0]; + block[1] = esalt_bufs[digests_offset].edata2[block_position + 1]; + block[2] = esalt_bufs[digests_offset].edata2[block_position + 2]; + block[3] = esalt_bufs[digests_offset].edata2[block_position + 3]; + + aes256_decrypt (aes_cts_decrypt_ks, block, decrypted_block, s_td0, s_td1, s_td2, s_td3, s_td4); + + u32 last_block[4]; + + int last_block_position = (edata2_len - last_block_size) / 4; + + u32 n_1_crafted[4]; + + u32 last_plaintext[4]; + + last_plaintext[0] = 0; + last_plaintext[1] = 0; + last_plaintext[2] = 0; + last_plaintext[3] = 0; + + /* + n-1 block is first computed as follows: + - fill n-1 block with the X first bytes of the encrypted last block (n) + with X == length of last block + - complete the rest of the block with + + Final block (n) is computed as follows: + - fill with the X first bytes from n-1 block decrypted and xor them with last block (n) + with X == length of last block + */ + int remaining_blocks = last_block_size / 4; + + /* + last block is not necessarily aligned on 4 bytes so we will have + to shift values for the CTS crap... + */ + u32 shift = last_block_size % 4; + + switch (remaining_blocks) + { + case 0: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + + u32 mask = (0xffffffff >> ((4 - last_block_size) * 8)); + + last_plaintext[0] = last_block[0] ^ (decrypted_block[0] & mask); + last_plaintext[0] = swap32_S (last_plaintext[0]); + + n_1_crafted[0] = (last_block[0] & mask) | (decrypted_block[0] & (mask ^ 0xffffffff)); + n_1_crafted[1] = decrypted_block[1]; + n_1_crafted[2] = decrypted_block[2]; + n_1_crafted[3] = decrypted_block[3]; + break; + + case 1: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + + if (shift == 0) + { + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = decrypted_block[1]; + n_1_crafted[2] = decrypted_block[2]; + n_1_crafted[3] = decrypted_block[3]; + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[0] = swap32_S (last_plaintext[0]); + } + else + { + last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; + + u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ (decrypted_block[1] & mask); + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = (last_block[1] & mask) | (decrypted_block[1] & (mask ^ 0xffffffff)); + n_1_crafted[2] = decrypted_block[2]; + n_1_crafted[3] = decrypted_block[3]; + } + break; + + case 2: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; + + if (shift == 0) + { + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = decrypted_block[2]; + n_1_crafted[3] = decrypted_block[3]; + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + } + else + { + last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; + + u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + last_plaintext[2] = last_block[2] ^ (decrypted_block[2] & mask); + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + last_plaintext[2] = swap32_S (last_plaintext[2]); + + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = (last_block[2] & mask) | (decrypted_block[2] & (mask ^ 0xffffffff)); + n_1_crafted[3] = decrypted_block[3]; + } + break; + + case 3: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; + last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; + + if (shift == 0) + { + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = last_block[2]; + n_1_crafted[3] = decrypted_block[3]; + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + last_plaintext[2] = last_block[2] ^ decrypted_block[2]; + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + last_plaintext[2] = swap32_S (last_plaintext[2]); + } + else + { + last_block[3] = esalt_bufs[digests_offset].edata2[last_block_position + 3]; + + u32 mask = (0xffffffff >> ((4 - (last_block_size % 4)) * 8)); + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + last_plaintext[2] = last_block[2] ^ decrypted_block[2]; + last_plaintext[3] = last_block[3] ^ (decrypted_block[3] & mask); + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + last_plaintext[2] = swap32_S (last_plaintext[2]); + last_plaintext[3] = swap32_S (last_plaintext[3]); + + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = last_block[2]; + n_1_crafted[3] = (last_block[3] & mask) | (decrypted_block[3] & (mask ^ 0xffffffff)); + } + break; + + case 4: + + last_block[0] = esalt_bufs[digests_offset].edata2[last_block_position + 0]; + last_block[1] = esalt_bufs[digests_offset].edata2[last_block_position + 1]; + last_block[2] = esalt_bufs[digests_offset].edata2[last_block_position + 2]; + last_block[3] = esalt_bufs[digests_offset].edata2[last_block_position + 3]; + + n_1_crafted[0] = last_block[0]; + n_1_crafted[1] = last_block[1]; + n_1_crafted[2] = last_block[2]; + n_1_crafted[3] = last_block[3]; + + last_plaintext[0] = last_block[0] ^ decrypted_block[0]; + last_plaintext[1] = last_block[1] ^ decrypted_block[1]; + last_plaintext[2] = last_block[2] ^ decrypted_block[2]; + last_plaintext[3] = last_block[3] ^ decrypted_block[3]; + + last_plaintext[0] = swap32_S (last_plaintext[0]); + last_plaintext[1] = swap32_S (last_plaintext[1]); + last_plaintext[2] = swap32_S (last_plaintext[2]); + last_plaintext[3] = swap32_S (last_plaintext[3]); + break; + + default: + return; + } + + + // then decrypt this newly created n-1 with 'ke' + aes256_decrypt (aes_cts_decrypt_ks, n_1_crafted, n_1_crafted, s_td0, s_td1, s_td2, s_td3, s_td4); + + // then xor with the encrypted n-2 block + n_1_crafted[0] ^= last_block_cbc[0]; + n_1_crafted[1] ^= last_block_cbc[1]; + n_1_crafted[2] ^= last_block_cbc[2]; + n_1_crafted[3] ^= last_block_cbc[3]; + + w0[0] = swap32_S (n_1_crafted[0]); + w0[1] = swap32_S (n_1_crafted[1]); + w0[2] = swap32_S (n_1_crafted[2]); + w0[3] = swap32_S (n_1_crafted[3]); + + w1[0] = last_plaintext[0]; + w1[1] = last_plaintext[1]; + w1[2] = last_plaintext[2]; + w1[3] = last_plaintext[3]; + + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + + sha1_hmac_update_64 (&sha1_hmac_ctx, w0, w1, w2, w3, 16 + last_block_size); + + sha1_hmac_final(&sha1_hmac_ctx); + + if(sha1_hmac_ctx.opad.h[0] == esalt_bufs[digests_offset].checksum[0] + && sha1_hmac_ctx.opad.h[1] == esalt_bufs[digests_offset].checksum[1] + && sha1_hmac_ctx.opad.h[2] == esalt_bufs[digests_offset].checksum[2]) + { + if (atomic_inc (&hashes_shown[digests_offset]) == 0) + { + #define il_pos 0 + mark_hash (plains_buf, d_return_buf, salt_pos, digests_cnt, 0, digests_offset + 0, gid, il_pos, 0, 0); + } + } + } + } } \ No newline at end of file diff --git a/OpenCL/markov_be.cl b/OpenCL/markov_be.cl index d77355971..0518ae634 100644 --- a/OpenCL/markov_be.cl +++ b/OpenCL/markov_be.cl @@ -3,8 +3,10 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" +#endif #define CHARSIZ 256 diff --git a/OpenCL/markov_le.cl b/OpenCL/markov_le.cl index 6d84e45f0..96dc453ab 100644 --- a/OpenCL/markov_le.cl +++ b/OpenCL/markov_le.cl @@ -3,8 +3,10 @@ * License.....: MIT */ +#ifdef KERNEL_STATIC #include "inc_vendor.h" #include "inc_types.h" +#endif #define CHARSIZ 256 diff --git a/src/opencl.c b/src/opencl.c index a714cb3c5..db3926847 100644 --- a/src/opencl.c +++ b/src/opencl.c @@ -4848,9 +4848,9 @@ int opencl_session_begin (hashcat_ctx_t *hashcat_ctx) int build_options_len = 0; #if defined (_WIN) - build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-cl-std=CL1.2 -I OpenCL -I \"%s\" ", folder_config->cpath_real); + build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -cl-std=CL1.2 -I OpenCL -I \"%s\" ", folder_config->cpath_real); #else - build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-cl-std=CL1.2 -I OpenCL -I %s ", folder_config->cpath_real); + build_options_len += snprintf (build_options_buf + build_options_len, build_options_sz - build_options_len, "-D KERNEL_STATIC -cl-std=CL1.2 -I OpenCL -I %s ", folder_config->cpath_real); #endif // we don't have sm_* on vendors not NV but it doesn't matter