pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

hashcat: updated to 4.0.0

Module Name:	pkgsrc-wip
Committed By:	Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By:	adam
Date:		Sat Oct 28 09:59:02 2017 +0200
Changeset:	0b49ef1d46627c795cd17943bc3df4d8d7d778b3

Modified Files:
	hashcat/Makefile
	hashcat/PLIST
	hashcat/distinfo
	hashcat/patches/patch-src_Makefile

Log Message:
hashcat: updated to 4.0.0

4.0.0:
* Added support to crack passwords and salts up to length 256
* Added self-test functionality to detect broken OpenCL runtimes on startup
* Added hash-mode 2501 = WPA/WPA2 PMK
* Improved macOS support

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0b49ef1d46627c795cd17943bc3df4d8d7d778b3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 hashcat/Makefile                   |   8 +-
 hashcat/PLIST                      | 426 ++++++++++++++++++++++++++++++-------
 hashcat/distinfo                   |  10 +-
 hashcat/patches/patch-src_Makefile |  32 ++-
 4 files changed, 378 insertions(+), 98 deletions(-)

diffs:
diff --git a/hashcat/Makefile b/hashcat/Makefile
index 364072198f..383b746b6b 100644
--- a/hashcat/Makefile
+++ b/hashcat/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	hashcat-3.6.0
+DISTNAME=	hashcat-4.0.0
 CATEGORIES=	security
 MASTER_SITES=	https://hashcat.net/files/
 
@@ -12,4 +12,10 @@ LICENSE=	mit
 USE_TOOLS+=	gmake gsed
 BUILD_TARGET=	hashcat
 
+SUBST_CLASSES+=		ver-tag
+SUBST_STAGE.ver-tag=	pre-configure
+SUBST_MESSAGE.ver-tag=	Planting custom version tag.
+SUBST_FILES.ver-tag=	src/Makefile
+SUBST_SED.ver-tag=	-e 's,@VERSION_TAG@,${PKGVERSION_NOREV}-pkgsrc,'
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/hashcat/PLIST b/hashcat/PLIST
index 47281a4151..1d18cff8c4 100644
--- a/hashcat/PLIST
+++ b/hashcat/PLIST
@@ -2,6 +2,24 @@
 bin/hashcat
 lib/libhashcat.so
 share/doc/hashcat/charsets/DES_full.charset
+share/doc/hashcat/charsets/DES_special/DES_alpha.charset
+share/doc/hashcat/charsets/DES_special/DES_numeral.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_0.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_1.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_2.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_3.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_4.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_5.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_6.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_7.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_8.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_9.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_A.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_B.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_C.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_D.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_E.charset
+share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_F.charset
 share/doc/hashcat/charsets/combined/Bulgarian.hcchr
 share/doc/hashcat/charsets/combined/Castilian.hcchr
 share/doc/hashcat/charsets/combined/Catalan.hcchr
@@ -189,6 +207,15 @@ share/hashcat/OpenCL/inc_comp_single.cl
 share/hashcat/OpenCL/inc_comp_single_bs.cl
 share/hashcat/OpenCL/inc_hash_constants.h
 share/hashcat/OpenCL/inc_hash_functions.cl
+share/hashcat/OpenCL/inc_hash_md4.cl
+share/hashcat/OpenCL/inc_hash_md5.cl
+share/hashcat/OpenCL/inc_hash_ripemd160.cl
+share/hashcat/OpenCL/inc_hash_sha1.cl
+share/hashcat/OpenCL/inc_hash_sha224.cl
+share/hashcat/OpenCL/inc_hash_sha256.cl
+share/hashcat/OpenCL/inc_hash_sha384.cl
+share/hashcat/OpenCL/inc_hash_sha512.cl
+share/hashcat/OpenCL/inc_hash_whirlpool.cl
 share/hashcat/OpenCL/inc_luks_aes.cl
 share/hashcat/OpenCL/inc_luks_af.cl
 share/hashcat/OpenCL/inc_luks_essiv.cl
@@ -197,211 +224,382 @@ share/hashcat/OpenCL/inc_luks_twofish.cl
 share/hashcat/OpenCL/inc_luks_xts.cl
 share/hashcat/OpenCL/inc_rp.cl
 share/hashcat/OpenCL/inc_rp.h
+share/hashcat/OpenCL/inc_rp_optimized.cl
+share/hashcat/OpenCL/inc_rp_optimized.h
+share/hashcat/OpenCL/inc_scalar.cl
 share/hashcat/OpenCL/inc_simd.cl
 share/hashcat/OpenCL/inc_truecrypt_crc32.cl
 share/hashcat/OpenCL/inc_truecrypt_xts.cl
 share/hashcat/OpenCL/inc_types.cl
 share/hashcat/OpenCL/inc_vendor.cl
+share/hashcat/OpenCL/m00000_a0-optimized.cl
 share/hashcat/OpenCL/m00000_a0.cl
+share/hashcat/OpenCL/m00000_a1-optimized.cl
 share/hashcat/OpenCL/m00000_a1.cl
+share/hashcat/OpenCL/m00000_a3-optimized.cl
 share/hashcat/OpenCL/m00000_a3.cl
+share/hashcat/OpenCL/m00010_a0-optimized.cl
 share/hashcat/OpenCL/m00010_a0.cl
+share/hashcat/OpenCL/m00010_a1-optimized.cl
 share/hashcat/OpenCL/m00010_a1.cl
+share/hashcat/OpenCL/m00010_a3-optimized.cl
 share/hashcat/OpenCL/m00010_a3.cl
+share/hashcat/OpenCL/m00020_a0-optimized.cl
 share/hashcat/OpenCL/m00020_a0.cl
+share/hashcat/OpenCL/m00020_a1-optimized.cl
 share/hashcat/OpenCL/m00020_a1.cl
+share/hashcat/OpenCL/m00020_a3-optimized.cl
 share/hashcat/OpenCL/m00020_a3.cl
+share/hashcat/OpenCL/m00030_a0-optimized.cl
 share/hashcat/OpenCL/m00030_a0.cl
+share/hashcat/OpenCL/m00030_a1-optimized.cl
 share/hashcat/OpenCL/m00030_a1.cl
+share/hashcat/OpenCL/m00030_a3-optimized.cl
 share/hashcat/OpenCL/m00030_a3.cl
+share/hashcat/OpenCL/m00040_a0-optimized.cl
 share/hashcat/OpenCL/m00040_a0.cl
+share/hashcat/OpenCL/m00040_a1-optimized.cl
 share/hashcat/OpenCL/m00040_a1.cl
+share/hashcat/OpenCL/m00040_a3-optimized.cl
 share/hashcat/OpenCL/m00040_a3.cl
+share/hashcat/OpenCL/m00050_a0-optimized.cl
 share/hashcat/OpenCL/m00050_a0.cl
