1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-27 17:08:12 +00:00
Commit Graph

459 Commits

Author SHA1 Message Date
jsteube
9196f1ba55 Added rounds_count_length() function to detect optional rounds=
substring in *crypt hashes
The following parser functions have been rewritten to make use of
input_tokenizer():
phpass_parse_hash()
md5crypt_parse_hash()
md5apr1_parse_hash()
episerver_parse_hash()
2018-06-27 11:12:35 +02:00
jsteube
f574cbc88a the following parser functions have been rewritten to make use of
input_tokenizer()
dcc2_parse_hash()
dpapimk_parse_hash()
2018-06-26 12:32:58 +02:00
jsteube
a2d99c5ac6 Rewrite several *_parse_hash() functions to use parse_and_store_generic_salt() 2018-06-25 16:30:40 +02:00
jsteube
50824a24c6 Rewrite parse_and_store_salt from scratch and rename original to parse_and_store_salt_legacy() for migration phase
Rewrite several *_parse_hash() functions to use parse_and_store_generic_salt()
2018-06-25 11:36:09 +02:00
jsteube
5f83dd8620 Convert cisco4_parse_hash() to make use of input_tokenizer()
Convert lm_parse_hash() to make use of input_tokenizer()
2018-06-24 14:04:05 +02:00
jsteube
2abe8caf24 Convert bcrypt_parse_hash() to make use of input_tokenizer()
Add more code to input_tokenizer()
2018-06-23 22:32:49 +02:00
jsteube
26dea37c9d TEST CODE: tokenizer function in order to simplify parsing functions 2018-06-23 16:00:49 +02:00
jsteube
c28fdf7f44 Added hash-mode 16700 = FileVault 2 2018-06-18 14:38:35 +02:00
Jens Steube
fee4cb42cc
Merge pull request #1541 from erpscanteam/master
POC for cracking SAP "half hashes" CODVN B+F/G
2018-06-12 16:38:21 +02:00
philsmd
7d6c0d746c
7-Zip: increase the crc length to parse
Similar to the increase done with this commit: d382400805
we need to increase the crc length again such that hashcat can load hashes corresponding to some very highly compressed files within the 7-Zip archive. 

For reference, this problem was first reported here: https://hashcat.net/forum/thread-7378.html :

as you can see
```
...$1059026$5d00001000): Salt-value exception
```

