1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-02-01 10:31:09 +00:00
Commit Graph

691 Commits

Author SHA1 Message Date
Jens Steube
4aaec30ada
Merge pull request #2404 from philsmd/master
use our safe free () wrapper hcfree whenever possible
2020-06-02 12:34:19 +02:00
philsmd
416bdd8e47
SecureZIP: use hex_encode () / hex_decode () 2020-06-02 11:21:25 +02:00
philsmd
5df743cb85
fixes #2410: added -m 2300x = SecureZIP 2020-05-31 10:36:41 +02:00
Jens Steube
6c0dc7493e Fix modules where salt->salt_buf[] is used but salt->salt_len was not set 2020-05-29 11:19:49 +02:00
Jens Steube
84d3981e7b Add returncode PARSER_HAVE_ERRNO as a valid returncode from module_hash_binary_count() and module_hash_binary_parse() module hooks. You can use this in case fopen() fails and you want to transport back the original error from the OS 2020-05-27 15:23:02 +02:00
Matt Palmer
cff3fbda9b Provide benchmark esalt structure 2020-05-27 20:30:00 +10:00
philsmd
f382d24dcf
fixes #2365: NSEC3 dot replace and empty salt/domain fix 2020-05-25 11:30:45 +02:00
philsmd
edfe21b902
fixes #2390: RAR3-hp cracking w/ pass > 28 (pure kernel) + tests added 2020-05-25 11:08:33 +02:00
Matt Palmer
2d83149a54 Module to decrypt PEM-encoded encrypted private keys (#74)
Supports a variety of common PKCS#1 ciphers, with fast kernels in all
available colours, shapes, and sizes.
2020-05-19 23:58:09 +10:00
Jens Steube
1dc3469f6e
Merge pull request #2372 from mpalmer/binary-parse-report-error
Allow module_hash_binary_parse to report a fatal error
2020-05-18 15:14:49 +02:00
philsmd
943c57ae5f
luks: remove self-test example hash 2020-05-14 19:27:39 +02:00
philsmd
d1c3274965
use our safe free () wrapper hcfree whenever possible 2020-05-14 19:21:59 +02:00
philsmd
b7e5216cf1
fixes #2383: added -m 22700 = MultiBit HD (scrypt) 2020-05-08 10:57:32 +02:00
Jens Steube
33579ae3db Add new option for modules OPTS_TYPE_SELF_TEST_DISABLE to disable self-test functionality from hash-mode directly 2020-05-08 10:18:17 +02:00
Jens Steube
d22a9a0978 Merge branch 'master' of https://github.com/hashcat/hashcat 2020-04-30 12:58:46 +02:00
Matt Palmer
b4204d265d Allow module_hash_binary_parse to report a fatal error
If module_hash_binary_parse is completely unable to successfully parse out
any hashes, up until now the output has been

```
Hashfile 'foo': Success
```

which is less than helpful.

This patch allows (but does not require) m_h_binary_parse to report a useful
error response, by returning a negative value.  Modules which continue to
return '0 hashes' will get the same less-than-useful behaviour they always
hace.

I've also modified the LUKS module to report a useful error, as a proof of
concept.

Further expansions on this could include:

* Applying similar behaviour to module_hash_binary_count, so it too can
  report errors when trying to count hashes.  This would require more
  co-ordinated change, because m_h_binary_count already uses -1 to indicate
  a system error.

* Allow and encourage modules to print their own errors and warnings during
  parsing.  This would allow for situations where a single hash in a
  multi-hash file could be reported as malformed, without having to fail the
  whole parse.  However, implementing this would, I expect, require modules
  to have access to `hashcat_ctx`, which...  yeah.  Not so straightforward.
2020-04-23 12:05:41 +10:00
philsmd
688d904aa0
Added -m 22600 = Telegram Desktop App Passcode (PBKDF2-HMAC-SHA1) 2020-04-08 14:31:47 +02:00
Jens Steube
1797f3ffa4 Merge branch 'master' of https://github.com/hashcat/hashcat 2020-04-02 15:16:26 +02:00
Jens Steube
2c94c003ce
Merge pull request #2353 from s3inlc/patch-separator
Patch all inconsistent separators in modules
2020-04-02 14:39:42 +02:00
Jens Steube
a45548d176
Merge pull request #2351 from s3inlc/patch-1
Fix constant separator when printing IPMI hashes
2020-04-02 14:39:24 +02:00
Jens Steube
26570cdb17 Disable some modules on AMDGPU-Pro driver 2020-04-01 15:10:52 +02:00
s3inlc
b9d251b76e fixing all inconsistent hash separators 2020-03-31 20:40:09 +02:00
Sein Coray
949b61a6bb
Fix constant separator when printing IPMI hashes 2020-03-31 17:37:46 +02:00
Jens Steube
e3e31adec3 Merge branch 'master' of https://github.com/hashcat/hashcat 2020-03-31 14:41:35 +02:00
Jens Steube
10e986990b
Merge pull request #2349 from philsmd/hexSaltFix
fixes #2339: problem with --hex-salt fixed
2020-03-30 18:02:32 +02:00
philsmd
15eb70152f
fixes #2339: problem with --hex-salt fixed 2020-03-30 14:06:11 +02:00
philsmd
4f3165c6ea
make -m 21200 more generic (except all supported salt len) 2020-03-30 13:53:37 +02:00
Jens Steube
ddb641b843 Add option to force disable real SHM access to be used from within the module 2020-03-20 16:20:22 +01:00
Jens Steube
82a024d9cb Merge branch 'master' of https://github.com/hashcat/hashcat 2020-03-20 16:09:41 +01:00
Jens Steube
9421b99a6f
Merge pull request #2332 from philsmd/master
fixes #2067: 40-bit oldoffice false positive problem
2020-03-20 08:30:38 +01:00
Jens Steube
a6cf7caf4a Extend hashes in -m 7100 to be of length 128 or 256 2020-03-17 14:44:11 +01:00
Jens Steube
81cb508808 Merge branch 'master' of https://github.com/hashcat/hashcat 2020-03-17 12:02:34 +01:00
philsmd
2bc126ac96
fixes #2067: 40-bit oldoffice false positive problem 2020-03-16 16:30:35 +01:00
Jens Steube
119344c084 Mark -m 13100 as unstable on Apple + Iris 2020-03-13 09:51:27 +01:00
Jens Steube
0b0cbab24b Merge branch 'master' of https://github.com/hashcat/hashcat 2020-03-08 15:16:53 +01:00
Jens Steube
5b58cba12e Use _unroll in -m 5500 for CPU 2020-03-06 14:34:41 +01:00
Jens Steube
2fdb7ded8b Update self-test hash for -m 1500 2020-03-06 14:09:38 +01:00
Jens Steube
fe12d2bcc6
Merge pull request #2322 from philsmd/master
solve $telegram$1 format conflict with JTR
2020-03-06 12:14:29 +01:00
philsmd
7f55f69d7f
solve telegram format conflict with jtr 2020-03-06 11:49:22 +01:00
Jens Steube
8a2a821c03 Allow unroll code in -m 18200 on NV GPU 2020-03-04 13:32:42 +01:00
Jens Steube
ef47811c9d Rename 23911 to 10901 and populate salt->salt_buf[] 2020-03-03 09:55:13 +01:00
Jens Steube
a18ba9fde6
Merge pull request #2320 from thesubtlety/389-ds
Add new module for 389-ds
2020-03-03 09:47:36 +01:00
thesubtlety
4fafca4747 Add new module for 389-ds 2020-03-02 19:12:47 -08:00
Jens Steube
c258aa4111 Reenable SIMD mode for -m 13600 2020-03-02 15:00:52 +01:00
Jens Steube
b627536c45 Fixed missing OPTS_TYPE_COPY_TMPS in -m 1374x and -m 1376x 2020-03-02 10:20:22 +01:00
Jens Steube
4c2ef5993a Set -m 7000 to OPTS_TYPE_PT_GENERATE_BE mode to slightly improve performance 2020-02-23 15:21:34 +01:00
Jens Steube
669619c1a7 Fixed out-of-boundary write to decrypted[] in DPAPI masterkey file v1 kernel 2020-02-22 08:42:36 +01:00
Jens Steube
f96e35649d Change bitsliced kernels from 3d to 2d invocation mode for slightly better performance 2020-02-22 07:59:58 +01:00
Jens Steube
3ce3ecedd9 Reenable VeraCrypt on ROCM 2020-02-20 16:09:41 +01:00
Jens Steube
d9473358ef Add support for OPTS_TYPE_LOOP_EXTENDED kernel for special cases like VeraCrypt 2020-02-20 16:00:21 +01:00
Jens Steube
9957422191 Add tokenizer option TOKEN_ATTR_SEPARATOR_FARTHEST as an option to deal with hash formats where separator character could be part of the salt data itself and at the same time does not allow escape character logic to be applied. This can only work if it is guaranteed by the design of the hash format that the separator character does not occur after the position of the separator character. 2020-02-19 10:35:44 +01:00
Jens Steube
cd3ca53203 Update ROCM to use _unroll for mode -m 621x 2020-02-16 11:19:56 +01:00
Jens Steube
f946e321a9 Update unroll and unstable configuration for NVIDIA CUDA/OpenCL runtime after unroll whitelisting change 2020-02-15 16:17:05 +01:00
Jens Steube
193aa77cdf Update unroll and unstable configuration for ROCM OpenCL runtime after unroll whitelisting change 2020-02-15 16:09:37 +01:00
Jens Steube
87b151836d Update unroll and unstable configuration for AMD-GPU-PRO OpenCL runtime after unroll whitelisting change 2020-02-15 15:34:47 +01:00
Jens Steube
cc3cb66f12 Update unroll and unstable configuration for Intel OpenCL runtime after unroll whitelisting change 2020-02-15 14:39:26 +01:00
Jens Steube
9980389f34 Update unroll and unstable configuration for Apple OpenCL runtime after unroll whitelisting change 2020-02-15 13:58:42 +01:00
Jens Steube
c90d83c3eb Prepare for UNROLL whitelisting 2020-02-15 12:44:12 +01:00
Jens Steube
ec841fcd1c Add NO_UNROLL to -m 15900 2020-02-14 12:21:00 +01:00
Jens Steube
20fa2167af Add NO_UNROLL to -m 13800 2020-02-14 11:29:19 +01:00
Jens Steube
42e7fa1303 Fix buffer overflow in module_hash_encode() in hash-mode 13600 2020-02-13 13:59:32 +01:00
philsmd
b6f40c05d6 Added -m 7401 = MySQL $A$ (sha256crypt), closes #2305 2020-02-11 11:36:16 +01:00
Jens Steube
a06f5f6644 Add support for length 20 in module for -m 7400 2020-02-10 13:01:32 +01:00
Jens Steube
4ed18af14c Make VeraCrypt PIM configuration mechanism easier to read 2020-02-08 12:24:47 +01:00
philsmd
0c0912d4da
-m 22500: remove unnecessary comment 2020-02-06 21:29:50 +01:00
philsmd
b51273fb0b
Fixes #1538: Added -m 22500 = MultiBit Classic .key (MD5) 2020-02-06 20:25:14 +01:00
Jens Steube
4788c61dd2 Add OPTI_TYPE_REGISTER_LIMIT flag to enable register limiting in CUDA 2020-02-04 21:53:27 +01:00
Jens Steube
633327d8b7 Rewrite Whirlpool hash with 64 bit instructions 2020-02-03 15:24:38 +01:00
Jens Steube
1290b01b3e Fix KERN_TYPE in --stdout mode 2020-02-02 14:36:47 +01:00
Jens Steube
c40f474c2e Add special module option to indicate the kernel is using dynamic shared memory 2020-02-02 11:24:38 +01:00
Jens Steube
fb7bb04587 Do not use dynamic shared memory if dynamic_local_mem_size is a multiple of local_mem_size 2020-02-02 11:15:37 +01:00
Jens Steube
aef53f7e10 OpenCL Runtime: Allow the kernel to access post-48k shared memory region on CUDA. Requires both module and kernel preparation 2020-02-01 14:27:42 +01:00
Jens Steube
cc4fd48ace Optimize hook buffer size to be copied 2020-01-26 20:31:38 +01:00
Jens Steube
46bba107fa Reduce max accel in -m 11600 since thread count was unlocked 2020-01-26 20:00:51 +01:00
Jens Steube
7d9461f8b9 Add -m 11600 optimized kernel 2020-01-26 18:38:47 +01:00
Jens Steube
424a6ee8e9 Fix endianess of MIC in -m 22000 and -m 22001 outfile format 2020-01-26 10:45:41 +01:00
Jens Steube
247d1a91a5 Merge branch 'master' of https://github.com/hashcat/hashcat 2020-01-25 11:26:56 +01:00
Jens Steube
42b3ef7b90 Mark -m 137xx as unstable on rocm 2020-01-25 11:26:34 +01:00
Jens Steube
c8f9bd7d64
Merge pull request #2292 from philsmd/master
Fixes #2255: new --outfile-format with support for timestamps
2020-01-24 19:54:24 +01:00
philsmd
ebd904a179
outfile: improved version of OUTFILE_FORMAT assignment 2020-01-24 18:43:13 +01:00
Jens Steube
ccacc508cb Reenabled support for Intel GPU OpenCL runtime (Beignet and NEO) because a workaround was found (force -cl-std=CL2.0) 2020-01-24 10:52:12 +01:00
Jens Steube
42358dc2f0 Remove OPTS_TYPE_PT_NEVERCRACK leftover when merging PR from an older source base 2020-01-22 09:28:48 +01:00
Jens Steube
7797488a12 Add PMKID/MIC to cracked output line in -m 22000 and -m 22001 2020-01-19 18:12:16 +01:00
Jens Steube
616683df5c Use an easier example hash for -m 22001 2020-01-19 10:50:47 +01:00
Jens Steube
abd4b99fd9 Use an easier example hash for -m 22000 2020-01-18 15:29:06 +01:00
Jens Steube
c58a889aa6 Small performance boost in -m 22400 2020-01-16 15:00:19 +01:00
philsmd
4887cc47b8
Fixes #2267: added support for -m 22400 = AES Crypt (SHA256) 2020-01-16 12:15:17 +01:00
Jens Steube
e72bd958ba Fix some formating 2020-01-15 20:27:08 +01:00
Jens Steube
ae03120981 Update HASH_NAME in -m 22301 2020-01-15 10:33:36 +01:00
philsmd
706727ad64
Fixed #1534: added -m 22301 = Telegram (SHA256) 2020-01-15 09:18:41 +01:00
philsmd
3353a6fb5d
Added -m 22300 = sha256($salt.$pass.$salt) 2020-01-15 09:16:05 +01:00
Jens Steube
53105abeb4 Added hash-mode: Citrix NetScaler (SHA512) 2020-01-14 17:15:34 +01:00
Jens Steube
9824e6e91b Update unstable warnings for Intel GPU on macOSX 10.15 2020-01-14 13:29:02 +01:00
Jens Steube
40a9473070 Updated pure kernel unstable markers to amdgpu-pro-18.50-708488-ubuntu-18.04 2020-01-13 21:20:06 +01:00
Jens Steube
a24d5ef9fa Merge branch 'master' of https://github.com/hashcat/hashcat 2020-01-13 16:26:37 +01:00
Jens Steube
cc85d1bd97 Update salt limit in -m 1460 from 64 to 256 2020-01-13 16:26:22 +01:00
Jens Steube
8a905d19aa Updated optimized kernel unstable markers to amdgpu-pro-18.50-708488-ubuntu-18.04 2020-01-13 16:06:04 +01:00
Jens Steube
8039290cd0 Update -m 10700 unstable warning and disable JiT compiler optimization for AMD GPU PRO, too 2020-01-06 13:36:17 +01:00
Jens Steube
4bef41ed1b Update -m 10700 unstable warning and disable JiT compiler optimization in pure kernel mode 2020-01-06 13:24:47 +01:00
philsmd
b2c28289c8
PDF module: -m 10700 missing assignment of tmp_size 2020-01-04 14:08:30 +01:00
Jens Steube
8e0f976ccf Merge branch 'master' of https://github.com/hashcat/hashcat 2020-01-02 19:40:35 +01:00
Jens Steube
20ef9725ef Use * in potfile entries for -m 250x and -m 1680x 2020-01-02 19:40:18 +01:00
Jens Steube
09c0cfcc04 Set -u for -m 22100 to 4k with the idea to force -n value to go down to 1 2020-01-02 12:51:25 +01:00
Jens Steube
931e29d333 Another Bitlocker boost, reduce shared mem consumption to give some of them to the compiler for more efficient calculating of memory pointer addresses 2020-01-02 12:34:19 +01:00
Jens Steube
daaf5d365c Use * in potfile entries for -m 22000 and -m 22001 2020-01-02 10:41:22 +01:00
Jens Steube
311d363054 Store precomputed KE for -m 22100 in shared memory and lock the loops per kernel invocation to a fixed value 2020-01-01 20:48:55 +01:00
Jens Steube
49b6520ca8 Make thread selection for -m 22100 mode flexible 2020-01-01 10:49:39 +01:00
Jens Steube
e31e7690ed Add BitCracker optimization to precompute KE of second sha256_transform since input data is static 2020-01-01 10:49:04 +01:00
Jens Steube
7215d4e9c0 Limit Bitlocker threads to 256 2019-12-31 23:01:47 +01:00
Jens Steube
0f9ad6f974 Limit Bitlocker threads to 256 2019-12-31 22:54:50 +01:00
Jens Steube
50907c5fff Update Bitlocker minimum password length 4 2019-12-31 22:03:53 +01:00
Jens Steube
bc442ad821 Add Bitlocker minimum password length 8 restriction 2019-12-31 21:29:09 +01:00
philsmd
1c1ed72c65
fixes #1117: added -m 22100 = BitLocker 2019-12-31 18:42:13 +01:00
Jens Steube
6ed3003a30 Fix for -m 3000 loading hashes in pwdump format 2019-12-23 15:59:14 +01:00
Jens Steube
81903e95ee Fix EAPOL temporary buffer overflow in -m 22000 and -m 22001 2019-12-22 10:35:40 +01:00
Jens Steube
c9b4e796b0 Fix missing EOL in -m 22000 and -m 22001 2019-12-22 10:11:25 +01:00
Jens Steube
2cc4244e14 Initial -m 22001 support 2019-12-19 22:14:42 +01:00
Jens Steube
161775b1b6 Switch separator character in -m 22000 from ':' to '*' 2019-12-19 19:17:01 +01:00
Jens Steube
f2aedd3741 Add support to load hashes for hash-mode 2500 and 16800 format from hash-mode 22000 2019-12-16 19:35:00 +01:00
Jens Steube
784eeb257b Make use of message_pair and set default for nonce_error_corrections in -m 22000 2019-12-16 12:47:48 +01:00
Jens Steube
2a04354401 New mode 22000 WPA-PBKDF2-PMKID+EAPOL to replace -m 2500 and -m 16800. NOTE: missing support for message_pair and nonce_error_corrections handling 2019-12-15 21:09:04 +01:00
Jens Steube
40a5835927 In -m 12700 and -m 15200 decrypt 48 byte of data instead of just 16 byte 2019-12-13 13:19:58 +01:00
Jens Steube
8932c71ac2 Mark -m 17200, 17220, 17225 and 21800 as unstable on ROCM 2019-12-07 12:09:58 +01:00
philsmd
d07f002337 electrum 4/5: improve speed (rm hook) 2019-12-05 10:43:42 +01:00
Jens Steube
52e83c2292 Fix missing OPTS_TYPE_KEYBOARD_MAPPING in -m 624x 2019-12-03 11:26:33 +01:00
Jens Steube
9a2c4e3417 Fix invalid use of TOKEN_ATTR_VERIFY_DIGIT in -m 15500 2019-11-28 12:21:36 +01:00
Jens Steube
d18ff6fa3d Fix -m 21600 DGST_SIZE 2019-11-27 09:07:47 +01:00
Jens Steube
86d3f9e9c7 Fix -m 21600 default hash length 2019-11-27 09:03:17 +01:00
Jens Steube
a63aa679d3 Few changes to -m 21600 and move -m 124 and -m 10000 to pure Framework category 2019-11-26 17:16:18 +01:00
Jamie R
ce17418b27 add web2py pbkdf2-hmac-sha512 variant 2019-11-24 14:49:13 +00:00
Jens Steube
d315f61414 Fix -m 1800 speed on ROCM 2019-11-24 08:50:31 +01:00
Jens Steube
d518bd3903 Unlock all threads for -m 600 2019-11-23 13:26:40 +01:00
Jens Steube
13dcae6879 Fix -m 15400 selftest-pair, benchmark-mask and unit-test 2019-11-21 09:39:07 +01:00
Jens Steube
b618a72bd7 Update accel and thread modifiers for -m 21700 and -m 21800 2019-11-16 21:09:56 +01:00
Jens Steube
d0ad516422 Add some accel and thread limits to -m 21700 and -m 21800 for a smoother benchmark and checkpoint experience 2019-11-16 12:41:59 +01:00
philsmd
db91fe6981 Added -m 21700 = Electrum 4 and -m 21800 = Electrum 5 2019-11-16 10:48:52 +01:00
Jens Steube
08a74596c1 Add cry_salt_buf[] and cry_salt_len for easier readability in -m 11300 2019-11-15 13:06:45 +01:00
Jens Steube
bb2ea7ec57
Merge pull request #2222 from solardiz/nexus-wallet
Add Nexus legacy wallet support to -m 11300
2019-11-15 12:43:50 +01:00
Jens Steube
664e595b45 Add unstable warning for -m 10700 for Intel CPU 2019-11-14 12:46:09 +01:00
Solar Designer
9d9351da22 Add Nexus legacy wallet support to -m 11300 2019-11-12 19:32:03 +01:00
philsmd
17b7eb1dce fixes #2200: new WinZip tokenizer hex data length problem 2019-11-09 10:44:28 +01:00
philsmd
461deb1e17
fixes #2214: -m 15200 = Blockchain allow large data similar to -m 12700 with hash copy 2019-11-08 11:39:03 +01:00
Jens Steube
b02fe8e076 Mark Intel OpenCL CPU runtime as broken for hash-mode 15300 2019-11-05 20:44:19 +01:00
Jens Steube
30f0745252
Merge pull request #2190 from neheb/narrow
Avoid narrowing errors
2019-11-05 12:30:08 +01:00
Jens Steube
82f4766f13
Merge pull request #2181 from Chick3nman/master
Fixed bug in mode 9500
2019-11-05 12:20:49 +01:00
Jens Steube
4078bcd8d7 Fix tokenizer configuration in -m 20710 and -m 13600 2019-11-05 12:18:14 +01:00
Jens Steube
9ea1f88f27 Fix tokenizer configuration in -m 20711 2019-11-03 12:33:09 +01:00
Jens Steube
a8555fa048 Support use of all available CPU cores for hash-mode specific hooks 2019-11-03 12:05:52 +01:00
Rosen Penev
49edbe184b Avoid narrowing errors
C++ with -Wnarrowing complains about these.
2019-09-11 20:18:26 -07:00
Chick3nman
253db764b7 Fixed issue where multiple hashes with the same salt would fail to crack in module/kernel for 9500. Remove unused include in module for 9600. 2019-09-05 05:27:39 -05:00