+share/hashcat/OpenCL/m00050_a1-optimized.cl
 share/hashcat/OpenCL/m00050_a1.cl
+share/hashcat/OpenCL/m00050_a3-optimized.cl
 share/hashcat/OpenCL/m00050_a3.cl
+share/hashcat/OpenCL/m00060_a0-optimized.cl
 share/hashcat/OpenCL/m00060_a0.cl
+share/hashcat/OpenCL/m00060_a1-optimized.cl
 share/hashcat/OpenCL/m00060_a1.cl
+share/hashcat/OpenCL/m00060_a3-optimized.cl
 share/hashcat/OpenCL/m00060_a3.cl
+share/hashcat/OpenCL/m00100_a0-optimized.cl
 share/hashcat/OpenCL/m00100_a0.cl
+share/hashcat/OpenCL/m00100_a1-optimized.cl
 share/hashcat/OpenCL/m00100_a1.cl
+share/hashcat/OpenCL/m00100_a3-optimized.cl
 share/hashcat/OpenCL/m00100_a3.cl
+share/hashcat/OpenCL/m00110_a0-optimized.cl
 share/hashcat/OpenCL/m00110_a0.cl
+share/hashcat/OpenCL/m00110_a1-optimized.cl
 share/hashcat/OpenCL/m00110_a1.cl
+share/hashcat/OpenCL/m00110_a3-optimized.cl
 share/hashcat/OpenCL/m00110_a3.cl
+share/hashcat/OpenCL/m00120_a0-optimized.cl
 share/hashcat/OpenCL/m00120_a0.cl
+share/hashcat/OpenCL/m00120_a1-optimized.cl
 share/hashcat/OpenCL/m00120_a1.cl
+share/hashcat/OpenCL/m00120_a3-optimized.cl
 share/hashcat/OpenCL/m00120_a3.cl
+share/hashcat/OpenCL/m00130_a0-optimized.cl
 share/hashcat/OpenCL/m00130_a0.cl
+share/hashcat/OpenCL/m00130_a1-optimized.cl
 share/hashcat/OpenCL/m00130_a1.cl
+share/hashcat/OpenCL/m00130_a3-optimized.cl
 share/hashcat/OpenCL/m00130_a3.cl
+share/hashcat/OpenCL/m00140_a0-optimized.cl
 share/hashcat/OpenCL/m00140_a0.cl
+share/hashcat/OpenCL/m00140_a1-optimized.cl
 share/hashcat/OpenCL/m00140_a1.cl
+share/hashcat/OpenCL/m00140_a3-optimized.cl
 share/hashcat/OpenCL/m00140_a3.cl
+share/hashcat/OpenCL/m00150_a0-optimized.cl
 share/hashcat/OpenCL/m00150_a0.cl
+share/hashcat/OpenCL/m00150_a1-optimized.cl
 share/hashcat/OpenCL/m00150_a1.cl
+share/hashcat/OpenCL/m00150_a3-optimized.cl
 share/hashcat/OpenCL/m00150_a3.cl
+share/hashcat/OpenCL/m00160_a0-optimized.cl
 share/hashcat/OpenCL/m00160_a0.cl
+share/hashcat/OpenCL/m00160_a1-optimized.cl
 share/hashcat/OpenCL/m00160_a1.cl
+share/hashcat/OpenCL/m00160_a3-optimized.cl
 share/hashcat/OpenCL/m00160_a3.cl
-share/hashcat/OpenCL/m00200_a0.cl
-share/hashcat/OpenCL/m00200_a1.cl
-share/hashcat/OpenCL/m00200_a3.cl
+share/hashcat/OpenCL/m00200_a0-optimized.cl
+share/hashcat/OpenCL/m00200_a1-optimized.cl
+share/hashcat/OpenCL/m00200_a3-optimized.cl
+share/hashcat/OpenCL/m00300_a0-optimized.cl
 share/hashcat/OpenCL/m00300_a0.cl
+share/hashcat/OpenCL/m00300_a1-optimized.cl
 share/hashcat/OpenCL/m00300_a1.cl
+share/hashcat/OpenCL/m00300_a3-optimized.cl
 share/hashcat/OpenCL/m00300_a3.cl
+share/hashcat/OpenCL/m00400-optimized.cl
 share/hashcat/OpenCL/m00400.cl
+share/hashcat/OpenCL/m00500-optimized.cl
 share/hashcat/OpenCL/m00500.cl
-share/hashcat/OpenCL/m00600_a0.cl
-share/hashcat/OpenCL/m00600_a1.cl
-share/hashcat/OpenCL/m00600_a3.cl
+share/hashcat/OpenCL/m00600_a0-optimized.cl
+share/hashcat/OpenCL/m00600_a1-optimized.cl
+share/hashcat/OpenCL/m00600_a3-optimized.cl
+share/hashcat/OpenCL/m00900_a0-optimized.cl
 share/hashcat/OpenCL/m00900_a0.cl
+share/hashcat/OpenCL/m00900_a1-optimized.cl
 share/hashcat/OpenCL/m00900_a1.cl
+share/hashcat/OpenCL/m00900_a3-optimized.cl
 share/hashcat/OpenCL/m00900_a3.cl
+share/hashcat/OpenCL/m01000_a0-optimized.cl
 share/hashcat/OpenCL/m01000_a0.cl
+share/hashcat/OpenCL/m01000_a1-optimized.cl
 share/hashcat/OpenCL/m01000_a1.cl
+share/hashcat/OpenCL/m01000_a3-optimized.cl
 share/hashcat/OpenCL/m01000_a3.cl
+share/hashcat/OpenCL/m01100_a0-optimized.cl
 share/hashcat/OpenCL/m01100_a0.cl
+share/hashcat/OpenCL/m01100_a1-optimized.cl
 share/hashcat/OpenCL/m01100_a1.cl
+share/hashcat/OpenCL/m01100_a3-optimized.cl
 share/hashcat/OpenCL/m01100_a3.cl
+share/hashcat/OpenCL/m01300_a0-optimized.cl
 share/hashcat/OpenCL/m01300_a0.cl
+share/hashcat/OpenCL/m01300_a1-optimized.cl
 share/hashcat/OpenCL/m01300_a1.cl
+share/hashcat/OpenCL/m01300_a3-optimized.cl
 share/hashcat/OpenCL/m01300_a3.cl
+share/hashcat/OpenCL/m01400_a0-optimized.cl
 share/hashcat/OpenCL/m01400_a0.cl
+share/hashcat/OpenCL/m01400_a1-optimized.cl
 share/hashcat/OpenCL/m01400_a1.cl
+share/hashcat/OpenCL/m01400_a3-optimized.cl
 share/hashcat/OpenCL/m01400_a3.cl
+share/hashcat/OpenCL/m01410_a0-optimized.cl
 share/hashcat/OpenCL/m01410_a0.cl