The value 1059026 is about 1MB of decrypted and decompressed data that needs to be checksummed.
2018-03-22 09:52:40 +01:00
Mathieu Geli
4dbc1f4a87 Implement 7701/7801 SAP CODVN half-hashes 2018-03-06 16:42:53 +03:00
jsteube
63defd1cea Remove unused variable 2018-02-28 11:57:23 +01:00
jsteube
ca1115a1ee No longer need to use 32 threads on second dimension for bitsliced algorithms 2018-02-20 01:01:50 +01:00
Jens Steube
872f82ab8d Get rid of thread limit for bitsliced kernels 2018-02-18 11:10:33 +01:00
Jens Steube
e79feb0b6f Add more reqd_work_group_size attributes to kernels 2018-02-17 22:16:05 +01:00
Jens Steube
7674c3a556 Revert "Thread limits on bitsliced kernels no longer required"
This reverts commit ba5f23474e.
2018-02-17 21:28:02 +01:00
Jens Steube
ba5f23474e Thread limits on bitsliced kernels no longer required 2018-02-17 20:41:07 +01:00
jsteube
b8b816eada Fix 64 marker for -m 11300 and -m 15900 2018-02-16 21:53:25 +01:00
Jens Steube
aa82d8d34d Re-enable CPU optimizations and some CPU case in thread management 2018-02-16 18:56:21 +01:00
jsteube
dfb95024bc Fix temporary datatype in wpapmk kernels 2018-02-13 16:34:00 +01:00
Jens Steube
f75accef59 Update -m 2501 selftest hash in order to succeed with new AUX kernels 2018-02-13 12:09:00 +01:00
Jens Steube
6cd6b08229 Other format that base on md5crypt should also use OPTS_TYPE_PREFERED_THREAD 2018-02-13 11:59:47 +01:00
Jens Steube
413ade76fb Add OPTS_TYPE_PREFERED_THREAD flag for -m 500 2018-02-13 11:12:08 +01:00
Jens Steube
1361651730 Add OPTS_TYPE_PREFERED_THREAD marker 2018-02-13 10:27:43 +01:00
jsteube
fe4413797e OpenCL Kernels: Use three separate comparison kernels (depending on keyver) for WPA instead of one 2018-02-13 09:13:35 +01:00
jsteube
91e522d094 Add special marker for speed only mode 2018-02-12 09:41:46 +01:00
jsteube
c4f30220a0 OpenCL Kernels: Refactored kernel thread management from native to maximum per kernel 2018-02-11 21:29:57 +01:00
jsteube
ce8f445ebe Fix a few warnings and divide by zero (speed_pos) 2018-02-11 14:25:55 +01:00
Jens Steube
d656e9c3a4 OpenCL Kernels: Use the kernel local buffer size as additional reference in order to limit the thread-count 2018-02-11 10:56:08 +01:00
Jens Steube
75c4d09301 CPU threads still work better on a single local work item 2018-02-09 23:40:52 +01:00
Jens Steube
b0ff625844 OpenCL Kernels: Thread-count is switched from native to maximum - as a consequence we assume host memory pool of 2GB per GPU 2018-02-09 16:42:28 +01:00
jsteube
088c45040b Remove some redundant constants 2018-02-09 10:48:19 +01:00
jsteube
05a01d3843 fix some datatypes 2018-02-08 19:13:29 +01:00
jsteube
cdc4f3828b Reduce max kernel threads from 256 to 64 in -w 4 to save host and GPU memory 2018-02-06 09:38:54 +01:00
jsteube
2f30e5e929 Fixed invalid support for SIMD in -m 400 2018-02-05 15:57:36 +01:00
Jens Steube
3d2c0018fc Limit the maximum OpenCL thread count to 256
If an OpenCL device allows a very high thread count (for example 1024 on nvidia), the host memory required is 32 times as high with 32 (It jumps from 128MB to 4GB device memory requirement). since there's no device with that much device memory (because of 1/4 memory rule) it has to limit the kernel_accel_max to be a very low number because the pws buffer will be so large otherwise. therefore autotune will be unable to calculate a good kernel_accel multiplier. currently there's no OpenCL device known that needs result in a better performance with 1024 threads compared to 256. as a result, we limit the number of threads to 256, which turns out to be a general good value.
2018-02-03 12:28:00 +01:00
jsteube
e877c30ebc OpenCL Kernels: Remove password length restriction to 16 for Cisco-PIX and Cisco-ASA hashes
Fixes #1488
2018-01-27 22:21:44 +01:00
jsteube
553668bb9f Added hash-mode 16600 = Electrum Wallet (Salt-Type 1-3) 2018-01-25 15:28:21 +01:00
jsteube
7a8239b4c1 Fixed the maximum password length check in password reassembling function
Fixes #1492
2018-01-22 18:59:46 +01:00
jsteube
ce0cee0ac4 Stick to original JWT format from jwt.io 2018-01-21 19:57:24 +01:00
jsteube
0796c074c3 Added -m 16500 Kernels
Also changed function declaration of parser function from const hashconfig_t to just hashconfig_t
2018-01-21 18:53:55 +01:00
Arseniy Sharoglazov
928cf471fb The hash-mode for "CRAM-MD5 Dovecot" changed from 10201 to 16400 2018-01-17 11:25:21 +03:00
Arseniy Sharoglazov
798f05355f added -m 10201 = CRAM-MD5 Dovecot 2018-01-15 15:52:52 +03:00
philsmd
bf656774bb
fixes #1279: added -m 16300 = Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256 2017-12-20 11:41:46 +01:00
jsteube
838a71637a Remove fixed iteration count for apple secure notes 2017-12-17 23:29:02 +01:00
jsteube
535945b03a Fix rename $SN$ signature to $ASN$ for apple secure notes 2017-12-13 12:39:00 +01:00
jsteube
d9c5c42966 Rename $SN$ signature to $ASN$ for apple secure notes 2017-12-13 12:36:01 +01:00
jsteube
0d89ddfcd9 Finish adding hash-mode 16200 = Apple Secure Notes 2017-12-13 12:32:38 +01:00
jsteube
1184ae1cdd Added option --benchmark-all to benchmark all hash-modes not just the default selection 2017-12-05 11:08:59 +01:00
jsteube
4414b520c8 remove unused variables 2017-12-04 11:20:48 +01:00
jsteube
829ea605c5 Self Test: Skip self-test for mode 8900 user-configurable scrypt settings are incompatible to fixed settings in the self-test hash
Self Test: Skip self-test for mode 15700 because settings are too high and create a too long startup time
2017-12-04 11:14:39 +01:00
jsteube
f573c1d96d Add optimized -m 16100 kernels 2017-12-03 14:35:39 +01:00
jsteube
0fbaff8b90 Revert: Have -m 16100 always running in keep-guessing mode 2017-11-30 12:36:43 +01:00
jsteube
cda0d7dd35 Have -m 16100 always running in keep-guessing mode 2017-11-30 12:35:22 +01:00
jsteube
5847067c96 First working -m 16100 kernel 2017-11-29 17:00:14 +01:00
philsmd
9d58ddd9f6
fixed strtok_r () calls, could prevent memory crashes 2017-11-18 14:23:02 +01:00
philsmd
d382400805
fixes #1450: allow longer crc32 data length field for -m 11600 2017-11-18 12:59:21 +01:00
Rosen Penev
353d3c3008 Fix a bunch of cast-qual warnings 2017-11-13 20:46:26 -08:00
Rosen Penev
8458f07a57 Replace char[] with *char
The latter is more correct. The side effect is that filesize becomes smaller.

