From 72366804e69db71c77e129e424ee7019d91fb108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Ciarcin=CC=81ski?= Date: Fri, 26 Jun 2020 11:33:30 +0200 Subject: [PATCH] hashcat: updated to 6.0.0 hashcat v6.0.0 This release is about new hash-mode plugin interface, new backend API interface, expanding support for new algorithms and fixing bugs. --- hashcat/Makefile | 14 +- hashcat/PLIST | 618 +++++++++++++++++++++- hashcat/distinfo | 11 +- hashcat/patches/patch-include_ext__lzma.h | 17 + hashcat/patches/patch-src_Makefile | 71 ++- 5 files changed, 697 insertions(+), 34 deletions(-) create mode 100644 hashcat/patches/patch-include_ext__lzma.h diff --git a/hashcat/Makefile b/hashcat/Makefile index ab5f0614fc..dcb459bb00 100644 --- a/hashcat/Makefile +++ b/hashcat/Makefile @@ -1,21 +1,21 @@ # $NetBSD$ -DISTNAME= hashcat-5.1.0 +DISTNAME= hashcat-6.0.0 CATEGORIES= security MASTER_SITES= https://hashcat.net/files/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://hashcat.net/ +HOMEPAGE= https://hashcat.net/ COMMENT= World's fastest and most advanced password recovery utility 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,' +post-install: + ${RM} -f ${DESTDIR}${PREFIX}/include/hashcat/ext_lzma.h.orig +.include "../../archivers/minizip/buildlink3.mk" +.include "../../devel/xxhash/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/hashcat/PLIST b/hashcat/PLIST index 9eb1031a24..82fd5a610c 100644 --- a/hashcat/PLIST +++ b/hashcat/PLIST @@ -1,6 +1,81 @@ @comment $NetBSD$ bin/hashcat +include/hashcat/affinity.h +include/hashcat/autotune.h +include/hashcat/backend.h +include/hashcat/benchmark.h +include/hashcat/bitmap.h +include/hashcat/bitops.h +include/hashcat/brain.h +include/hashcat/combinator.h +include/hashcat/common.h +include/hashcat/convert.h +include/hashcat/cpt.h +include/hashcat/cpu_crc32.h +include/hashcat/debugfile.h +include/hashcat/dictstat.h +include/hashcat/dispatch.h +include/hashcat/dynloader.h +include/hashcat/emu_general.h +include/hashcat/emu_inc_cipher_aes.h +include/hashcat/emu_inc_cipher_des.h +include/hashcat/emu_inc_ecc_secp256k1.h +include/hashcat/emu_inc_hash_md4.h +include/hashcat/emu_inc_hash_md5.h +include/hashcat/emu_inc_hash_sha1.h +include/hashcat/emu_inc_hash_sha256.h +include/hashcat/emu_inc_hash_sha512.h +include/hashcat/emu_inc_rp.h +include/hashcat/emu_inc_rp_optimized.h +include/hashcat/event.h +include/hashcat/ext_ADL.h +include/hashcat/ext_OpenCL.h +include/hashcat/ext_cuda.h +include/hashcat/ext_lzma.h +include/hashcat/ext_nvapi.h +include/hashcat/ext_nvml.h +include/hashcat/ext_nvrtc.h +include/hashcat/ext_sysfs.h +include/hashcat/filehandling.h +include/hashcat/folder.h +include/hashcat/hashcat.h +include/hashcat/hashes.h +include/hashcat/hlfmt.h +include/hashcat/hwmon.h +include/hashcat/induct.h +include/hashcat/interface.h +include/hashcat/keyboard_layout.h +include/hashcat/locking.h +include/hashcat/logfile.h +include/hashcat/loopback.h +include/hashcat/memory.h +include/hashcat/modules.h +include/hashcat/monitor.h +include/hashcat/mpsp.h +include/hashcat/outfile.h +include/hashcat/outfile_check.h +include/hashcat/pidfile.h +include/hashcat/potfile.h +include/hashcat/restore.h +include/hashcat/rp.h +include/hashcat/rp_cpu.h +include/hashcat/selftest.h +include/hashcat/shared.h +include/hashcat/slow_candidates.h +include/hashcat/sort_r.h +include/hashcat/status.h +include/hashcat/stdout.h +include/hashcat/straight.h +include/hashcat/terminal.h +include/hashcat/thread.h +include/hashcat/timer.h +include/hashcat/tuningdb.h +include/hashcat/types.h +include/hashcat/usage.h +include/hashcat/user_options.h +include/hashcat/wordlist.h lib/libhashcat.so +lib/libhashcat.so.6.0.0 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 @@ -110,11 +185,15 @@ share/doc/hashcat/charsets/standard/Spanish/es_cp1252.hcchr share/doc/hashcat/docs/changes.txt share/doc/hashcat/docs/contact.txt share/doc/hashcat/docs/credits.txt +share/doc/hashcat/docs/hashcat-brain.md +share/doc/hashcat/docs/hashcat-plugin-development-guide.md +share/doc/hashcat/docs/keyboard-layout-mapping.md share/doc/hashcat/docs/license.txt share/doc/hashcat/docs/limits.txt share/doc/hashcat/docs/performance.txt share/doc/hashcat/docs/readme.txt share/doc/hashcat/docs/rules.txt +share/doc/hashcat/docs/slow-candidates-mode.md share/doc/hashcat/docs/status_codes.txt share/doc/hashcat/docs/team.txt share/doc/hashcat/docs/user_manuals.txt @@ -128,10 +207,16 @@ share/doc/hashcat/example500.sh share/doc/hashcat/extra/tab_completion/hashcat.sh share/doc/hashcat/extra/tab_completion/howto.txt share/doc/hashcat/extra/tab_completion/install +share/doc/hashcat/layouts/ch_de.hckmap +share/doc/hashcat/layouts/ch_fr.hckmap share/doc/hashcat/layouts/de.hckmap +share/doc/hashcat/layouts/it.hckmap +share/doc/hashcat/layouts/ru.hckmap +share/doc/hashcat/layouts/se.hckmap share/doc/hashcat/layouts/us.hckmap share/doc/hashcat/masks/8char-1l-1u-1d-1s-compliant.hcmask share/doc/hashcat/masks/8char-1l-1u-1d-1s-noncompliant.hcmask +share/doc/hashcat/masks/hashcat-default.hcmask share/doc/hashcat/masks/rockyou-1-60.hcmask share/doc/hashcat/masks/rockyou-2-1800.hcmask share/doc/hashcat/masks/rockyou-3-3600.hcmask @@ -235,46 +320,86 @@ share/hashcat/OpenCL/amp_a0.cl share/hashcat/OpenCL/amp_a1.cl share/hashcat/OpenCL/amp_a3.cl share/hashcat/OpenCL/inc_cipher_aes.cl +share/hashcat/OpenCL/inc_cipher_aes.h share/hashcat/OpenCL/inc_cipher_camellia.cl +share/hashcat/OpenCL/inc_cipher_camellia.h +share/hashcat/OpenCL/inc_cipher_des.cl +share/hashcat/OpenCL/inc_cipher_des.h share/hashcat/OpenCL/inc_cipher_kuznyechik.cl +share/hashcat/OpenCL/inc_cipher_kuznyechik.h share/hashcat/OpenCL/inc_cipher_serpent.cl +share/hashcat/OpenCL/inc_cipher_serpent.h share/hashcat/OpenCL/inc_cipher_twofish.cl +share/hashcat/OpenCL/inc_cipher_twofish.h share/hashcat/OpenCL/inc_common.cl +share/hashcat/OpenCL/inc_common.h share/hashcat/OpenCL/inc_comp_multi.cl +share/hashcat/OpenCL/inc_comp_multi.h share/hashcat/OpenCL/inc_comp_multi_bs.cl +share/hashcat/OpenCL/inc_comp_multi_bs.h share/hashcat/OpenCL/inc_comp_single.cl +share/hashcat/OpenCL/inc_comp_single.h 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_comp_single_bs.h +share/hashcat/OpenCL/inc_diskcryptor_xts.cl +share/hashcat/OpenCL/inc_diskcryptor_xts.h +share/hashcat/OpenCL/inc_ecc_secp256k1.cl +share/hashcat/OpenCL/inc_ecc_secp256k1.h share/hashcat/OpenCL/inc_hash_md4.cl +share/hashcat/OpenCL/inc_hash_md4.h share/hashcat/OpenCL/inc_hash_md5.cl +share/hashcat/OpenCL/inc_hash_md5.h share/hashcat/OpenCL/inc_hash_ripemd160.cl +share/hashcat/OpenCL/inc_hash_ripemd160.h share/hashcat/OpenCL/inc_hash_sha1.cl +share/hashcat/OpenCL/inc_hash_sha1.h share/hashcat/OpenCL/inc_hash_sha224.cl +share/hashcat/OpenCL/inc_hash_sha224.h share/hashcat/OpenCL/inc_hash_sha256.cl +share/hashcat/OpenCL/inc_hash_sha256.h share/hashcat/OpenCL/inc_hash_sha384.cl +share/hashcat/OpenCL/inc_hash_sha384.h share/hashcat/OpenCL/inc_hash_sha512.cl +share/hashcat/OpenCL/inc_hash_sha512.h share/hashcat/OpenCL/inc_hash_streebog256.cl +share/hashcat/OpenCL/inc_hash_streebog256.h share/hashcat/OpenCL/inc_hash_streebog512.cl +share/hashcat/OpenCL/inc_hash_streebog512.h share/hashcat/OpenCL/inc_hash_whirlpool.cl +share/hashcat/OpenCL/inc_hash_whirlpool.h share/hashcat/OpenCL/inc_luks_aes.cl +share/hashcat/OpenCL/inc_luks_aes.h share/hashcat/OpenCL/inc_luks_af.cl +share/hashcat/OpenCL/inc_luks_af.h share/hashcat/OpenCL/inc_luks_essiv.cl +share/hashcat/OpenCL/inc_luks_essiv.h share/hashcat/OpenCL/inc_luks_serpent.cl +share/hashcat/OpenCL/inc_luks_serpent.h share/hashcat/OpenCL/inc_luks_twofish.cl +share/hashcat/OpenCL/inc_luks_twofish.h share/hashcat/OpenCL/inc_luks_xts.cl +share/hashcat/OpenCL/inc_luks_xts.h +share/hashcat/OpenCL/inc_platform.cl +share/hashcat/OpenCL/inc_platform.h 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_scalar.h share/hashcat/OpenCL/inc_simd.cl +share/hashcat/OpenCL/inc_simd.h share/hashcat/OpenCL/inc_truecrypt_crc32.cl +share/hashcat/OpenCL/inc_truecrypt_crc32.h share/hashcat/OpenCL/inc_truecrypt_keyfile.cl +share/hashcat/OpenCL/inc_truecrypt_keyfile.h share/hashcat/OpenCL/inc_truecrypt_xts.cl -share/hashcat/OpenCL/inc_types.cl -share/hashcat/OpenCL/inc_vendor.cl +share/hashcat/OpenCL/inc_truecrypt_xts.h +share/hashcat/OpenCL/inc_types.h +share/hashcat/OpenCL/inc_vendor.h share/hashcat/OpenCL/inc_veracrypt_xts.cl +share/hashcat/OpenCL/inc_veracrypt_xts.h +share/hashcat/OpenCL/inc_zip_inflate.cl share/hashcat/OpenCL/m00000_a0-optimized.cl share/hashcat/OpenCL/m00000_a0-pure.cl share/hashcat/OpenCL/m00000_a1-optimized.cl @@ -490,8 +615,11 @@ share/hashcat/OpenCL/m01760_a3-optimized.cl share/hashcat/OpenCL/m01760_a3-pure.cl share/hashcat/OpenCL/m01800-optimized.cl share/hashcat/OpenCL/m01800-pure.cl +share/hashcat/OpenCL/m02000_a0-optimized.cl share/hashcat/OpenCL/m02000_a0-pure.cl +share/hashcat/OpenCL/m02000_a1-optimized.cl share/hashcat/OpenCL/m02000_a1-pure.cl +share/hashcat/OpenCL/m02000_a3-optimized.cl share/hashcat/OpenCL/m02000_a3-pure.cl share/hashcat/OpenCL/m02100-pure.cl share/hashcat/OpenCL/m02400_a0-optimized.cl @@ -584,6 +712,12 @@ share/hashcat/OpenCL/m04700_a1-optimized.cl share/hashcat/OpenCL/m04700_a1-pure.cl share/hashcat/OpenCL/m04700_a3-optimized.cl share/hashcat/OpenCL/m04700_a3-pure.cl +share/hashcat/OpenCL/m04710_a0-optimized.cl +share/hashcat/OpenCL/m04710_a0-pure.cl +share/hashcat/OpenCL/m04710_a1-optimized.cl +share/hashcat/OpenCL/m04710_a1-pure.cl +share/hashcat/OpenCL/m04710_a3-optimized.cl +share/hashcat/OpenCL/m04710_a3-pure.cl share/hashcat/OpenCL/m04800_a0-optimized.cl share/hashcat/OpenCL/m04800_a0-pure.cl share/hashcat/OpenCL/m04800_a1-optimized.cl @@ -804,6 +938,7 @@ share/hashcat/OpenCL/m11400_a3-pure.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-optimized.cl share/hashcat/OpenCL/m11600-pure.cl share/hashcat/OpenCL/m11700_a0-optimized.cl share/hashcat/OpenCL/m11700_a0-pure.cl @@ -834,6 +969,7 @@ share/hashcat/OpenCL/m12000-pure.cl share/hashcat/OpenCL/m12200-pure.cl share/hashcat/OpenCL/m12300-pure.cl share/hashcat/OpenCL/m12400-pure.cl +share/hashcat/OpenCL/m12500-optimized.cl share/hashcat/OpenCL/m12500-pure.cl share/hashcat/OpenCL/m12600_a0-optimized.cl share/hashcat/OpenCL/m12600_a0-pure.cl @@ -866,6 +1002,15 @@ share/hashcat/OpenCL/m13500_a1-pure.cl share/hashcat/OpenCL/m13500_a3-optimized.cl share/hashcat/OpenCL/m13500_a3-pure.cl share/hashcat/OpenCL/m13600-pure.cl +share/hashcat/OpenCL/m13711-pure.cl +share/hashcat/OpenCL/m13712-pure.cl +share/hashcat/OpenCL/m13713-pure.cl +share/hashcat/OpenCL/m13721-pure.cl +share/hashcat/OpenCL/m13722-pure.cl +share/hashcat/OpenCL/m13723-pure.cl +share/hashcat/OpenCL/m13731-pure.cl +share/hashcat/OpenCL/m13732-pure.cl +share/hashcat/OpenCL/m13733-pure.cl share/hashcat/OpenCL/m13751-pure.cl share/hashcat/OpenCL/m13752-pure.cl share/hashcat/OpenCL/m13753-pure.cl @@ -968,6 +1113,21 @@ share/hashcat/OpenCL/m16600_a3-pure.cl share/hashcat/OpenCL/m16800-pure.cl share/hashcat/OpenCL/m16801-pure.cl share/hashcat/OpenCL/m16900-pure.cl +share/hashcat/OpenCL/m17200_a0-pure.cl +share/hashcat/OpenCL/m17200_a1-pure.cl +share/hashcat/OpenCL/m17200_a3-pure.cl +share/hashcat/OpenCL/m17210_a0-pure.cl +share/hashcat/OpenCL/m17210_a1-pure.cl +share/hashcat/OpenCL/m17210_a3-pure.cl +share/hashcat/OpenCL/m17220_a0-pure.cl +share/hashcat/OpenCL/m17220_a1-pure.cl +share/hashcat/OpenCL/m17220_a3-pure.cl +share/hashcat/OpenCL/m17225_a0-pure.cl +share/hashcat/OpenCL/m17225_a1-pure.cl +share/hashcat/OpenCL/m17225_a3-pure.cl +share/hashcat/OpenCL/m17230_a0-pure.cl +share/hashcat/OpenCL/m17230_a1-pure.cl +share/hashcat/OpenCL/m17230_a3-pure.cl share/hashcat/OpenCL/m17300_a0-optimized.cl share/hashcat/OpenCL/m17300_a1-optimized.cl share/hashcat/OpenCL/m17300_a3-optimized.cl @@ -1002,7 +1162,457 @@ share/hashcat/OpenCL/m18200_a1-pure.cl share/hashcat/OpenCL/m18200_a3-optimized.cl share/hashcat/OpenCL/m18200_a3-pure.cl share/hashcat/OpenCL/m18300-pure.cl +share/hashcat/OpenCL/m18400-pure.cl +share/hashcat/OpenCL/m18500_a0-pure.cl +share/hashcat/OpenCL/m18500_a1-pure.cl +share/hashcat/OpenCL/m18500_a3-pure.cl +share/hashcat/OpenCL/m18600-pure.cl +share/hashcat/OpenCL/m18700_a0-optimized.cl +share/hashcat/OpenCL/m18700_a0-pure.cl +share/hashcat/OpenCL/m18700_a1-optimized.cl +share/hashcat/OpenCL/m18700_a1-pure.cl +share/hashcat/OpenCL/m18700_a3-optimized.cl +share/hashcat/OpenCL/m18700_a3-pure.cl +share/hashcat/OpenCL/m18800-pure.cl +share/hashcat/OpenCL/m18900-pure.cl +share/hashcat/OpenCL/m19000-pure.cl +share/hashcat/OpenCL/m19100-pure.cl +share/hashcat/OpenCL/m19200-pure.cl +share/hashcat/OpenCL/m19300_a0-pure.cl +share/hashcat/OpenCL/m19300_a1-pure.cl +share/hashcat/OpenCL/m19300_a3-pure.cl +share/hashcat/OpenCL/m19500_a0-pure.cl +share/hashcat/OpenCL/m19500_a1-pure.cl +share/hashcat/OpenCL/m19500_a3-pure.cl +share/hashcat/OpenCL/m19600-pure.cl +share/hashcat/OpenCL/m19700-pure.cl +share/hashcat/OpenCL/m19800-pure.cl +share/hashcat/OpenCL/m19900-pure.cl +share/hashcat/OpenCL/m20011-pure.cl +share/hashcat/OpenCL/m20012-pure.cl +share/hashcat/OpenCL/m20013-pure.cl +share/hashcat/OpenCL/m20500_a0-pure.cl +share/hashcat/OpenCL/m20500_a1-pure.cl +share/hashcat/OpenCL/m20500_a3-pure.cl +share/hashcat/OpenCL/m20510_a0-pure.cl +share/hashcat/OpenCL/m20510_a1-pure.cl +share/hashcat/OpenCL/m20510_a3-pure.cl +share/hashcat/OpenCL/m20600-pure.cl +share/hashcat/OpenCL/m20710_a0-optimized.cl +share/hashcat/OpenCL/m20710_a0-pure.cl +share/hashcat/OpenCL/m20710_a1-optimized.cl +share/hashcat/OpenCL/m20710_a1-pure.cl +share/hashcat/OpenCL/m20710_a3-optimized.cl +share/hashcat/OpenCL/m20710_a3-pure.cl +share/hashcat/OpenCL/m20800_a0-optimized.cl +share/hashcat/OpenCL/m20800_a0-pure.cl +share/hashcat/OpenCL/m20800_a1-optimized.cl +share/hashcat/OpenCL/m20800_a1-pure.cl +share/hashcat/OpenCL/m20800_a3-optimized.cl +share/hashcat/OpenCL/m20800_a3-pure.cl +share/hashcat/OpenCL/m20900_a0-optimized.cl +share/hashcat/OpenCL/m20900_a0-pure.cl +share/hashcat/OpenCL/m20900_a1-optimized.cl +share/hashcat/OpenCL/m20900_a1-pure.cl +share/hashcat/OpenCL/m20900_a3-optimized.cl +share/hashcat/OpenCL/m20900_a3-pure.cl +share/hashcat/OpenCL/m21000_a0-optimized.cl +share/hashcat/OpenCL/m21000_a0-pure.cl +share/hashcat/OpenCL/m21000_a1-optimized.cl +share/hashcat/OpenCL/m21000_a1-pure.cl +share/hashcat/OpenCL/m21000_a3-optimized.cl +share/hashcat/OpenCL/m21000_a3-pure.cl +share/hashcat/OpenCL/m21100_a0-optimized.cl +share/hashcat/OpenCL/m21100_a0-pure.cl +share/hashcat/OpenCL/m21100_a1-optimized.cl +share/hashcat/OpenCL/m21100_a1-pure.cl +share/hashcat/OpenCL/m21100_a3-optimized.cl +share/hashcat/OpenCL/m21100_a3-pure.cl +share/hashcat/OpenCL/m21200_a0-optimized.cl +share/hashcat/OpenCL/m21200_a0-pure.cl +share/hashcat/OpenCL/m21200_a1-optimized.cl +share/hashcat/OpenCL/m21200_a1-pure.cl +share/hashcat/OpenCL/m21200_a3-optimized.cl +share/hashcat/OpenCL/m21200_a3-pure.cl +share/hashcat/OpenCL/m21300_a0-pure.cl +share/hashcat/OpenCL/m21300_a1-pure.cl +share/hashcat/OpenCL/m21300_a3-pure.cl +share/hashcat/OpenCL/m21400_a0-optimized.cl +share/hashcat/OpenCL/m21400_a0-pure.cl +share/hashcat/OpenCL/m21400_a1-optimized.cl +share/hashcat/OpenCL/m21400_a1-pure.cl +share/hashcat/OpenCL/m21400_a3-optimized.cl +share/hashcat/OpenCL/m21400_a3-pure.cl +share/hashcat/OpenCL/m21500-pure.cl +share/hashcat/OpenCL/m21600-pure.cl +share/hashcat/OpenCL/m21700-pure.cl +share/hashcat/OpenCL/m21800-pure.cl +share/hashcat/OpenCL/m22000-pure.cl +share/hashcat/OpenCL/m22001-pure.cl +share/hashcat/OpenCL/m22100-pure.cl +share/hashcat/OpenCL/m22200_a0-optimized.cl +share/hashcat/OpenCL/m22200_a0-pure.cl +share/hashcat/OpenCL/m22200_a1-optimized.cl +share/hashcat/OpenCL/m22200_a1-pure.cl +share/hashcat/OpenCL/m22200_a3-optimized.cl +share/hashcat/OpenCL/m22200_a3-pure.cl +share/hashcat/OpenCL/m22300_a0-optimized.cl +share/hashcat/OpenCL/m22300_a0-pure.cl +share/hashcat/OpenCL/m22300_a1-optimized.cl +share/hashcat/OpenCL/m22300_a1-pure.cl +share/hashcat/OpenCL/m22300_a3-optimized.cl +share/hashcat/OpenCL/m22300_a3-pure.cl +share/hashcat/OpenCL/m22400-pure.cl +share/hashcat/OpenCL/m22500_a0-optimized.cl +share/hashcat/OpenCL/m22500_a0-pure.cl +share/hashcat/OpenCL/m22500_a1-optimized.cl +share/hashcat/OpenCL/m22500_a1-pure.cl +share/hashcat/OpenCL/m22500_a3-optimized.cl +share/hashcat/OpenCL/m22500_a3-pure.cl +share/hashcat/OpenCL/m22600-pure.cl +share/hashcat/OpenCL/m22700-pure.cl +share/hashcat/OpenCL/m23001_a0-optimized.cl +share/hashcat/OpenCL/m23001_a0-pure.cl +share/hashcat/OpenCL/m23001_a1-optimized.cl +share/hashcat/OpenCL/m23001_a1-pure.cl +share/hashcat/OpenCL/m23001_a3-optimized.cl +share/hashcat/OpenCL/m23001_a3-pure.cl +share/hashcat/OpenCL/m23002_a0-optimized.cl +share/hashcat/OpenCL/m23002_a0-pure.cl +share/hashcat/OpenCL/m23002_a1-optimized.cl +share/hashcat/OpenCL/m23002_a1-pure.cl +share/hashcat/OpenCL/m23002_a3-optimized.cl +share/hashcat/OpenCL/m23002_a3-pure.cl +share/hashcat/OpenCL/m23003_a0-optimized.cl +share/hashcat/OpenCL/m23003_a0-pure.cl +share/hashcat/OpenCL/m23003_a1-optimized.cl +share/hashcat/OpenCL/m23003_a1-pure.cl +share/hashcat/OpenCL/m23003_a3-optimized.cl +share/hashcat/OpenCL/m23003_a3-pure.cl share/hashcat/OpenCL/markov_be.cl share/hashcat/OpenCL/markov_le.cl +share/hashcat/OpenCL/shared.cl share/hashcat/hashcat.hcstat2 share/hashcat/hashcat.hctune +share/hashcat/modules/.lock +share/hashcat/modules/module_00000.so +share/hashcat/modules/module_00010.so +share/hashcat/modules/module_00011.so +share/hashcat/modules/module_00012.so +share/hashcat/modules/module_00020.so +share/hashcat/modules/module_00021.so +share/hashcat/modules/module_00022.so +share/hashcat/modules/module_00023.so +share/hashcat/modules/module_00030.so +share/hashcat/modules/module_00040.so +share/hashcat/modules/module_00050.so +share/hashcat/modules/module_00060.so +share/hashcat/modules/module_00100.so +share/hashcat/modules/module_00101.so +share/hashcat/modules/module_00110.so +share/hashcat/modules/module_00111.so +share/hashcat/modules/module_00112.so +share/hashcat/modules/module_00120.so +share/hashcat/modules/module_00121.so +share/hashcat/modules/module_00122.so +share/hashcat/modules/module_00124.so +share/hashcat/modules/module_00125.so +share/hashcat/modules/module_00130.so +share/hashcat/modules/module_00131.so +share/hashcat/modules/module_00132.so +share/hashcat/modules/module_00133.so +share/hashcat/modules/module_00140.so +share/hashcat/modules/module_00141.so +share/hashcat/modules/module_00150.so +share/hashcat/modules/module_00160.so +share/hashcat/modules/module_00200.so +share/hashcat/modules/module_00300.so +share/hashcat/modules/module_00400.so +share/hashcat/modules/module_00500.so +share/hashcat/modules/module_00501.so +share/hashcat/modules/module_00600.so +share/hashcat/modules/module_00900.so +share/hashcat/modules/module_01000.so +share/hashcat/modules/module_01100.so +share/hashcat/modules/module_01300.so +share/hashcat/modules/module_01400.so +share/hashcat/modules/module_01410.so +share/hashcat/modules/module_01411.so +share/hashcat/modules/module_01420.so +share/hashcat/modules/module_01421.so +share/hashcat/modules/module_01430.so +share/hashcat/modules/module_01440.so +share/hashcat/modules/module_01441.so +share/hashcat/modules/module_01450.so +share/hashcat/modules/module_01460.so +share/hashcat/modules/module_01500.so +share/hashcat/modules/module_01600.so +share/hashcat/modules/module_01700.so +share/hashcat/modules/module_01710.so +share/hashcat/modules/module_01711.so +share/hashcat/modules/module_01720.so +share/hashcat/modules/module_01722.so +share/hashcat/modules/module_01730.so +share/hashcat/modules/module_01731.so +share/hashcat/modules/module_01740.so +share/hashcat/modules/module_01750.so +share/hashcat/modules/module_01760.so +share/hashcat/modules/module_01800.so +share/hashcat/modules/module_02000.so +share/hashcat/modules/module_02100.so +share/hashcat/modules/module_02400.so +share/hashcat/modules/module_02410.so +share/hashcat/modules/module_02500.so +share/hashcat/modules/module_02501.so +share/hashcat/modules/module_02600.so +share/hashcat/modules/module_02611.so +share/hashcat/modules/module_02612.so +share/hashcat/modules/module_02711.so +share/hashcat/modules/module_02811.so +share/hashcat/modules/module_03000.so +share/hashcat/modules/module_03100.so +share/hashcat/modules/module_03200.so +share/hashcat/modules/module_03710.so +share/hashcat/modules/module_03711.so +share/hashcat/modules/module_03800.so +share/hashcat/modules/module_03910.so +share/hashcat/modules/module_04010.so +share/hashcat/modules/module_04110.so +share/hashcat/modules/module_04300.so +share/hashcat/modules/module_04400.so +share/hashcat/modules/module_04500.so +share/hashcat/modules/module_04520.so +share/hashcat/modules/module_04521.so +share/hashcat/modules/module_04522.so +share/hashcat/modules/module_04700.so +share/hashcat/modules/module_04710.so +share/hashcat/modules/module_04711.so +share/hashcat/modules/module_04800.so +share/hashcat/modules/module_04900.so +share/hashcat/modules/module_05100.so +share/hashcat/modules/module_05200.so +share/hashcat/modules/module_05300.so +share/hashcat/modules/module_05400.so +share/hashcat/modules/module_05500.so +share/hashcat/modules/module_05600.so +share/hashcat/modules/module_05700.so +share/hashcat/modules/module_05800.so +share/hashcat/modules/module_06000.so +share/hashcat/modules/module_06100.so +share/hashcat/modules/module_06211.so +share/hashcat/modules/module_06212.so +share/hashcat/modules/module_06213.so +share/hashcat/modules/module_06221.so +share/hashcat/modules/module_06222.so +share/hashcat/modules/module_06223.so +share/hashcat/modules/module_06231.so +share/hashcat/modules/module_06232.so +share/hashcat/modules/module_06233.so +share/hashcat/modules/module_06241.so +share/hashcat/modules/module_06242.so +share/hashcat/modules/module_06243.so +share/hashcat/modules/module_06300.so +share/hashcat/modules/module_06400.so +share/hashcat/modules/module_06500.so +share/hashcat/modules/module_06600.so +share/hashcat/modules/module_06700.so +share/hashcat/modules/module_06800.so +share/hashcat/modules/module_06900.so +share/hashcat/modules/module_07000.so +share/hashcat/modules/module_07100.so +share/hashcat/modules/module_07200.so +share/hashcat/modules/module_07300.so +share/hashcat/modules/module_07400.so +share/hashcat/modules/module_07401.so +share/hashcat/modules/module_07500.so +share/hashcat/modules/module_07700.so +share/hashcat/modules/module_07701.so +share/hashcat/modules/module_07800.so +share/hashcat/modules/module_07801.so +share/hashcat/modules/module_07900.so +share/hashcat/modules/module_08000.so +share/hashcat/modules/module_08100.so +share/hashcat/modules/module_08200.so +share/hashcat/modules/module_08300.so +share/hashcat/modules/module_08400.so +share/hashcat/modules/module_08500.so +share/hashcat/modules/module_08600.so +share/hashcat/modules/module_08700.so +share/hashcat/modules/module_08800.so +share/hashcat/modules/module_08900.so +share/hashcat/modules/module_09000.so +share/hashcat/modules/module_09100.so +share/hashcat/modules/module_09200.so +share/hashcat/modules/module_09300.so +share/hashcat/modules/module_09400.so +share/hashcat/modules/module_09500.so +share/hashcat/modules/module_09600.so +share/hashcat/modules/module_09700.so +share/hashcat/modules/module_09710.so +share/hashcat/modules/module_09720.so +share/hashcat/modules/module_09800.so +share/hashcat/modules/module_09810.so +share/hashcat/modules/module_09820.so +share/hashcat/modules/module_09900.so +share/hashcat/modules/module_10000.so +share/hashcat/modules/module_10100.so +share/hashcat/modules/module_10200.so +share/hashcat/modules/module_10300.so +share/hashcat/modules/module_10400.so +share/hashcat/modules/module_10410.so +share/hashcat/modules/module_10420.so +share/hashcat/modules/module_10500.so +share/hashcat/modules/module_10600.so +share/hashcat/modules/module_10700.so +share/hashcat/modules/module_10800.so +share/hashcat/modules/module_10900.so +share/hashcat/modules/module_10901.so +share/hashcat/modules/module_11000.so +share/hashcat/modules/module_11100.so +share/hashcat/modules/module_11200.so +share/hashcat/modules/module_11300.so +share/hashcat/modules/module_11400.so +share/hashcat/modules/module_11500.so +share/hashcat/modules/module_11600.so +share/hashcat/modules/module_11700.so +share/hashcat/modules/module_11750.so +share/hashcat/modules/module_11760.so +share/hashcat/modules/module_11800.so +share/hashcat/modules/module_11850.so +share/hashcat/modules/module_11860.so +share/hashcat/modules/module_11900.so +share/hashcat/modules/module_12000.so +share/hashcat/modules/module_12001.so +share/hashcat/modules/module_12100.so +share/hashcat/modules/module_12200.so +share/hashcat/modules/module_12300.so +share/hashcat/modules/module_12400.so +share/hashcat/modules/module_12500.so +share/hashcat/modules/module_12600.so +share/hashcat/modules/module_12700.so +share/hashcat/modules/module_12800.so +share/hashcat/modules/module_12900.so +share/hashcat/modules/module_13000.so +share/hashcat/modules/module_13100.so +share/hashcat/modules/module_13200.so +share/hashcat/modules/module_13300.so +share/hashcat/modules/module_13400.so +share/hashcat/modules/module_13500.so +share/hashcat/modules/module_13600.so +share/hashcat/modules/module_13711.so +share/hashcat/modules/module_13712.so +share/hashcat/modules/module_13713.so +share/hashcat/modules/module_13721.so +share/hashcat/modules/module_13722.so +share/hashcat/modules/module_13723.so +share/hashcat/modules/module_13731.so +share/hashcat/modules/module_13732.so +share/hashcat/modules/module_13733.so +share/hashcat/modules/module_13741.so +share/hashcat/modules/module_13742.so +share/hashcat/modules/module_13743.so +share/hashcat/modules/module_13751.so +share/hashcat/modules/module_13752.so +share/hashcat/modules/module_13753.so +share/hashcat/modules/module_13761.so +share/hashcat/modules/module_13762.so +share/hashcat/modules/module_13763.so +share/hashcat/modules/module_13771.so +share/hashcat/modules/module_13772.so +share/hashcat/modules/module_13773.so +share/hashcat/modules/module_13800.so +share/hashcat/modules/module_13900.so +share/hashcat/modules/module_14000.so +share/hashcat/modules/module_14100.so +share/hashcat/modules/module_14400.so +share/hashcat/modules/module_14600.so +share/hashcat/modules/module_14700.so +share/hashcat/modules/module_14800.so +share/hashcat/modules/module_14900.so +share/hashcat/modules/module_15000.so +share/hashcat/modules/module_15100.so +share/hashcat/modules/module_15200.so +share/hashcat/modules/module_15300.so +share/hashcat/modules/module_15400.so +share/hashcat/modules/module_15500.so +share/hashcat/modules/module_15600.so +share/hashcat/modules/module_15700.so +share/hashcat/modules/module_15900.so +share/hashcat/modules/module_16000.so +share/hashcat/modules/module_16100.so +share/hashcat/modules/module_16200.so +share/hashcat/modules/module_16300.so +share/hashcat/modules/module_16400.so +share/hashcat/modules/module_16500.so +share/hashcat/modules/module_16600.so +share/hashcat/modules/module_16700.so +share/hashcat/modules/module_16800.so +share/hashcat/modules/module_16801.so +share/hashcat/modules/module_16900.so +share/hashcat/modules/module_17200.so +share/hashcat/modules/module_17210.so +share/hashcat/modules/module_17220.so +share/hashcat/modules/module_17225.so +share/hashcat/modules/module_17230.so +share/hashcat/modules/module_17300.so +share/hashcat/modules/module_17400.so +share/hashcat/modules/module_17500.so +share/hashcat/modules/module_17600.so +share/hashcat/modules/module_17700.so +share/hashcat/modules/module_17800.so +share/hashcat/modules/module_17900.so +share/hashcat/modules/module_18000.so +share/hashcat/modules/module_18100.so +share/hashcat/modules/module_18200.so +share/hashcat/modules/module_18300.so +share/hashcat/modules/module_18400.so +share/hashcat/modules/module_18500.so +share/hashcat/modules/module_18600.so +share/hashcat/modules/module_18700.so +share/hashcat/modules/module_18800.so +share/hashcat/modules/module_18900.so +share/hashcat/modules/module_19000.so +share/hashcat/modules/module_19100.so +share/hashcat/modules/module_19200.so +share/hashcat/modules/module_19300.so +share/hashcat/modules/module_19500.so +share/hashcat/modules/module_19600.so +share/hashcat/modules/module_19700.so +share/hashcat/modules/module_19800.so +share/hashcat/modules/module_19900.so +share/hashcat/modules/module_20011.so +share/hashcat/modules/module_20012.so +share/hashcat/modules/module_20013.so +share/hashcat/modules/module_20200.so +share/hashcat/modules/module_20300.so +share/hashcat/modules/module_20400.so +share/hashcat/modules/module_20500.so +share/hashcat/modules/module_20510.so +share/hashcat/modules/module_20600.so +share/hashcat/modules/module_20710.so +share/hashcat/modules/module_20711.so +share/hashcat/modules/module_20800.so +share/hashcat/modules/module_20900.so +share/hashcat/modules/module_21000.so +share/hashcat/modules/module_21100.so +share/hashcat/modules/module_21200.so +share/hashcat/modules/module_21300.so +share/hashcat/modules/module_21400.so +share/hashcat/modules/module_21500.so +share/hashcat/modules/module_21600.so +share/hashcat/modules/module_21700.so +share/hashcat/modules/module_21800.so +share/hashcat/modules/module_22000.so +share/hashcat/modules/module_22001.so +share/hashcat/modules/module_22100.so +share/hashcat/modules/module_22200.so +share/hashcat/modules/module_22300.so +share/hashcat/modules/module_22301.so +share/hashcat/modules/module_22400.so +share/hashcat/modules/module_22500.so +share/hashcat/modules/module_22600.so +share/hashcat/modules/module_22700.so +share/hashcat/modules/module_23001.so +share/hashcat/modules/module_23002.so +share/hashcat/modules/module_23003.so +share/hashcat/modules/module_99999.so diff --git a/hashcat/distinfo b/hashcat/distinfo index cc62e2853a..d9573de877 100644 --- a/hashcat/distinfo +++ b/hashcat/distinfo @@ -1,7 +1,8 @@ $NetBSD$ -SHA1 (hashcat-5.1.0.tar.gz) = 4b85429bef3ec6e33db93ee5339f54ecd44c6662 -RMD160 (hashcat-5.1.0.tar.gz) = af192e07415d8b24cfa305e5a3e9b9dcca6ab8b1 -SHA512 (hashcat-5.1.0.tar.gz) = 90605c2bcd0ec275d2f6ec581899b95cdc320b1494613a19803192c8a08037a7829b3776ed42c58eb6551ec1a746f47f94ab5b273958ca74e0fc57315e209ece -Size (hashcat-5.1.0.tar.gz) = 4266878 bytes -SHA1 (patch-src_Makefile) = 9a64f0232e1e90eb735c03958548aa3ce29088d6 +SHA1 (hashcat-6.0.0.tar.gz) = 62f0fb50166ffd70efbc5850521ac67821126f4b +RMD160 (hashcat-6.0.0.tar.gz) = d71c6a710cf0513666edc79635e2c8aeba338f5d +SHA512 (hashcat-6.0.0.tar.gz) = b508c77e1735c02bb59c427774a3f4fafdea37d09777ef2dcb6e5081cb993d02c4f46a6ab846dc97a8cef2b0f69bbc191e26b8f1608a299bc2c1a6b3d2474f96 +Size (hashcat-6.0.0.tar.gz) = 5360568 bytes +SHA1 (patch-include_ext__lzma.h) = 8dcf9cae764b306e833702c276b13a80fd71c3f4 +SHA1 (patch-src_Makefile) = cef5b5bd6ef668e690a5c17f8a92710ee1f428ed diff --git a/hashcat/patches/patch-include_ext__lzma.h b/hashcat/patches/patch-include_ext__lzma.h new file mode 100644 index 0000000000..4f56cc2b37 --- /dev/null +++ b/hashcat/patches/patch-include_ext__lzma.h @@ -0,0 +1,17 @@ +$NetBSD$ + +Match archivers/minizip. + +--- include/ext_lzma.h.orig 2020-06-16 15:30:11.000000000 +0000 ++++ include/ext_lzma.h +@@ -8,8 +8,8 @@ + #include + #include + +-#include "contrib/minizip/ioapi.h" +-#include "contrib/minizip/unzip.h" ++#include ++#include + + int hc_lzma1_decompress (const unsigned char *in, SizeT *in_len, unsigned char *out, SizeT *out_len, const char *props); + int hc_lzma2_decompress (const unsigned char *in, SizeT *in_len, unsigned char *out, SizeT *out_len, const char *props); diff --git a/hashcat/patches/patch-src_Makefile b/hashcat/patches/patch-src_Makefile index da709c15dd..ba83db5f30 100644 --- a/hashcat/patches/patch-src_Makefile +++ b/hashcat/patches/patch-src_Makefile @@ -1,12 +1,33 @@ $NetBSD$ +Set preferences. Add minimal NetBSD support. Don't override CC nor optimisation flags in CFLAGS. Remove sed magic; we'll use nbsed. ---- src/Makefile.orig 2018-10-28 16:29:39.000000000 +0000 +--- src/Makefile.orig 2020-06-16 15:30:11.000000000 +0000 +++ src/Makefile -@@ -23,7 +23,7 @@ UNAME := $(patsubst MS +@@ -3,16 +3,16 @@ + ## License.....: MIT + ## + +-SHARED := 0 ++SHARED := 1 + DEBUG := 0 + PRODUCTION := 1 + PRODUCTION_VERSION := v6.0.0 + ENABLE_CUBIN := 1 + ENABLE_BRAIN := 1 + USE_SYSTEM_LZMA := 0 +-USE_SYSTEM_ZLIB := 0 ++USE_SYSTEM_ZLIB := 1 + USE_SYSTEM_OPENCL := 0 +-USE_SYSTEM_XXHASH := 0 ++USE_SYSTEM_XXHASH := 1 + + ## + ## Detect Operating System +@@ -28,7 +28,7 @@ UNAME := $(patsubst MS UNAME := $(patsubst MINGW32_NT-%,MSYS2,$(UNAME)) UNAME := $(patsubst MINGW64_NT-%,MSYS2,$(UNAME)) @@ -15,20 +36,21 @@ Remove sed magic; we'll use nbsed. $(error "! Your Operating System ($(UNAME)) is not supported by this Makefile") endif -@@ -45,7 +45,6 @@ endif +@@ -56,7 +56,6 @@ MODULE_INTERFACE_VERSION := 520 ## Native compiler paths ## -CC := gcc + AR := ar FIND := find INSTALL := install - RM := rm -@@ -53,17 +52,9 @@ SED := sed +@@ -65,18 +64,11 @@ SED := sed SED_IN_PLACE := -i ifeq ($(UNAME),Darwin) -CC := clang --# the sed -i option of macOS 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 "") + AR := /usr/bin/ar -SED := /usr/bin/sed -SED_IN_PLACE := -i "" PROD_VERS := $(shell sw_vers -productVersion | cut -d. -f2) @@ -41,17 +63,7 @@ Remove sed magic; we'll use nbsed. ## ## Version -@@ -98,6 +89,9 @@ LIBRARY_DEV_FOLDER ?= $(LIBRARY_DEV - - HASHCAT_FRONTEND := hashcat - HASHCAT_LIBRARY := libhashcat.so.$(VERSION_PURE) -+ifeq ($(UNAME),Darwin) -+HASHCAT_LIBRARY := libhashcat.$(VERSION_PURE).dylib -+endif - - ifeq ($(UNAME),Darwin) - HASHCAT_LIBRARY := libhashcat.$(VERSION_PURE).dylib -@@ -161,7 +155,6 @@ CFLAGS += -Wextra +@@ -186,7 +178,6 @@ CFLAGS_ZLIB += -DIOAPI_NO_64 endif ifeq ($(DEBUG),0) @@ -59,7 +71,16 @@ Remove sed magic; we'll use nbsed. ifneq ($(UNAME),Darwin) LFLAGS += -s endif -@@ -217,6 +210,13 @@ LFLAGS_NATIVE += -lm +@@ -220,7 +211,7 @@ endif + # ZLIB + CFLAGS += -I$(DEPS_ZLIB_PATH) + ifeq ($(USE_SYSTEM_ZLIB),1) +-LFLAGS += -lz ++LFLAGS += -lz -lminizip + endif + + # OpenCL +@@ -264,6 +255,13 @@ LFLAGS_NATIVE += -liconv endif endif # FreeBSD @@ -73,3 +94,17 @@ Remove sed magic; we'll use nbsed. ifeq ($(UNAME),Darwin) export MACOSX_DEPLOYMENT_TARGET=10.9 CFLAGS_NATIVE := $(CFLAGS) +@@ -534,8 +532,13 @@ MODULES_SRC := $(wildcard src/modules/ + MODULES_LIB := $(patsubst src/modules/module_%.c, modules/module_%.$(MODULE_SUFFIX), $(MODULES_SRC)) + + ifeq ($(SHARED),1) ++ ifeq ($(UNAME),Darwin) ++modules/module_%.$(MODULE_SUFFIX): src/modules/module_%.c $(HASHCAT_LIBRARY) ++ $(CC) $(CFLAGS_NATIVE) $^ -o $@ $(LFLAGS_NATIVE) -install_name $(SHARED_FOLDER)/$@ -shared -fPIC -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION) ++ else + modules/module_%.$(MODULE_SUFFIX): src/modules/module_%.c $(HASHCAT_LIBRARY) + $(CC) $(CFLAGS_NATIVE) $^ -o $@ $(LFLAGS_NATIVE) -shared -fPIC -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION) ++ endif + else + modules/module_%.$(MODULE_SUFFIX): src/modules/module_%.c obj/combined.NATIVE.a + $(CC) $(CFLAGS_NATIVE) $^ -o $@ $(LFLAGS_NATIVE) -shared -fPIC -D MODULE_INTERFACE_VERSION_CURRENT=$(MODULE_INTERFACE_VERSION)