+share/hashcat/OpenCL/m01410_a1-optimized.cl
 share/hashcat/OpenCL/m01410_a1.cl
+share/hashcat/OpenCL/m01410_a3-optimized.cl
 share/hashcat/OpenCL/m01410_a3.cl
+share/hashcat/OpenCL/m01420_a0-optimized.cl
 share/hashcat/OpenCL/m01420_a0.cl
+share/hashcat/OpenCL/m01420_a1-optimized.cl
 share/hashcat/OpenCL/m01420_a1.cl
+share/hashcat/OpenCL/m01420_a3-optimized.cl
 share/hashcat/OpenCL/m01420_a3.cl
+share/hashcat/OpenCL/m01430_a0-optimized.cl
 share/hashcat/OpenCL/m01430_a0.cl
+share/hashcat/OpenCL/m01430_a1-optimized.cl
 share/hashcat/OpenCL/m01430_a1.cl
+share/hashcat/OpenCL/m01430_a3-optimized.cl
 share/hashcat/OpenCL/m01430_a3.cl
+share/hashcat/OpenCL/m01440_a0-optimized.cl
 share/hashcat/OpenCL/m01440_a0.cl
+share/hashcat/OpenCL/m01440_a1-optimized.cl
 share/hashcat/OpenCL/m01440_a1.cl
+share/hashcat/OpenCL/m01440_a3-optimized.cl
 share/hashcat/OpenCL/m01440_a3.cl
+share/hashcat/OpenCL/m01450_a0-optimized.cl
 share/hashcat/OpenCL/m01450_a0.cl
+share/hashcat/OpenCL/m01450_a1-optimized.cl
 share/hashcat/OpenCL/m01450_a1.cl
+share/hashcat/OpenCL/m01450_a3-optimized.cl
 share/hashcat/OpenCL/m01450_a3.cl
+share/hashcat/OpenCL/m01460_a0-optimized.cl
 share/hashcat/OpenCL/m01460_a0.cl
+share/hashcat/OpenCL/m01460_a1-optimized.cl
 share/hashcat/OpenCL/m01460_a1.cl
+share/hashcat/OpenCL/m01460_a3-optimized.cl
 share/hashcat/OpenCL/m01460_a3.cl
 share/hashcat/OpenCL/m01500_a0.cl
 share/hashcat/OpenCL/m01500_a1.cl
 share/hashcat/OpenCL/m01500_a3.cl
+share/hashcat/OpenCL/m01600-optimized.cl
 share/hashcat/OpenCL/m01600.cl
+share/hashcat/OpenCL/m01700_a0-optimized.cl
 share/hashcat/OpenCL/m01700_a0.cl
+share/hashcat/OpenCL/m01700_a1-optimized.cl
 share/hashcat/OpenCL/m01700_a1.cl
+share/hashcat/OpenCL/m01700_a3-optimized.cl
 share/hashcat/OpenCL/m01700_a3.cl
+share/hashcat/OpenCL/m01710_a0-optimized.cl
 share/hashcat/OpenCL/m01710_a0.cl
+share/hashcat/OpenCL/m01710_a1-optimized.cl
 share/hashcat/OpenCL/m01710_a1.cl
+share/hashcat/OpenCL/m01710_a3-optimized.cl
 share/hashcat/OpenCL/m01710_a3.cl
+share/hashcat/OpenCL/m01720_a0-optimized.cl
 share/hashcat/OpenCL/m01720_a0.cl
+share/hashcat/OpenCL/m01720_a1-optimized.cl
 share/hashcat/OpenCL/m01720_a1.cl
+share/hashcat/OpenCL/m01720_a3-optimized.cl
 share/hashcat/OpenCL/m01720_a3.cl
+share/hashcat/OpenCL/m01730_a0-optimized.cl
 share/hashcat/OpenCL/m01730_a0.cl
+share/hashcat/OpenCL/m01730_a1-optimized.cl
 share/hashcat/OpenCL/m01730_a1.cl
+share/hashcat/OpenCL/m01730_a3-optimized.cl
 share/hashcat/OpenCL/m01730_a3.cl
+share/hashcat/OpenCL/m01740_a0-optimized.cl
 share/hashcat/OpenCL/m01740_a0.cl
+share/hashcat/OpenCL/m01740_a1-optimized.cl
 share/hashcat/OpenCL/m01740_a1.cl
+share/hashcat/OpenCL/m01740_a3-optimized.cl
 share/hashcat/OpenCL/m01740_a3.cl
+share/hashcat/OpenCL/m01750_a0-optimized.cl
 share/hashcat/OpenCL/m01750_a0.cl
+share/hashcat/OpenCL/m01750_a1-optimized.cl
 share/hashcat/OpenCL/m01750_a1.cl
+share/hashcat/OpenCL/m01750_a3-optimized.cl
 share/hashcat/OpenCL/m01750_a3.cl
+share/hashcat/OpenCL/m01760_a0-optimized.cl
 share/hashcat/OpenCL/m01760_a0.cl
+share/hashcat/OpenCL/m01760_a1-optimized.cl
 share/hashcat/OpenCL/m01760_a1.cl
+share/hashcat/OpenCL/m01760_a3-optimized.cl
 share/hashcat/OpenCL/m01760_a3.cl
+share/hashcat/OpenCL/m01800-optimized.cl
 share/hashcat/OpenCL/m01800.cl
 share/hashcat/OpenCL/m02000_a0.cl
 share/hashcat/OpenCL/m02000_a1.cl
 share/hashcat/OpenCL/m02000_a3.cl
 share/hashcat/OpenCL/m02100.cl
-share/hashcat/OpenCL/m02400_a0.cl
-share/hashcat/OpenCL/m02400_a1.cl
-share/hashcat/OpenCL/m02400_a3.cl
-share/hashcat/OpenCL/m02410_a0.cl
-share/hashcat/OpenCL/m02410_a1.cl
-share/hashcat/OpenCL/m02410_a3.cl
+share/hashcat/OpenCL/m02400_a0-optimized.cl
+share/hashcat/OpenCL/m02400_a1-optimized.cl
+share/hashcat/OpenCL/m02400_a3-optimized.cl
+share/hashcat/OpenCL/m02410_a0-optimized.cl
+share/hashcat/OpenCL/m02410_a1-optimized.cl
+share/hashcat/OpenCL/m02410_a3-optimized.cl
 share/hashcat/OpenCL/m02500.cl
+share/hashcat/OpenCL/m02501.cl
+share/hashcat/OpenCL/m02610_a0-optimized.cl
 share/hashcat/OpenCL/m02610_a0.cl
+share/hashcat/OpenCL/m02610_a1-optimized.cl
 share/hashcat/OpenCL/m02610_a1.cl
+share/hashcat/OpenCL/m02610_a3-optimized.cl
 share/hashcat/OpenCL/m02610_a3.cl
