diff options
| author | adam <adam@pkgsrc.org> | 2022-09-05 11:13:56 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2022-09-05 11:13:56 +0000 |
| commit | bc1a924c6ecfc418f50be4f4fa4cbd930d722e54 (patch) | |
| tree | c69d782129dcefe9dffbfb4d2e8dfef7c244b8e2 /security | |
| parent | 8b1d509a32ae360e1f812a8f723cbcc0df2175b0 (diff) | |
| download | pkgsrc-bc1a924c6ecfc418f50be4f4fa4cbd930d722e54.tar.gz | |
hashcat: updated to 6.2.6
changes v6.2.5 -> v6.2.6
Algorithms
- Added hash-mode: Amazon AWS4-HMAC-SHA256
- Added hash-mode: Bitcoin WIF private key (P2PKH)
- Added hash-mode: Bitcoin WIF private key (P2SH(P2WPKH))
- Added hash-mode: Bitcoin WIF private key (P2WPKH, Bech32)
- Added hash-mode: BLAKE2b-512($pass.$salt)
- Added hash-mode: BLAKE2b-512($salt.$pass)
- Added hash-mode: DPAPI masterkey file v1 (context 3)
- Added hash-mode: DPAPI masterkey file v2 (context 3)
- Added hash-mode: Exodus Desktop Wallet (scrypt)
- Added hash-mode: Flask session cookie
- Added hash-mode: KeePass 1 (AES/Twofish) and KeePass 2 (AES) - keyfile only mode
- Added hash-mode: Kerberos 5, etype 17, DB
- Added hash-mode: Kerberos 5, etype 18, DB
- Added hash-mode: PostgreSQL SCRAM-SHA-256
- Added hash-mode: Radmin3
- Added hash-mode: Teamspeak 3 (channel hash)
- Added hash-mode: Terra Station Wallet (AES256-CBC(PBKDF2($pass)))
- Added hash-mode: bcrypt(sha512($pass)) / bcryptsha512
- Added hash-mode: md5(sha1($pass).$salt)
- Added hash-mode: sha1($salt.sha1(utf16le($username).':'.utf16le($pass)))
- Added hash-mode: sha256($salt.sha256_bin($pass))
Features
- Added new backend support for Metal, the OpenCL replacement API on Apple
- Added support to building universal macOS binary on Apple Silicon
- Added support to use --debug-mode in attack-mode 9 (Association Attack)
- Added hex encoding format for --separator option
- Added password candidates range to --status-json output
- Added parameter to Bitwarden mode for second iteration count
- Added support to use 'John the Ripper' hash format with hash-type 13100
- Added support to use 'John the Ripper' hash format with hash-type 18200
- Added the hash extraction scripts from the tools folder also to beta/release versions
- Added user advice if a hash throws 'token length exception'
- Added tunings/ folder in order to replace hashcat.hctune. Configuration files with *.hctune suffix are automatically load on startup
Bugs
- Fixed accepted salt length by PKCS#8 Private Keys modules
- Fixed autodetect memory allocation for temporary hashes for LUKS v1 (legacy) in --identify mode
- Fixed backend active devices checks
- Fixed building error on Raspberry Pi
- Fixed display problem of incorrect negative values in case of large numbers
- Fixed display problem of the "Optimizers applied" list for algorithms using Register-Limit
- Fixed example password output of --hash-info: force uppercase if OPTS_TYPE_PT_UPPER is set
- Fixed false negative on hash-type 27800 if using vector width greater than 1 and -a 3
- Fixed false negative on hash-types 4510 and 4710 for hashes with long salts
- Fixed false negative on hash-types 8900, 15700, 22700, 27700 and 28200 if using the HIP backend
- Fixed false negative on Unit Test in case of out-of-memory with grep in single mode
- Fixed false negative on Unit Test with hash-type 25400
- Fixed functional error when nonce-error-corrections that were set on the command line in hash-mode 22000/22001 were not accepted
- Fixed handling of devices in benchmark mode for "kernel build error". Instead of canceling, skip the device and move on to the next
- Fixed handling of password candidates that are shorter than the minimum password length in Association Attack
- Fixed invalid handling of keyfiles in Keepass if transf_random_seed doesn't change
- Fixed memory leak in CPU rule engine
- Fixed method of how OPTS_TYPE_AUX* kernels are called in an association attack, for example in WPA/WPA2 kernel
- Fixed missing option flag OPTS_TYPE_SUGGEST_KG for hash-mode 11600 to inform the user about possible false positives in this mode
- Fixed optimized (-O) candidate generation with --stdout and -a 7
- Fixed password limit in optimized kernel for hash-mode 10700
- Fixed password reassembling function reporting an incorrect candidate in some cases when the correct candidate has zero length
- Fixed undefined function call to hc_byte_perm_S() in hash-mode 17010 on non-CUDA compute devices
- Fixed unit test early exit on luks test file download/extract failure
- Fixed unit test false negative if there are spaces in the filesystem path to hashcat
- Fixed unit test salt-max in case of optimized kernel, with hash-type 22 and 23
- Fixed usage of --rule-right (-k) in -a 7 with optimized (-O) kernels
- Fixed wordlist handling in -m 3000 when candidate passwords use the $HEX[...] syntax
Technical
- AMD Driver: Updated requirements for AMD Linux drivers to "AMDGPU" (21.50 or later) and "ROCm" (5.0 or later)
- AMD Driver: Updated requirements for AMD Windows drivers to "AMD Adrenalin Edition" (Adrenalin 22.5.1 exactly)
- Association Attack: Enable module specific pw_min and pw_max settings to avoid false positives in -a 9 attack-mode
- Autotune: Added error handling. By default skipping device on error, with --force using accel/loops/threads min values instead
- Backend: improved management of systems with multiple OpenCL platforms
- Backend Info: Added folder_config info to output
- Backend Info: Added generic system info to output (must be completed on Windows side)
- Backend Info: Added local memory size to output
- Backend: with kernel build options, switch from -I to -D INCLUDE_PATH, in order to support Apple Metal runtime
- Command Line: Disallow combinations of some options. for instance, using -t in -a 0 mode
- CUDA Backend: moved functions to ext_cuda.c/ext_nvrtc.c and includes to ext_cuda.h/ext_nvrtc.h
- Debug Rules: Set --debug-file to $session.debugfile if --debug-mode was set by the user and --debug-file was not set
- Hardware Monitor: Add support for GPU device utilization readings using iokit on Apple Silicon (OpenCL and Metal)
- Hash Info: show more information (Updated Hash-Format. Added Autodetect, Self-Test, Potfile and Plaintext encoding)
- HIP Backend: moved functions to ext_hip.c/ext_hiprtc.c and includes to ext_hip.h/ext_hiprtc.h
- HIP Backend: removed unused functions from hiprtc to workaroung missing function symbols on windows dll
- Kernels: Refactored standard kernel declaration to use a structure holding u32/u64 attributes to reduce the number of attributes
- Kernels: Refactored standard kernel includes, KERN_ATTR macros and RC4 cipher functions, in order to support Apple Metal runtime
- Kernels: Set the default Address Space Qualifier for any pointer, in order to support Apple Metal runtime
- Logfile: Write per-session "recovered new" value to logfile
- Makefile: updated MACOSX_DEPLOYMENT_TARGET to 10.15 and removed OpenCL framework from LFLAGS_NATIVE on MacOS
- Metal Runtime: added support for vectors up to 4
- Modules: Added suffix *legacy* to old TrueCrypt modules (6211-6243)
- Modules: Added suffix *legacy* to old VeraCrypt modules (13711-13783)
- Modules: Added support of a custom charset setting for benchmarks to the module interface
- Modules: New LUKS v1 modules (29511-29543) which do not use `module_hash_binary_parse` to get data from containers anymore (use new tool `tools/luks2hashcat.py`)
- Modules: New TrueCrypt modules (29311-29343) which do not use `module_hash_binary_parse` to get data from containers anymore (use new tool `tools/truecrypt2hashcat.py`)
- Modules: New VeraCrypt modules (29411-29483) which do not use `module_hash_binary_parse` to get data from containers anymore (use new tool `tools/veracrypt2hashcat.py`)
- Modules: Renamed old LUKS module into LUKS v1 and added suffix *legacy* (14600)
- OpenCL Backend: added workaround to make optimized kernels work on Apple Silicon
- OpenCL Backend: moved functions to ext_OpenCL.c and includes to ext_OpenCL.h
- OpenCL Backend: show device_type in device list info on Apple Silicon
- OpenCL Kernel: Set native_threads to 32 on Apple GPU's for various hash-modes
- OpenCL Runtime: Added support to use Apple Silicon compute devices
- OpenCL Runtime: Add some unstable warnings detected on macOS
- OpenCL Runtime: Set default device-type to GPU with Apple Silicon compute devices
- Restore: Restore timer is decreased from 60 seconds to 1 second, but only updates if there's actually a change compared to previous data written to restore file
- Rules: Add new rulesets from T0XlC: T0XlCv2, T0XlC_3_rule, T0XlC_insert_HTLM_entities_0_Z
- Rules: Add support to include source wordlist in debugging format
- Rules: Update hand-written rulesets to covers years up to 2029
- Status code: updated negative status code (added kernel create failure and resync)
- Status code: updated negative status code, usefull in Unit tests engine (test.sh)
- Terminal: Increased size of hash name column in `--help` and `--identify` options
- Terminal: Limit output length of example hash in --example-hash mode to 200. Use --mach to see full example hash
- Terminal: show empty OpenCL platforms only in backend information mode
- Tuning Database: Added a warning if a module implements module_extra_tuningdb_block but the installed computing device is not found
- Unit tests: added -r (--runtime) option
- Unit tests: handle negative status code, skip deprecated hash-types, skip hash-types with known perl modules issues, updated output
- Unit tests: Updated test.sh to set default device-type to CPU with Apple Intel and added -f (--force) option
- Usage Screen: On windows console, wait for any keypress if usage_mini_print() is used
- User Options: Add new module function module_hash_decode_postprocess() to override hash specific configurations from command line
- User Options: Change --backend-info/-I option type, from bool to uint
- Workflow: Added basic workflow for GitHub Actions
Diffstat (limited to 'security')
| -rw-r--r-- | security/hashcat/Makefile | 7 | ||||
| -rw-r--r-- | security/hashcat/PLIST | 179 | ||||
| -rw-r--r-- | security/hashcat/distinfo | 14 | ||||
| -rw-r--r-- | security/hashcat/patches/patch-include_sort__r.h | 29 | ||||
| -rw-r--r-- | security/hashcat/patches/patch-src_Makefile | 64 | ||||
| -rw-r--r-- | security/hashcat/patches/patch-src_affinity.c | 123 | ||||
| -rw-r--r-- | security/hashcat/patches/patch-src_folder.c | 47 | ||||
| -rw-r--r-- | security/hashcat/patches/patch-src_terminal.c | 15 |
8 files changed, 198 insertions, 280 deletions
diff --git a/security/hashcat/Makefile b/security/hashcat/Makefile index b4f2a6fd506..d4570d95840 100644 --- a/security/hashcat/Makefile +++ b/security/hashcat/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2022/01/10 02:30:23 khorben Exp $ +# $NetBSD: Makefile,v 1.2 2022/09/05 11:13:56 adam Exp $ -DISTNAME= hashcat-6.2.5 +DISTNAME= hashcat-6.2.6 CATEGORIES= security MASTER_SITES= https://hashcat.net/files/ @@ -16,9 +16,6 @@ MAKE_ENV+= SHARED=1 MAKE_ENV+= USE_SYSTEM_ZLIB=1 MAKE_ENV+= USE_SYSTEM_XXHASH=1 -post-install: - ${RM} ${DESTDIR}${PREFIX}/include/hashcat/sort_r.h.orig - .include "../../archivers/minizip/buildlink3.mk" .include "../../devel/xxhash/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/security/hashcat/PLIST b/security/hashcat/PLIST index 243198fcf21..2bb0dc03bd6 100644 --- a/security/hashcat/PLIST +++ b/security/hashcat/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2022/01/10 02:30:23 khorben Exp $ +@comment $NetBSD: PLIST,v 1.2 2022/09/05 11:13:56 adam Exp $ bin/hashcat include/hashcat/affinity.h include/hashcat/autotune.h @@ -17,14 +17,17 @@ include/hashcat/dictstat.h include/hashcat/dispatch.h include/hashcat/dynloader.h include/hashcat/emu_general.h +include/hashcat/emu_inc_bignum_operations.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_base58.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_radmin3_constants.h include/hashcat/emu_inc_rp.h include/hashcat/emu_inc_rp_optimized.h include/hashcat/event.h @@ -35,6 +38,7 @@ include/hashcat/ext_hip.h include/hashcat/ext_hiprtc.h include/hashcat/ext_iokit.h include/hashcat/ext_lzma.h +include/hashcat/ext_metal.h include/hashcat/ext_nvapi.h include/hashcat/ext_nvml.h include/hashcat/ext_nvrtc.h @@ -98,6 +102,7 @@ share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_C.hcchr share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_D.hcchr share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_E.hcchr share/doc/hashcat/charsets/DES_special/multiple_nodes/DES_portion_F.hcchr +share/doc/hashcat/charsets/base58.hcchr share/doc/hashcat/charsets/combined/Bulgarian.hcchr share/doc/hashcat/charsets/combined/Castilian.hcchr share/doc/hashcat/charsets/combined/Catalan.hcchr @@ -242,7 +247,9 @@ share/doc/hashcat/rules/T0XlC-insert_00-99_1950-2050_toprules_0_F.rule share/doc/hashcat/rules/T0XlC-insert_space_and_special_0_F.rule share/doc/hashcat/rules/T0XlC-insert_top_100_passwords_1_G.rule share/doc/hashcat/rules/T0XlC.rule -share/doc/hashcat/rules/T0XlCv1.rule +share/doc/hashcat/rules/T0XlC_3_rule.rule +share/doc/hashcat/rules/T0XlC_insert_HTML_entities_0_Z.rule +share/doc/hashcat/rules/T0XlCv2.rule share/doc/hashcat/rules/best64.rule share/doc/hashcat/rules/combinator.rule share/doc/hashcat/rules/d3ad0ne.rule @@ -327,9 +334,26 @@ share/doc/hashcat/rules/toggles3.rule share/doc/hashcat/rules/toggles4.rule share/doc/hashcat/rules/toggles5.rule share/doc/hashcat/rules/unix-ninja-leetspeak.rule +share/doc/hashcat/tools/aescrypt2hashcat.pl +share/doc/hashcat/tools/bitwarden2hashcat.py +share/doc/hashcat/tools/cryptoloop2hashcat.py +share/doc/hashcat/tools/exodus2hashcat.py +share/doc/hashcat/tools/luks2hashcat.py +share/doc/hashcat/tools/metamask2hashcat.py +share/doc/hashcat/tools/mozilla2hashcat.py +share/doc/hashcat/tools/radmin3_to_hashcat.pl +share/doc/hashcat/tools/securenotes2hashcat.pl +share/doc/hashcat/tools/sqlcipher2hashcat.pl +share/doc/hashcat/tools/truecrypt2hashcat.py +share/doc/hashcat/tools/veracrypt2hashcat.py +share/doc/hashcat/tools/virtualbox2hashcat.py +share/doc/hashcat/tools/vmwarevmx2hashcat.py share/hashcat/OpenCL/amp_a0.cl share/hashcat/OpenCL/amp_a1.cl share/hashcat/OpenCL/amp_a3.cl +share/hashcat/OpenCL/inc_amp.h +share/hashcat/OpenCL/inc_bignum_operations.cl +share/hashcat/OpenCL/inc_bignum_operations.h share/hashcat/OpenCL/inc_cipher_aes-gcm.cl share/hashcat/OpenCL/inc_cipher_aes-gcm.h share/hashcat/OpenCL/inc_cipher_aes.cl @@ -360,6 +384,8 @@ 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_base58.cl +share/hashcat/OpenCL/inc_hash_base58.h share/hashcat/OpenCL/inc_hash_blake2b.cl share/hashcat/OpenCL/inc_hash_blake2b.h share/hashcat/OpenCL/inc_hash_md4.cl @@ -396,14 +422,17 @@ 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_markov.h share/hashcat/OpenCL/inc_platform.cl share/hashcat/OpenCL/inc_platform.h +share/hashcat/OpenCL/inc_radmin3_constants.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_shared.h share/hashcat/OpenCL/inc_simd.cl share/hashcat/OpenCL/inc_simd.h share/hashcat/OpenCL/inc_truecrypt_crc32.cl @@ -534,6 +563,18 @@ share/hashcat/OpenCL/m00600_a1-optimized.cl share/hashcat/OpenCL/m00600_a1-pure.cl share/hashcat/OpenCL/m00600_a3-optimized.cl share/hashcat/OpenCL/m00600_a3-pure.cl +share/hashcat/OpenCL/m00610_a0-optimized.cl +share/hashcat/OpenCL/m00610_a0-pure.cl +share/hashcat/OpenCL/m00610_a1-optimized.cl +share/hashcat/OpenCL/m00610_a1-pure.cl +share/hashcat/OpenCL/m00610_a3-optimized.cl +share/hashcat/OpenCL/m00610_a3-pure.cl +share/hashcat/OpenCL/m00620_a0-optimized.cl +share/hashcat/OpenCL/m00620_a0-pure.cl +share/hashcat/OpenCL/m00620_a1-optimized.cl +share/hashcat/OpenCL/m00620_a1-pure.cl +share/hashcat/OpenCL/m00620_a3-optimized.cl +share/hashcat/OpenCL/m00620_a3-pure.cl share/hashcat/OpenCL/m00900_a0-optimized.cl share/hashcat/OpenCL/m00900_a0-pure.cl share/hashcat/OpenCL/m00900_a1-optimized.cl @@ -746,6 +787,12 @@ share/hashcat/OpenCL/m04400_a1-optimized.cl share/hashcat/OpenCL/m04400_a1-pure.cl share/hashcat/OpenCL/m04400_a3-optimized.cl share/hashcat/OpenCL/m04400_a3-pure.cl +share/hashcat/OpenCL/m04410_a0-optimized.cl +share/hashcat/OpenCL/m04410_a0-pure.cl +share/hashcat/OpenCL/m04410_a1-optimized.cl +share/hashcat/OpenCL/m04410_a1-pure.cl +share/hashcat/OpenCL/m04410_a3-optimized.cl +share/hashcat/OpenCL/m04410_a3-pure.cl share/hashcat/OpenCL/m04500_a0-optimized.cl share/hashcat/OpenCL/m04500_a0-pure.cl share/hashcat/OpenCL/m04500_a1-optimized.cl @@ -1205,6 +1252,7 @@ share/hashcat/OpenCL/m15000_a3-optimized.cl share/hashcat/OpenCL/m15000_a3-pure.cl share/hashcat/OpenCL/m15100-pure.cl share/hashcat/OpenCL/m15300-pure.cl +share/hashcat/OpenCL/m15310-pure.cl share/hashcat/OpenCL/m15400_a0-optimized.cl share/hashcat/OpenCL/m15400_a1-optimized.cl share/hashcat/OpenCL/m15400_a3-optimized.cl @@ -1217,6 +1265,7 @@ share/hashcat/OpenCL/m15500_a3-pure.cl share/hashcat/OpenCL/m15600-pure.cl share/hashcat/OpenCL/m15700-pure.cl share/hashcat/OpenCL/m15900-pure.cl +share/hashcat/OpenCL/m15910-pure.cl share/hashcat/OpenCL/m16000_a0-pure.cl share/hashcat/OpenCL/m16000_a1-pure.cl share/hashcat/OpenCL/m16000_a3-pure.cl @@ -1386,6 +1435,9 @@ 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/m21420_a0-pure.cl +share/hashcat/OpenCL/m21420_a1-pure.cl +share/hashcat/OpenCL/m21420_a3-pure.cl share/hashcat/OpenCL/m21500-pure.cl share/hashcat/OpenCL/m21600-pure.cl share/hashcat/OpenCL/m21700-pure.cl @@ -1546,11 +1598,47 @@ share/hashcat/OpenCL/m28000_a0-optimized.cl share/hashcat/OpenCL/m28000_a1-optimized.cl share/hashcat/OpenCL/m28000_a3-optimized.cl share/hashcat/OpenCL/m28100-pure.cl +share/hashcat/OpenCL/m28200-pure.cl +share/hashcat/OpenCL/m28300_a0-pure.cl +share/hashcat/OpenCL/m28300_a1-pure.cl +share/hashcat/OpenCL/m28300_a3-pure.cl +share/hashcat/OpenCL/m28400-pure.cl +share/hashcat/OpenCL/m28501_a0-pure.cl +share/hashcat/OpenCL/m28501_a1-pure.cl +share/hashcat/OpenCL/m28501_a3-pure.cl +share/hashcat/OpenCL/m28502_a0-pure.cl +share/hashcat/OpenCL/m28502_a1-pure.cl +share/hashcat/OpenCL/m28502_a3-pure.cl +share/hashcat/OpenCL/m28505_a0-pure.cl +share/hashcat/OpenCL/m28505_a1-pure.cl +share/hashcat/OpenCL/m28505_a3-pure.cl +share/hashcat/OpenCL/m28506_a0-pure.cl +share/hashcat/OpenCL/m28506_a1-pure.cl +share/hashcat/OpenCL/m28506_a3-pure.cl +share/hashcat/OpenCL/m28600-pure.cl +share/hashcat/OpenCL/m28700_a0-optimized.cl +share/hashcat/OpenCL/m28700_a0-pure.cl +share/hashcat/OpenCL/m28700_a1-optimized.cl +share/hashcat/OpenCL/m28700_a1-pure.cl +share/hashcat/OpenCL/m28700_a3-optimized.cl +share/hashcat/OpenCL/m28700_a3-pure.cl +share/hashcat/OpenCL/m28800-pure.cl +share/hashcat/OpenCL/m28900-pure.cl +share/hashcat/OpenCL/m29000_a0-pure.cl +share/hashcat/OpenCL/m29000_a1-pure.cl +share/hashcat/OpenCL/m29000_a3-pure.cl +share/hashcat/OpenCL/m29100_a0-pure.cl +share/hashcat/OpenCL/m29100_a1-pure.cl +share/hashcat/OpenCL/m29100_a3-pure.cl +share/hashcat/OpenCL/m29200_a0-pure.cl +share/hashcat/OpenCL/m29200_a1-pure.cl +share/hashcat/OpenCL/m29200_a3-pure.cl +share/hashcat/OpenCL/m29600-pure.cl +share/hashcat/OpenCL/m29700-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 @@ -1591,6 +1679,8 @@ 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_00610.so +share/hashcat/modules/module_00620.so share/hashcat/modules/module_00900.so share/hashcat/modules/module_01000.so share/hashcat/modules/module_01100.so @@ -1643,6 +1733,7 @@ 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_04410.so share/hashcat/modules/module_04500.so share/hashcat/modules/module_04510.so share/hashcat/modules/module_04520.so @@ -1807,11 +1898,13 @@ 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_15310.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_15910.so share/hashcat/modules/module_16000.so share/hashcat/modules/module_16100.so share/hashcat/modules/module_16200.so @@ -1874,6 +1967,7 @@ 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_21420.so share/hashcat/modules/module_21500.so share/hashcat/modules/module_21501.so share/hashcat/modules/module_21600.so @@ -1950,4 +2044,83 @@ share/hashcat/modules/module_27800.so share/hashcat/modules/module_27900.so share/hashcat/modules/module_28000.so share/hashcat/modules/module_28100.so +share/hashcat/modules/module_28200.so +share/hashcat/modules/module_28300.so +share/hashcat/modules/module_28400.so +share/hashcat/modules/module_28501.so +share/hashcat/modules/module_28502.so +share/hashcat/modules/module_28503.so +share/hashcat/modules/module_28504.so +share/hashcat/modules/module_28505.so +share/hashcat/modules/module_28506.so +share/hashcat/modules/module_28600.so +share/hashcat/modules/module_28700.so +share/hashcat/modules/module_28800.so +share/hashcat/modules/module_28900.so +share/hashcat/modules/module_29000.so +share/hashcat/modules/module_29100.so +share/hashcat/modules/module_29200.so +share/hashcat/modules/module_29311.so +share/hashcat/modules/module_29312.so +share/hashcat/modules/module_29313.so +share/hashcat/modules/module_29321.so +share/hashcat/modules/module_29322.so +share/hashcat/modules/module_29323.so +share/hashcat/modules/module_29331.so +share/hashcat/modules/module_29332.so +share/hashcat/modules/module_29333.so +share/hashcat/modules/module_29341.so +share/hashcat/modules/module_29342.so +share/hashcat/modules/module_29343.so +share/hashcat/modules/module_29411.so +share/hashcat/modules/module_29412.so +share/hashcat/modules/module_29413.so +share/hashcat/modules/module_29421.so +share/hashcat/modules/module_29422.so +share/hashcat/modules/module_29423.so +share/hashcat/modules/module_29431.so +share/hashcat/modules/module_29432.so +share/hashcat/modules/module_29433.so +share/hashcat/modules/module_29441.so +share/hashcat/modules/module_29442.so +share/hashcat/modules/module_29443.so +share/hashcat/modules/module_29451.so +share/hashcat/modules/module_29452.so +share/hashcat/modules/module_29453.so +share/hashcat/modules/module_29461.so +share/hashcat/modules/module_29462.so +share/hashcat/modules/module_29463.so +share/hashcat/modules/module_29471.so +share/hashcat/modules/module_29472.so +share/hashcat/modules/module_29473.so +share/hashcat/modules/module_29481.so +share/hashcat/modules/module_29482.so +share/hashcat/modules/module_29483.so +share/hashcat/modules/module_29511.so +share/hashcat/modules/module_29512.so +share/hashcat/modules/module_29513.so +share/hashcat/modules/module_29521.so +share/hashcat/modules/module_29522.so +share/hashcat/modules/module_29523.so +share/hashcat/modules/module_29531.so +share/hashcat/modules/module_29532.so +share/hashcat/modules/module_29533.so +share/hashcat/modules/module_29541.so +share/hashcat/modules/module_29542.so +share/hashcat/modules/module_29543.so +share/hashcat/modules/module_29600.so +share/hashcat/modules/module_29700.so +share/hashcat/modules/module_30000.so +share/hashcat/modules/module_30120.so share/hashcat/modules/module_99999.so +share/hashcat/tunings/Alias.hctune +share/hashcat/tunings/Device_GeForce_GTX_TITAN.hctune +share/hashcat/tunings/Module_08900.hctune +share/hashcat/tunings/Module_09300.hctune +share/hashcat/tunings/Module_15700.hctune +share/hashcat/tunings/Module_22700.hctune +share/hashcat/tunings/Module_27700.hctune +share/hashcat/tunings/Module_28200.hctune +share/hashcat/tunings/Modules_bcrypt.hctune +share/hashcat/tunings/Modules_default.hctune +share/hashcat/tunings/README.md diff --git a/security/hashcat/distinfo b/security/hashcat/distinfo index 9331cb0ef04..1d71ec7d747 100644 --- a/security/hashcat/distinfo +++ b/security/hashcat/distinfo @@ -1,10 +1,6 @@ -$NetBSD: distinfo,v 1.1 2022/01/10 02:30:23 khorben Exp $ +$NetBSD: distinfo,v 1.2 2022/09/05 11:13:56 adam Exp $ -BLAKE2s (hashcat-6.2.5.tar.gz) = 425d720ca0bb48e585988dc0557a829b3906d697ad14722c68e34fb5b4f7ebaa -SHA512 (hashcat-6.2.5.tar.gz) = 2b881146c625172c91cb74b33851473155dcde2421fba1b4acfba28116499b9cff832a62c4dbc24e16df06a827494f30699a7d0e5195d5ed107704f525255383 -Size (hashcat-6.2.5.tar.gz) = 6341872 bytes -SHA1 (patch-include_sort__r.h) = 75ea3e5ceb01383d603cd86e449f69299bc22fcd -SHA1 (patch-src_Makefile) = 427c7d162ff8373d6b180718fff4845bdb119d1c -SHA1 (patch-src_affinity.c) = e0cd6c909f7e29b7a6cb09b0a9399f6964147fa2 -SHA1 (patch-src_folder.c) = 58cde3211ccb057eda93de587404c82542224b54 -SHA1 (patch-src_terminal.c) = 40b52cdb1f9030b9ad7649bf0a9a4cf17b1f52fe +BLAKE2s (hashcat-6.2.6.tar.gz) = 133a66fb6851bd63c675f4780d318cf31c65b04255a86ac10ef1b98518e95026 +SHA512 (hashcat-6.2.6.tar.gz) = b5e4f40fb5ed0a47977243e1f95bf1deae0b04bd5ca26338395305c42573fe5b17557835f6f5d8b7402812e8eadda2b260d6b927ce99429fd1b87eb26f002f8a +Size (hashcat-6.2.6.tar.gz) = 14234640 bytes +SHA1 (patch-src_Makefile) = a9f4cee8cb4142872d364cdda67fd8147ba1c525 diff --git a/security/hashcat/patches/patch-include_sort__r.h b/security/hashcat/patches/patch-include_sort__r.h deleted file mode 100644 index ffb26f801b8..00000000000 --- a/security/hashcat/patches/patch-include_sort__r.h +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-include_sort__r.h,v 1.1 2022/01/10 02:30:23 khorben Exp $ - -Fix the build for NetBSD - ---- include/sort_r.h.orig 2021-11-21 15:39:01.000000000 +0000 -+++ include/sort_r.h -@@ -25,7 +25,7 @@ Slightly modified to work with hashcat t - */ - - #if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \ -- defined __FreeBSD__ || defined __DragonFly__) -+ defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__) - # define _SORT_R_BSD - # define _SORT_R_INLINE inline - #elif (defined __linux__) || defined (__CYGWIN__) -@@ -202,7 +202,12 @@ static _SORT_R_INLINE void sort_r_simple - struct sort_r_data tmp; - tmp.arg = arg; - tmp.compar = compar; -- qsort_r(base, nel, width, &tmp, sort_r_arg_swap); -+ -+ #if defined __NetBSD__ -+ sort_r_simple(base, nel, width, compar, arg); -+ #else -+ qsort_r(base, nel, width, &tmp, sort_r_arg_swap); -+ #endif - - #elif defined _SORT_R_WINDOWS - diff --git a/security/hashcat/patches/patch-src_Makefile b/security/hashcat/patches/patch-src_Makefile index 9fb080a2fbd..adde0338e89 100644 --- a/security/hashcat/patches/patch-src_Makefile +++ b/security/hashcat/patches/patch-src_Makefile @@ -1,22 +1,12 @@ -$NetBSD: patch-src_Makefile,v 1.1 2022/01/10 02:30:23 khorben Exp $ +$NetBSD: patch-src_Makefile,v 1.2 2022/09/05 11:13:56 adam Exp $ Set preferences. -Add NetBSD support. Don't override CC nor optimisation flags in CFLAGS. Remove sed magic; we'll use nbsed. ---- src/Makefile.orig 2021-11-21 15:39:01.000000000 +0000 +--- src/Makefile.orig 2022-09-02 14:58:13.000000000 +0000 +++ src/Makefile -@@ -31,7 +31,7 @@ UNAME := $(patsubst MS - UNAME := $(patsubst MINGW32_NT-%,MSYS2,$(UNAME)) - UNAME := $(patsubst MINGW64_NT-%,MSYS2,$(UNAME)) - --ifeq (,$(filter $(UNAME),Linux FreeBSD Darwin CYGWIN MSYS2)) -+ifeq (,$(filter $(UNAME),Linux FreeBSD NetBSD Darwin CYGWIN MSYS2)) - $(error "! Your Operating System ($(UNAME)) is not supported by this Makefile") - endif - -@@ -59,8 +59,6 @@ MODULE_INTERFACE_VERSION := 630 +@@ -59,8 +59,6 @@ MODULE_INTERFACE_VERSION := 700 ## Native compiler paths ## @@ -25,7 +15,7 @@ Remove sed magic; we'll use nbsed. AR := ar FIND := find INSTALL := install -@@ -69,20 +67,9 @@ SED := sed +@@ -69,14 +67,8 @@ SED := sed SED_IN_PLACE := -i ifeq ($(UNAME),Darwin) @@ -36,17 +26,12 @@ Remove sed magic; we'll use nbsed. -SED := /usr/bin/sed -SED_IN_PLACE := -i "" DARWIN_VERSION := $(shell uname -r | cut -d. -f1) +-IS_APPLE_SILICON := $(shell lipo /bin/zsh -verify_arch arm64e && echo 1 || echo 0) ++IS_APPLE_SILICON := 0 endif --ifeq ($(UNAME),FreeBSD) --CC := cc --CXX := c++ --SED := gsed --endif - - ## - ## Version -@@ -228,7 +215,6 @@ endif + ifneq (,$(filter $(UNAME),FreeBSD NetBSD)) +@@ -233,7 +225,6 @@ endif endif ifeq ($(DEBUG),0) @@ -54,34 +39,15 @@ Remove sed magic; we'll use nbsed. ifneq ($(UNAME),Darwin) LFLAGS += -s endif -@@ -312,6 +298,13 @@ LFLAGS_NATIVE += -liconv - endif - endif # FreeBSD - -+ifeq ($(UNAME),NetBSD) -+CFLAGS_NATIVE := $(CFLAGS) -+CFLAGS_NATIVE += -I$(OPENCL_HEADERS_KHRONOS)/ -+LFLAGS_NATIVE := $(LFLAGS) -+LFLAGS_NATIVE += -lpthread -+endif # NetBSD -+ - ifeq ($(UNAME),Darwin) - export MACOSX_DEPLOYMENT_TARGET=10.9 +@@ -328,6 +319,7 @@ endif # FreeBSD + ifeq ($(UNAME),NetBSD) CFLAGS_NATIVE := $(CFLAGS) -@@ -456,10 +449,10 @@ distclean: clean - # allow (whitelist) "make install" only on unix-based systems (also disallow cygwin/msys) - - ifneq ($(findstring install,$(MAKECMDGOALS)),) -- ifeq (,$(filter $(UNAME),Linux FreeBSD Darwin)) -+ ifeq (,$(filter $(UNAME),Linux FreeBSD Darwin NetBSD)) - define ERROR_INSTALL_DISALLOWED - ! The 'install' target is not allowed on this operating system ($(UNAME)). \ --Only Linux, FreeBSD and Darwin can use the 'install' target -+Only Linux, FreeBSD, NetBSD and Darwin can use the 'install' target - endef + LFLAGS_NATIVE := $(LFLAGS) ++LFLAGS_NATIVE += -lm + LFLAGS_NATIVE += -lpthread + endif # NetBSD - $(error $(ERROR_INSTALL_DISALLOWED)) -@@ -637,8 +630,13 @@ endif +@@ -684,8 +676,13 @@ endif $(MODULES_DISABLE): ; ifeq ($(SHARED),1) diff --git a/security/hashcat/patches/patch-src_affinity.c b/security/hashcat/patches/patch-src_affinity.c deleted file mode 100644 index dfeed4263a6..00000000000 --- a/security/hashcat/patches/patch-src_affinity.c +++ /dev/null @@ -1,123 +0,0 @@ -$NetBSD: patch-src_affinity.c,v 1.1 2022/01/10 02:30:23 khorben Exp $ - -Fix the build for NetBSD - ---- src/affinity.c.orig 2021-11-21 15:39:01.000000000 +0000 -+++ src/affinity.c -@@ -45,6 +45,12 @@ static int pthread_setaffinity_np (pthre - typedef cpuset_t cpu_set_t; - #endif - -+#if defined(__NetBSD__) -+#include <pthread.h> -+#include <sched.h> -+typedef cpuset_t cpu_set_t; -+#endif -+ - int set_cpu_affinity (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx) - { - #if defined (__CYGWIN__) -@@ -54,19 +60,31 @@ int set_cpu_affinity (MAYBE_UNUSED hashc - - if (user_options->cpu_affinity == NULL) return 0; - -+ char *devices = hcstrdup (user_options->cpu_affinity); -+ -+ if (devices == NULL) return -1; -+ - #if defined (_WIN) - DWORD_PTR aff_mask = 0; - const int cpu_id_max = 8 * sizeof (aff_mask); -+ #elif defined(__NetBSD__) -+ cpuset_t * cpuset; -+ const int cpu_id_max = 8 * cpuset_size (cpuset); -+ cpuset = cpuset_create(); -+ if (cpuset == NULL) -+ { -+ event_log_error (hashcat_ctx, "cpuset_create() failed with error: %d", errno); -+ -+ hcfree (devices); -+ -+ return -1; -+ } - #else - cpu_set_t cpuset; - const int cpu_id_max = 8 * sizeof (cpuset); - CPU_ZERO (&cpuset); - #endif - -- char *devices = hcstrdup (user_options->cpu_affinity); -- -- if (devices == NULL) return -1; -- - char *saveptr = NULL; - - char *next = strtok_r (devices, ",", &saveptr); -@@ -79,6 +97,17 @@ int set_cpu_affinity (MAYBE_UNUSED hashc - { - #if defined (_WIN) - aff_mask = 0; -+ #elif defined (__NetBSD__) -+ cpuset_destroy (cpuset); -+ cpuset = cpuset_create (); -+ if (cpuset == NULL) -+ { -+ event_log_error (hashcat_ctx, "cpuset_create() failed with error: %d", errno); -+ -+ hcfree (devices); -+ -+ return -1; -+ } - #else - CPU_ZERO (&cpuset); - #endif -@@ -90,6 +119,10 @@ int set_cpu_affinity (MAYBE_UNUSED hashc - { - event_log_error (hashcat_ctx, "Invalid cpu_id %d specified.", cpu_id); - -+ #if defined (__NetBSD__) -+ cpuset_destroy (cpuset); -+ #endif -+ - hcfree (devices); - - return -1; -@@ -97,12 +130,18 @@ int set_cpu_affinity (MAYBE_UNUSED hashc - - #if defined (_WIN) - aff_mask |= ((DWORD_PTR) 1) << (cpu_id - 1); -+ #elif defined (__NetBSD__) -+ cpuset_set (cpu_id - 1, cpuset); - #else - CPU_SET ((cpu_id - 1), &cpuset); - #endif - - } while ((next = strtok_r ((char *) NULL, ",", &saveptr)) != NULL); - -+ #if defined (__NetBSD__) -+ cpuset_destroy (cpuset); -+ #endif -+ - hcfree (devices); - - #if defined (_WIN) -@@ -114,6 +153,19 @@ int set_cpu_affinity (MAYBE_UNUSED hashc - return -1; - } - -+ #elif defined (__NetBSD__) -+ -+ pthread_t thread = pthread_self (); -+ -+ const int rc = pthread_setaffinity_np (thread, cpuset_size(cpuset), cpuset); -+ -+ if (rc != 0) -+ { -+ event_log_error (hashcat_ctx, "pthread_setaffinity_np() failed with error: %d", rc); -+ -+ return -1; -+ } -+ - #else - - pthread_t thread = pthread_self (); diff --git a/security/hashcat/patches/patch-src_folder.c b/security/hashcat/patches/patch-src_folder.c deleted file mode 100644 index f3f7e5c73f5..00000000000 --- a/security/hashcat/patches/patch-src_folder.c +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-src_folder.c,v 1.1 2022/01/10 02:30:23 khorben Exp $ - -Fix the build for NetBSD - ---- src/folder.c.orig 2021-11-21 15:39:01.000000000 +0000 -+++ src/folder.c -@@ -13,6 +13,9 @@ - - #if defined (__APPLE__) - #include "event.h" -+#elif defined (__FreeBSD__) || defined (__NetBSD__) -+#include <sys/param.h> -+#include <sys/sysctl.h> - #endif - - static int get_exec_path (char *exec_path, const size_t exec_path_sz) -@@ -45,8 +48,6 @@ static int get_exec_path (char *exec_pat - - #elif defined (__FreeBSD__) - -- #include <sys/sysctl.h> -- - int mib[4]; - - mib[0] = CTL_KERN; -@@ -60,6 +61,21 @@ static int get_exec_path (char *exec_pat - - const size_t len = strlen (exec_path); - -+ #elif defined (__NetBSD__) -+ -+ int mib[4]; -+ -+ mib[0] = CTL_KERN; -+ mib[1] = KERN_PROC_ARGS; -+ mib[2] = getpid(); -+ mib[3] = KERN_PROC_PATHNAME; -+ -+ size_t size = exec_path_sz; -+ -+ sysctl (mib, 4, exec_path, &size, NULL, 0); -+ -+ const size_t len = strlen (exec_path); -+ - #else - #error Your Operating System is not supported or detected - #endif diff --git a/security/hashcat/patches/patch-src_terminal.c b/security/hashcat/patches/patch-src_terminal.c deleted file mode 100644 index 874925910b1..00000000000 --- a/security/hashcat/patches/patch-src_terminal.c +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_terminal.c,v 1.1 2022/01/10 02:30:23 khorben Exp $ - -Fix the build for FreeBSD and NetBSD - ---- src/terminal.c.orig 2021-11-21 15:39:01.000000000 +0000 -+++ src/terminal.c -@@ -439,7 +439,7 @@ void SetConsoleWindowSize (const int x) - } - #endif - --#if defined (__linux__) || defined (__CYGWIN__) -+#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__linux__) || defined (__CYGWIN__) - static struct termios savemodes; - static int havemodes = 0; - |