gcc    clang

before

O2
756112 762120

Os
674192 680216

after

O2
748456 760728

Os
666536 674728
2017-11-13 12:12:44 -08:00
Jens Steube
ea5425b344
Merge pull request #1439 from neheb/master
Change atoi family to strtol family
2017-11-13 09:10:57 +01:00
jsteube
1b312d14fd Added hash-mode 16000 = Tripcode 2017-11-11 14:44:56 +01:00
Royce Williams
59701ee7ed change wording when user tries -O, but not needed 2017-11-06 06:33:55 -09:00
Rosen Penev
1109017a53 Change atoi family to strtol family
Suggested by clang tidy
2017-11-05 12:33:41 -08:00
Rosen Penev
3ba84f17f1 More clang tidy fixes 2017-11-05 01:52:29 -07:00
Jens Steube
77f3eb2864 OpenCL Kernels: Thread-count is set to hardware native count except if -w 4 is used then OpenCL maximum is used 2017-10-22 14:16:32 +02:00
jsteube
d0f5c9f2b3 Rename MacOS to macOS 2017-10-20 13:36:47 +02:00
jsteube
980f04a7b6 Rename instances of OSX to MacOS 2017-10-20 11:58:31 +02:00
jsteube
b99eb92b56 Re-enable amdgpu-pro, do some warm-up in benchmark mode 2017-10-19 20:56:14 +02:00
jsteube
635b2bfd50 Do initial OpenCL device thread management a bit different 2017-10-19 14:54:03 +02:00
jsteube
0d192df517 Run integreted GPU at 8 threads max 2017-10-18 17:02:12 +02:00
Jens Steube
a037ba0c73 Merge pull request #1375 from neheb/warning
Fix for clang and some cppcheck warnings
2017-09-29 11:20:35 +02:00
Rosen Penev
148c4335aa fix printf formats. 2017-09-27 20:05:04 -07:00
Fist0urs
e3cb3e9b4c test.pl ready and 0 error. Ready for PR 2017-09-21 16:55:30 +02:00
Fist0urs
a6294537fd Splitted DPAPI kernel in 2 to increase performances 2017-09-21 12:23:33 +02:00
Jens Steube
24a78574e2 Fix use of veracrypt-pim 2017-09-19 16:41:31 +02:00
jsteube
bac000667c Fix wpa_parse_hash(), the wpa esalt was partially initialized beforehand, we can not simply memset it to zero 2017-09-19 12:01:11 +02:00
jsteube
617dbb97ba Prepare migration -m 15800 into -m 2500 2017-09-18 13:21:00 +02:00
jsteube
5551337cf6 Show advice to use optimized kernels only if there's actually one for this hash-mode 2017-09-16 22:33:04 +02:00
jsteube
34c5eac550 Fixed the use of --veracrypt-pim option. It was completely ignored without showing an error 2017-09-16 12:53:45 +02:00
jsteube
3aec5ecf1c Add some advice and notes about pure and optimized OpenCL kernels 2017-09-16 12:17:31 +02:00
jsteube
3b89153c2d Fix use of --hex-salt with SALT_TYPE_GENERIC 2017-09-06 22:14:06 +02:00
jsteube
0dfe015301 Fixed a parser error in multiple modes not checking for return code, resulting in negative memory index writes 2017-09-04 15:53:13 +02:00
jsteube
6d112aeb39 OpenCL Kernels: Rewritten Keccak kernel to run fully on registers and partially reversed last round 2017-08-30 13:27:04 +02:00
Jens Steube
8fb583f0a7 Simplify kernel thread calculation for SCRYPT based algorithms 2017-08-29 22:43:26 +02:00
Jens Steube
12295dcd90 Restore v3.6.0 kernel thread handling of scrypt 2017-08-29 18:30:50 +02:00
Jens Steube
fcd20fbacb OpenCL Runtime: Fall back to 64 threads default (from 256) on AMD GPU to prevent creating too many workitems 2017-08-29 17:36:50 +02:00
Royce Williams
1a162e2ab4 Clarify Blake2b label 2017-08-24 07:19:50 -08:00
jsteube
12d95fd22c Added option --example-hashes to show an example hash for each hash-mode 2017-08-22 11:09:46 +02:00
jsteube
c8da13c3aa Update default scrypt tmto to be ideal for latest NV and AMD top models 2017-08-17 17:46:54 +02:00
jsteube
cd5470f00e Add missing benchmark salt length default for SIP mode 2017-08-17 12:13:47 +02:00
jsteube
92a288fbd3 Resolved merge conflict by incorporating both suggestions. 2017-08-17 12:12:03 +02:00
philsmd
0d6b9d0419
fixes #1313: keep/print the original salt for descrypt hashes 2017-08-17 11:29:04 +02:00
philsmd
1d5dbab258
fixes #1278: allow the '#' character within the username field of DCC2 hashes 2017-08-17 07:51:19 +02:00
jsteube
adacccecdf Add pure kernels for FileZilla Server >= 0.9.55 2017-08-09 14:48:47 +02:00
jsteube
c8a645dc16 Fix invalid default salt length for mode 11000 in benchmark 2017-08-04 14:12:37 +02:00
jsteube
177800d1d0 Add pure kernels for RAdmin2 2017-08-03 15:21:39 +02:00
jsteube
a9375b9817 Fix maximum password length supported in MS Office <= 2003 2017-08-03 15:08:08 +02:00
jsteube
e0c86f40e5 Fix maximum password length supported in Lotus Notes/Domino 6 2017-08-03 14:33:31 +02:00
jsteube
1f42377931 Simplify Lotus Notes/Domino 5 kernel 2017-08-03 14:11:31 +02:00
jsteube
54eb0b158d Prepare DNSSEC (NSEC3) optimized kernel for pure kernel version 2017-08-03 12:35:05 +02:00