-share/hashcat/OpenCL/m02710_a0.cl
-share/hashcat/OpenCL/m02710_a1.cl
-share/hashcat/OpenCL/m02710_a3.cl
+share/hashcat/OpenCL/m02710_a0-optimized.cl
+share/hashcat/OpenCL/m02710_a1-optimized.cl
+share/hashcat/OpenCL/m02710_a3-optimized.cl
+share/hashcat/OpenCL/m02810_a0-optimized.cl
 share/hashcat/OpenCL/m02810_a0.cl
+share/hashcat/OpenCL/m02810_a1-optimized.cl
 share/hashcat/OpenCL/m02810_a1.cl
+share/hashcat/OpenCL/m02810_a3-optimized.cl
 share/hashcat/OpenCL/m02810_a3.cl
 share/hashcat/OpenCL/m03000_a0.cl
 share/hashcat/OpenCL/m03000_a1.cl
 share/hashcat/OpenCL/m03000_a3.cl
-share/hashcat/OpenCL/m03100_a0.cl
-share/hashcat/OpenCL/m03100_a1.cl
-share/hashcat/OpenCL/m03100_a3.cl
+share/hashcat/OpenCL/m03100_a0-optimized.cl
+share/hashcat/OpenCL/m03100_a1-optimized.cl
+share/hashcat/OpenCL/m03100_a3-optimized.cl
 share/hashcat/OpenCL/m03200.cl
+share/hashcat/OpenCL/m03710_a0-optimized.cl
 share/hashcat/OpenCL/m03710_a0.cl
+share/hashcat/OpenCL/m03710_a1-optimized.cl
 share/hashcat/OpenCL/m03710_a1.cl
+share/hashcat/OpenCL/m03710_a3-optimized.cl
 share/hashcat/OpenCL/m03710_a3.cl
+share/hashcat/OpenCL/m03800_a0-optimized.cl
 share/hashcat/OpenCL/m03800_a0.cl
+share/hashcat/OpenCL/m03800_a1-optimized.cl
 share/hashcat/OpenCL/m03800_a1.cl
+share/hashcat/OpenCL/m03800_a3-optimized.cl
 share/hashcat/OpenCL/m03800_a3.cl
+share/hashcat/OpenCL/m03910_a0-optimized.cl
 share/hashcat/OpenCL/m03910_a0.cl
+share/hashcat/OpenCL/m03910_a1-optimized.cl
 share/hashcat/OpenCL/m03910_a1.cl
+share/hashcat/OpenCL/m03910_a3-optimized.cl
 share/hashcat/OpenCL/m03910_a3.cl
+share/hashcat/OpenCL/m04010_a0-optimized.cl
 share/hashcat/OpenCL/m04010_a0.cl
+share/hashcat/OpenCL/m04010_a1-optimized.cl
 share/hashcat/OpenCL/m04010_a1.cl
+share/hashcat/OpenCL/m04010_a3-optimized.cl
 share/hashcat/OpenCL/m04010_a3.cl
+share/hashcat/OpenCL/m04110_a0-optimized.cl
 share/hashcat/OpenCL/m04110_a0.cl
+share/hashcat/OpenCL/m04110_a1-optimized.cl
 share/hashcat/OpenCL/m04110_a1.cl
+share/hashcat/OpenCL/m04110_a3-optimized.cl
 share/hashcat/OpenCL/m04110_a3.cl
+share/hashcat/OpenCL/m04310_a0-optimized.cl
 share/hashcat/OpenCL/m04310_a0.cl
+share/hashcat/OpenCL/m04310_a1-optimized.cl
 share/hashcat/OpenCL/m04310_a1.cl
+share/hashcat/OpenCL/m04310_a3-optimized.cl
 share/hashcat/OpenCL/m04310_a3.cl
+share/hashcat/OpenCL/m04400_a0-optimized.cl
 share/hashcat/OpenCL/m04400_a0.cl
+share/hashcat/OpenCL/m04400_a1-optimized.cl
 share/hashcat/OpenCL/m04400_a1.cl
+share/hashcat/OpenCL/m04400_a3-optimized.cl
 share/hashcat/OpenCL/m04400_a3.cl
+share/hashcat/OpenCL/m04500_a0-optimized.cl
 share/hashcat/OpenCL/m04500_a0.cl
+share/hashcat/OpenCL/m04500_a1-optimized.cl
 share/hashcat/OpenCL/m04500_a1.cl
+share/hashcat/OpenCL/m04500_a3-optimized.cl
 share/hashcat/OpenCL/m04500_a3.cl
+share/hashcat/OpenCL/m04520_a0-optimized.cl
 share/hashcat/OpenCL/m04520_a0.cl
+share/hashcat/OpenCL/m04520_a1-optimized.cl
 share/hashcat/OpenCL/m04520_a1.cl
+share/hashcat/OpenCL/m04520_a3-optimized.cl
 share/hashcat/OpenCL/m04520_a3.cl
+share/hashcat/OpenCL/m04700_a0-optimized.cl
 share/hashcat/OpenCL/m04700_a0.cl
+share/hashcat/OpenCL/m04700_a1-optimized.cl
 share/hashcat/OpenCL/m04700_a1.cl
+share/hashcat/OpenCL/m04700_a3-optimized.cl
 share/hashcat/OpenCL/m04700_a3.cl
+share/hashcat/OpenCL/m04800_a0-optimized.cl
 share/hashcat/OpenCL/m04800_a0.cl
+share/hashcat/OpenCL/m04800_a1-optimized.cl
 share/hashcat/OpenCL/m04800_a1.cl
+share/hashcat/OpenCL/m04800_a3-optimized.cl
 share/hashcat/OpenCL/m04800_a3.cl
+share/hashcat/OpenCL/m04900_a0-optimized.cl
 share/hashcat/OpenCL/m04900_a0.cl
+share/hashcat/OpenCL/m04900_a1-optimized.cl
 share/hashcat/OpenCL/m04900_a1.cl
+share/hashcat/OpenCL/m04900_a3-optimized.cl
 share/hashcat/OpenCL/m04900_a3.cl
-share/hashcat/OpenCL/m05000_a0.cl
-share/hashcat/OpenCL/m05000_a1.cl
-share/hashcat/OpenCL/m05000_a3.cl
+share/hashcat/OpenCL/m05000_a0-optimized.cl
+share/hashcat/OpenCL/m05000_a1-optimized.cl
+share/hashcat/OpenCL/m05000_a3-optimized.cl
+share/hashcat/OpenCL/m05100_a0-optimized.cl
 share/hashcat/OpenCL/m05100_a0.cl
+share/hashcat/OpenCL/m05100_a1-optimized.cl
 share/hashcat/OpenCL/m05100_a1.cl
+share/hashcat/OpenCL/m05100_a3-optimized.cl
 share/hashcat/OpenCL/m05100_a3.cl
 share/hashcat/OpenCL/m05200.cl
+share/hashcat/OpenCL/m05300_a0-optimized.cl
 share/hashcat/OpenCL/m05300_a0.cl
+share/hashcat/OpenCL/m05300_a1-optimized.cl
 share/hashcat/OpenCL/m05300_a1.cl
+share/hashcat/OpenCL/m05300_a3-optimized.cl
 share/hashcat/OpenCL/m05300_a3.cl
+share/hashcat/OpenCL/m05400_a0-optimized.cl
 share/hashcat/OpenCL/m05400_a0.cl
+share/hashcat/OpenCL/m05400_a1-optimized.cl
 share/hashcat/OpenCL/m05400_a1.cl
+share/hashcat/OpenCL/m05400_a3-optimized.cl
 share/hashcat/OpenCL/m05400_a3.cl
+share/hashcat/OpenCL/m05500_a0-optimized.cl
 share/hashcat/OpenCL/m05500_a0.cl
+share/hashcat/OpenCL/m05500_a1-optimized.cl
 share/hashcat/OpenCL/m05500_a1.cl
+share/hashcat/OpenCL/m05500_a3-optimized.cl
 share/hashcat/OpenCL/m05500_a3.cl
+share/hashcat/OpenCL/m05600_a0-optimized.cl
 share/hashcat/OpenCL/m05600_a0.cl
+share/hashcat/OpenCL/m05600_a1-optimized.cl
 share/hashcat/OpenCL/m05600_a1.cl
+share/hashcat/OpenCL/m05600_a3-optimized.cl
 share/hashcat/OpenCL/m05600_a3.cl
+share/hashcat/OpenCL/m05800-optimized.cl
 share/hashcat/OpenCL/m05800.cl
+share/hashcat/OpenCL/m06000_a0-optimized.cl
 share/hashcat/OpenCL/m06000_a0.cl
+share/hashcat/OpenCL/m06000_a1-optimized.cl
 share/hashcat/OpenCL/m06000_a1.cl
+share/hashcat/OpenCL/m06000_a3-optimized.cl
 share/hashcat/OpenCL/m06000_a3.cl
+share/hashcat/OpenCL/m06100_a0-optimized.cl
 share/hashcat/OpenCL/m06100_a0.cl
+share/hashcat/OpenCL/m06100_a1-optimized.cl
 share/hashcat/OpenCL/m06100_a1.cl
+share/hashcat/OpenCL/m06100_a3-optimized.cl
 share/hashcat/OpenCL/m06100_a3.cl
 share/hashcat/OpenCL/m06211.cl
 share/hashcat/OpenCL/m06212.cl
@@ -412,45 +610,65 @@ share/hashcat/OpenCL/m06223.cl
 share/hashcat/OpenCL/m06231.cl
 share/hashcat/OpenCL/m06232.cl
 share/hashcat/OpenCL/m06233.cl
+share/hashcat/OpenCL/m06300-optimized.cl
 share/hashcat/OpenCL/m06300.cl
 share/hashcat/OpenCL/m06400.cl
 share/hashcat/OpenCL/m06500.cl
 share/hashcat/OpenCL/m06600.cl
 share/hashcat/OpenCL/m06700.cl
 share/hashcat/OpenCL/m06800.cl
-share/hashcat/OpenCL/m06900_a0.cl
-share/hashcat/OpenCL/m06900_a1.cl
-share/hashcat/OpenCL/m06900_a3.cl
+share/hashcat/OpenCL/m06900_a0-optimized.cl
+share/hashcat/OpenCL/m06900_a1-optimized.cl
+share/hashcat/OpenCL/m06900_a3-optimized.cl
+share/hashcat/OpenCL/m07000_a0-optimized.cl
 share/hashcat/OpenCL/m07000_a0.cl
+share/hashcat/OpenCL/m07000_a1-optimized.cl
 share/hashcat/OpenCL/m07000_a1.cl
+share/hashcat/OpenCL/m07000_a3-optimized.cl
 share/hashcat/OpenCL/m07000_a3.cl
 share/hashcat/OpenCL/m07100.cl
+share/hashcat/OpenCL/m07300_a0-optimized.cl
 share/hashcat/OpenCL/m07300_a0.cl
+share/hashcat/OpenCL/m07300_a1-optimized.cl
 share/hashcat/OpenCL/m07300_a1.cl
+share/hashcat/OpenCL/m07300_a3-optimized.cl
 share/hashcat/OpenCL/m07300_a3.cl
+share/hashcat/OpenCL/m07400-optimized.cl
 share/hashcat/OpenCL/m07400.cl
+share/hashcat/OpenCL/m07500_a0-optimized.cl
 share/hashcat/OpenCL/m07500_a0.cl
+share/hashcat/OpenCL/m07500_a1-optimized.cl
 share/hashcat/OpenCL/m07500_a1.cl
+share/hashcat/OpenCL/m07500_a3-optimized.cl
 share/hashcat/OpenCL/m07500_a3.cl
-share/hashcat/OpenCL/m07700_a0.cl
-share/hashcat/OpenCL/m07700_a1.cl
-share/hashcat/OpenCL/m07700_a3.cl
-share/hashcat/OpenCL/m07800_a0.cl
-share/hashcat/OpenCL/m07800_a1.cl
-share/hashcat/OpenCL/m07800_a3.cl
+share/hashcat/OpenCL/m07700_a0-optimized.cl
+share/hashcat/OpenCL/m07700_a1-optimized.cl
+share/hashcat/OpenCL/m07700_a3-optimized.cl
+share/hashcat/OpenCL/m07800_a0-optimized.cl
+share/hashcat/OpenCL/m07800_a1-optimized.cl
+share/hashcat/OpenCL/m07800_a3-optimized.cl
 share/hashcat/OpenCL/m07900.cl
-share/hashcat/OpenCL/m08000_a0.cl
-share/hashcat/OpenCL/m08000_a1.cl
-share/hashcat/OpenCL/m08000_a3.cl
+share/hashcat/OpenCL/m08000_a0-optimized.cl
+share/hashcat/OpenCL/m08000_a1-optimized.cl
+share/hashcat/OpenCL/m08000_a3-optimized.cl
+share/hashcat/OpenCL/m08100_a0-optimized.cl
 share/hashcat/OpenCL/m08100_a0.cl
+share/hashcat/OpenCL/m08100_a1-optimized.cl
 share/hashcat/OpenCL/m08100_a1.cl
+share/hashcat/OpenCL/m08100_a3-optimized.cl
 share/hashcat/OpenCL/m08100_a3.cl
 share/hashcat/OpenCL/m08200.cl
+share/hashcat/OpenCL/m08300_a0-optimized.cl
 share/hashcat/OpenCL/m08300_a0.cl
+share/hashcat/OpenCL/m08300_a1-optimized.cl
 share/hashcat/OpenCL/m08300_a1.cl
+share/hashcat/OpenCL/m08300_a3-optimized.cl
 share/hashcat/OpenCL/m08300_a3.cl
+share/hashcat/OpenCL/m08400_a0-optimized.cl
 share/hashcat/OpenCL/m08400_a0.cl
+share/hashcat/OpenCL/m08400_a1-optimized.cl
 share/hashcat/OpenCL/m08400_a1.cl
+share/hashcat/OpenCL/m08400_a3-optimized.cl
 share/hashcat/OpenCL/m08400_a3.cl
 share/hashcat/OpenCL/m08500_a0.cl
 share/hashcat/OpenCL/m08500_a1.cl
@@ -458,9 +676,9 @@ share/hashcat/OpenCL/m08500_a3.cl
 share/hashcat/OpenCL/m08600_a0.cl
 share/hashcat/OpenCL/m08600_a1.cl
 share/hashcat/OpenCL/m08600_a3.cl
-share/hashcat/OpenCL/m08700_a0.cl
-share/hashcat/OpenCL/m08700_a1.cl
-share/hashcat/OpenCL/m08700_a3.cl
+share/hashcat/OpenCL/m08700_a0-optimized.cl
+share/hashcat/OpenCL/m08700_a1-optimized.cl
+share/hashcat/OpenCL/m08700_a3-optimized.cl
 share/hashcat/OpenCL/m08800.cl
 share/hashcat/OpenCL/m08900.cl
 share/hashcat/OpenCL/m09000.cl
@@ -468,102 +686,136 @@ share/hashcat/OpenCL/m09100.cl
 share/hashcat/OpenCL/m09400.cl
 share/hashcat/OpenCL/m09500.cl
 share/hashcat/OpenCL/m09600.cl
-share/hashcat/OpenCL/m09700_a0.cl
-share/hashcat/OpenCL/m09700_a1.cl
-share/hashcat/OpenCL/m09700_a3.cl
-share/hashcat/OpenCL/m09710_a0.cl
-share/hashcat/OpenCL/m09710_a1.cl
-share/hashcat/OpenCL/m09710_a3.cl
-share/hashcat/OpenCL/m09720_a0.cl
-share/hashcat/OpenCL/m09720_a1.cl
-share/hashcat/OpenCL/m09720_a3.cl
-share/hashcat/OpenCL/m09800_a0.cl
-share/hashcat/OpenCL/m09800_a1.cl
-share/hashcat/OpenCL/m09800_a3.cl
-share/hashcat/OpenCL/m09810_a0.cl
-share/hashcat/OpenCL/m09810_a1.cl
-share/hashcat/OpenCL/m09810_a3.cl
-share/hashcat/OpenCL/m09820_a0.cl
-share/hashcat/OpenCL/m09820_a1.cl
-share/hashcat/OpenCL/m09820_a3.cl
+share/hashcat/OpenCL/m09700_a0-optimized.cl
+share/hashcat/OpenCL/m09700_a1-optimized.cl
+share/hashcat/OpenCL/m09700_a3-optimized.cl
+share/hashcat/OpenCL/m09710_a0-optimized.cl
+share/hashcat/OpenCL/m09710_a1-optimized.cl
+share/hashcat/OpenCL/m09710_a3-optimized.cl
+share/hashcat/OpenCL/m09720_a0-optimized.cl
+share/hashcat/OpenCL/m09720_a1-optimized.cl
+share/hashcat/OpenCL/m09720_a3-optimized.cl
+share/hashcat/OpenCL/m09800_a0-optimized.cl
+share/hashcat/OpenCL/m09800_a1-optimized.cl
+share/hashcat/OpenCL/m09800_a3-optimized.cl
+share/hashcat/OpenCL/m09810_a0-optimized.cl
+share/hashcat/OpenCL/m09810_a1-optimized.cl
+share/hashcat/OpenCL/m09810_a3-optimized.cl
+share/hashcat/OpenCL/m09820_a0-optimized.cl
+share/hashcat/OpenCL/m09820_a1-optimized.cl
+share/hashcat/OpenCL/m09820_a3-optimized.cl
+share/hashcat/OpenCL/m09900_a0-optimized.cl
 share/hashcat/OpenCL/m09900_a0.cl
+share/hashcat/OpenCL/m09900_a1-optimized.cl
 share/hashcat/OpenCL/m09900_a1.cl
+share/hashcat/OpenCL/m09900_a3-optimized.cl
 share/hashcat/OpenCL/m09900_a3.cl
-share/hashcat/OpenCL/m10100_a0.cl
-share/hashcat/OpenCL/m10100_a1.cl
-share/hashcat/OpenCL/m10100_a3.cl
+share/hashcat/OpenCL/m10100_a0-optimized.cl
+share/hashcat/OpenCL/m10100_a1-optimized.cl
+share/hashcat/OpenCL/m10100_a3-optimized.cl
 share/hashcat/OpenCL/m10300.cl
-share/hashcat/OpenCL/m10400_a0.cl
-share/hashcat/OpenCL/m10400_a1.cl
-share/hashcat/OpenCL/m10400_a3.cl
-share/hashcat/OpenCL/m10410_a0.cl
-share/hashcat/OpenCL/m10410_a1.cl
-share/hashcat/OpenCL/m10410_a3.cl
-share/hashcat/OpenCL/m10420_a0.cl
-share/hashcat/OpenCL/m10420_a1.cl
-share/hashcat/OpenCL/m10420_a3.cl
+share/hashcat/OpenCL/m10400_a0-optimized.cl
+share/hashcat/OpenCL/m10400_a1-optimized.cl
+share/hashcat/OpenCL/m10400_a3-optimized.cl
+share/hashcat/OpenCL/m10410_a0-optimized.cl
+share/hashcat/OpenCL/m10410_a1-optimized.cl
+share/hashcat/OpenCL/m10410_a3-optimized.cl
+share/hashcat/OpenCL/m10420_a0-optimized.cl
+share/hashcat/OpenCL/m10420_a1-optimized.cl
+share/hashcat/OpenCL/m10420_a3-optimized.cl
 share/hashcat/OpenCL/m10500.cl
+share/hashcat/OpenCL/m10700-optimized.cl
 share/hashcat/OpenCL/m10700.cl
+share/hashcat/OpenCL/m10800_a0-optimized.cl
 share/hashcat/OpenCL/m10800_a0.cl
+share/hashcat/OpenCL/m10800_a1-optimized.cl
 share/hashcat/OpenCL/m10800_a1.cl
+share/hashcat/OpenCL/m10800_a3-optimized.cl
 share/hashcat/OpenCL/m10800_a3.cl
 share/hashcat/OpenCL/m10900.cl
+share/hashcat/OpenCL/m11000_a0-optimized.cl
 share/hashcat/OpenCL/m11000_a0.cl
+share/hashcat/OpenCL/m11000_a1-optimized.cl
 share/hashcat/OpenCL/m11000_a1.cl
+share/hashcat/OpenCL/m11000_a3-optimized.cl
 share/hashcat/OpenCL/m11000_a3.cl
+share/hashcat/OpenCL/m11100_a0-optimized.cl
 share/hashcat/OpenCL/m11100_a0.cl
+share/hashcat/OpenCL/m11100_a1-optimized.cl
 share/hashcat/OpenCL/m11100_a1.cl
+share/hashcat/OpenCL/m11100_a3-optimized.cl
 share/hashcat/OpenCL/m11100_a3.cl
+share/hashcat/OpenCL/m11200_a0-optimized.cl
 share/hashcat/OpenCL/m11200_a0.cl
+share/hashcat/OpenCL/m11200_a1-optimized.cl
 share/hashcat/OpenCL/m11200_a1.cl
+share/hashcat/OpenCL/m11200_a3-optimized.cl
 share/hashcat/OpenCL/m11200_a3.cl
 share/hashcat/OpenCL/m11300.cl
 share/hashcat/OpenCL/m11400_a0.cl
 share/hashcat/OpenCL/m11400_a1.cl
 share/hashcat/OpenCL/m11400_a3.cl
-share/hashcat/OpenCL/m11500_a0.cl
-share/hashcat/OpenCL/m11500_a1.cl
-share/hashcat/OpenCL/m11500_a3.cl
+share/hashcat/OpenCL/m11500_a0-optimized.cl
+share/hashcat/OpenCL/m11500_a1-optimized.cl
+share/hashcat/OpenCL/m11500_a3-optimized.cl
 share/hashcat/OpenCL/m11600.cl
-share/hashcat/OpenCL/m11700_a0.cl
-share/hashcat/OpenCL/m11700_a1.cl
-share/hashcat/OpenCL/m11700_a3.cl
-share/hashcat/OpenCL/m11800_a0.cl
-share/hashcat/OpenCL/m11800_a1.cl
-share/hashcat/OpenCL/m11800_a3.cl
+share/hashcat/OpenCL/m11700_a0-optimized.cl
+share/hashcat/OpenCL/m11700_a1-optimized.cl
+share/hashcat/OpenCL/m11700_a3-optimized.cl
+share/hashcat/OpenCL/m11800_a0-optimized.cl
+share/hashcat/OpenCL/m11800_a1-optimized.cl
+share/hashcat/OpenCL/m11800_a3-optimized.cl
 share/hashcat/OpenCL/m11900.cl
 share/hashcat/OpenCL/m12000.cl
 share/hashcat/OpenCL/m12200.cl
 share/hashcat/OpenCL/m12300.cl
 share/hashcat/OpenCL/m12400.cl
 share/hashcat/OpenCL/m12500.cl
+share/hashcat/OpenCL/m12600_a0-optimized.cl
 share/hashcat/OpenCL/m12600_a0.cl
+share/hashcat/OpenCL/m12600_a1-optimized.cl
 share/hashcat/OpenCL/m12600_a1.cl
+share/hashcat/OpenCL/m12600_a3-optimized.cl
 share/hashcat/OpenCL/m12600_a3.cl
 share/hashcat/OpenCL/m12700.cl
 share/hashcat/OpenCL/m12800.cl
 share/hashcat/OpenCL/m12900.cl
 share/hashcat/OpenCL/m13000.cl
+share/hashcat/OpenCL/m13100_a0-optimized.cl
 share/hashcat/OpenCL/m13100_a0.cl
+share/hashcat/OpenCL/m13100_a1-optimized.cl
 share/hashcat/OpenCL/m13100_a1.cl
+share/hashcat/OpenCL/m13100_a3-optimized.cl
 share/hashcat/OpenCL/m13100_a3.cl
 share/hashcat/OpenCL/m13200.cl
+share/hashcat/OpenCL/m13300_a0-optimized.cl
 share/hashcat/OpenCL/m13300_a0.cl
+share/hashcat/OpenCL/m13300_a1-optimized.cl
 share/hashcat/OpenCL/m13300_a1.cl
+share/hashcat/OpenCL/m13300_a3-optimized.cl
 share/hashcat/OpenCL/m13300_a3.cl
 share/hashcat/OpenCL/m13400.cl
+share/hashcat/OpenCL/m13500_a0-optimized.cl
 share/hashcat/OpenCL/m13500_a0.cl
+share/hashcat/OpenCL/m13500_a1-optimized.cl
 share/hashcat/OpenCL/m13500_a1.cl
+share/hashcat/OpenCL/m13500_a3-optimized.cl
 share/hashcat/OpenCL/m13500_a3.cl
 share/hashcat/OpenCL/m13600.cl
 share/hashcat/OpenCL/m13751.cl
 share/hashcat/OpenCL/m13752.cl
 share/hashcat/OpenCL/m13753.cl
+share/hashcat/OpenCL/m13800_a0-optimized.cl
 share/hashcat/OpenCL/m13800_a0.cl
+share/hashcat/OpenCL/m13800_a1-optimized.cl
 share/hashcat/OpenCL/m13800_a1.cl
+share/hashcat/OpenCL/m13800_a3-optimized.cl
 share/hashcat/OpenCL/m13800_a3.cl
+share/hashcat/OpenCL/m13900_a0-optimized.cl
 share/hashcat/OpenCL/m13900_a0.cl
+share/hashcat/OpenCL/m13900_a1-optimized.cl
 share/hashcat/OpenCL/m13900_a1.cl
+share/hashcat/OpenCL/m13900_a3-optimized.cl
 share/hashcat/OpenCL/m13900_a3.cl
 share/hashcat/OpenCL/m14000_a0.cl
 share/hashcat/OpenCL/m14000_a1.cl
@@ -571,8 +823,11 @@ share/hashcat/OpenCL/m14000_a3.cl
 share/hashcat/OpenCL/m14100_a0.cl
 share/hashcat/OpenCL/m14100_a1.cl
 share/hashcat/OpenCL/m14100_a3.cl
+share/hashcat/OpenCL/m14400_a0-optimized.cl
 share/hashcat/OpenCL/m14400_a0.cl
+share/hashcat/OpenCL/m14400_a1-optimized.cl
 share/hashcat/OpenCL/m14400_a1.cl
+share/hashcat/OpenCL/m14400_a3-optimized.cl
 share/hashcat/OpenCL/m14400_a3.cl
 share/hashcat/OpenCL/m14611.cl
 share/hashcat/OpenCL/m14612.cl
@@ -588,23 +843,30 @@ share/hashcat/OpenCL/m14642.cl
 share/hashcat/OpenCL/m14643.cl
 share/hashcat/OpenCL/m14700.cl
 share/hashcat/OpenCL/m14800.cl
-share/hashcat/OpenCL/m14900_a0.cl
-share/hashcat/OpenCL/m14900_a1.cl
-share/hashcat/OpenCL/m14900_a3.cl
+share/hashcat/OpenCL/m14900_a0-optimized.cl
+share/hashcat/OpenCL/m14900_a1-optimized.cl
+share/hashcat/OpenCL/m14900_a3-optimized.cl
+share/hashcat/OpenCL/m15000_a0-optimized.cl
 share/hashcat/OpenCL/m15000_a0.cl
+share/hashcat/OpenCL/m15000_a1-optimized.cl
 share/hashcat/OpenCL/m15000_a1.cl
+share/hashcat/OpenCL/m15000_a3-optimized.cl
 share/hashcat/OpenCL/m15000_a3.cl
 share/hashcat/OpenCL/m15100.cl
 share/hashcat/OpenCL/m15300.cl
-share/hashcat/OpenCL/m15400_a0.cl
-share/hashcat/OpenCL/m15400_a1.cl
-share/hashcat/OpenCL/m15400_a3.cl
+share/hashcat/OpenCL/m15400_a0-optimized.cl
+share/hashcat/OpenCL/m15400_a1-optimized.cl
+share/hashcat/OpenCL/m15400_a3-optimized.cl
+share/hashcat/OpenCL/m15500_a0-optimized.cl
 share/hashcat/OpenCL/m15500_a0.cl
+share/hashcat/OpenCL/m15500_a1-optimized.cl
 share/hashcat/OpenCL/m15500_a1.cl
+share/hashcat/OpenCL/m15500_a3-optimized.cl
 share/hashcat/OpenCL/m15500_a3.cl
 share/hashcat/OpenCL/m15600.cl
 share/hashcat/OpenCL/m15700.cl
+share/hashcat/OpenCL/m15900.cl
 share/hashcat/OpenCL/markov_be.cl
 share/hashcat/OpenCL/markov_le.cl
-share/hashcat/hashcat.hcstat
+share/hashcat/hashcat.hcstat2
 share/hashcat/hashcat.hctune
diff --git a/hashcat/distinfo b/hashcat/distinfo
index a5c9b06833..4085e9116f 100644
--- a/hashcat/distinfo
+++ b/hashcat/distinfo
@@ -1,7 +1,7 @@
 $NetBSD$
 
-SHA1 (hashcat-3.6.0.tar.gz) = 1c6e8cc4180b149c1352e1bfc7a7084874d3ba8f
-RMD160 (hashcat-3.6.0.tar.gz) = e9903ce1cf726e88619cc49a25aea7d363c8813e
-SHA512 (hashcat-3.6.0.tar.gz) = 7842b6d742cd1c83f136b0ae13cdd4c6991618654360b5f67376c6d08e93888f4d958360aac8b0c8bbe96a6cbe032971fbc2ec7fa6d58794aa50381e0191a636
-Size (hashcat-3.6.0.tar.gz) = 4153530 bytes
-SHA1 (patch-src_Makefile) = 630e7a5b422563e14e8eb2fa5a9abef52b1236fa
+SHA1 (hashcat-4.0.0.tar.gz) = 079a1cdf941a5b2db131dd749d4936f4500d270b
+RMD160 (hashcat-4.0.0.tar.gz) = 7d8890cdf9325af17a0e92cef761f4cfeb5d88b6
+SHA512 (hashcat-4.0.0.tar.gz) = ef5117ec34a0fb06a8be1058caeb88016421bff9de5acced7f738b0dca82b52fc2495758242389315c29a66d46360211528d79ce8207af6f6a451eef6e0d8806
+Size (hashcat-4.0.0.tar.gz) = 3904979 bytes
+SHA1 (patch-src_Makefile) = 3685cf59d73e808076f652ac713a904ed39f5046
diff --git a/hashcat/patches/patch-src_Makefile b/hashcat/patches/patch-src_Makefile
index 22301094a8..f815dc1ce9 100644
--- a/hashcat/patches/patch-src_Makefile
+++ b/hashcat/patches/patch-src_Makefile
@@ -2,9 +2,9 @@ $NetBSD$
 
 Add minimal NetBSD support.
 Don't override CC nor optimisation flags in CFLAGS.
-On Darwin, use gsed.
+Use custom VERSION_TAG.
 
---- src/Makefile.orig	2017-03-03 14:26:59.000000000 +0000
+--- src/Makefile.orig	2017-10-27 09:48:24.000000000 +0000
 +++ src/Makefile
 @@ -21,7 +21,7 @@ UNAME                   := $(patsubst MS
  UNAME                   := $(patsubst MINGW32_NT-%,MSYS2,$(UNAME))
@@ -27,7 +27,7 @@ On Darwin, use gsed.
  
  ifeq ($(UNAME),CYGWIN)
  HASHCAT_FRONTEND        := hashcat.exe
-@@ -80,21 +84,14 @@ OPENCL_HEADERS_KHRONOS  := deps/OpenCL-H
+@@ -80,24 +84,12 @@ OPENCL_HEADERS_KHRONOS  := deps/OpenCL-H
  ## Native compiler paths
  ##
  
@@ -40,16 +40,28 @@ On Darwin, use gsed.
  
 -ifeq ($(UNAME),Darwin)
 -CC                      := clang
--# the sed -i option of OSX requires a parameter for the backup file (we just use "")
+-# the sed -i option of macOS requires a parameter for the backup file (we just use "")
 -SED_IN_PLACE            := -i ""
 -endif
- 
- ifeq ($(UNAME),FreeBSD)
+-
+-ifeq ($(UNAME),FreeBSD)
 -CC                      := cc
- SED                     := gsed
- endif
+-SED                     := gsed
+-endif
+-
+ ##
+ ## Cross compiler paths
+ ##
+@@ -127,7 +119,7 @@ COMPTIME                := $(shell date 
+ # the value will be something like this: "tag: vX.Y.Z, refs/pull/Y/head"
+ 
+ VERSION_EXPORT          := HEAD -> master, tag: v4.0.0
+-VERSION_TAG             := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)" | $(SED) 's/.*: v\([\.0-9]*\),.*/v\1/')
++VERSION_TAG             := @VERSION_TAG@
  
-@@ -162,7 +159,6 @@ endif
+ ##
+ ## General compiler and linker options
+@@ -176,7 +168,6 @@ endif
  LFLAGS                  := $(LDFLAGS)
  
  ifeq ($(DEBUG),0)
@@ -57,7 +69,7 @@ On Darwin, use gsed.
  LFLAGS                  += -s
  else
  ifeq ($(DEBUG),1)
-@@ -196,6 +192,13 @@ LFLAGS_NATIVE           += -lpthread
+@@ -211,6 +202,13 @@ LFLAGS_NATIVE           += -lpthread
  endif
  endif # FreeBSD
Home | Main Index | Thread Index | Old Index