1
0
mirror of https://github.com/hashcat/hashcat.git synced 2025-07-06 14:52:35 +00:00
Commit Graph

531 Commits

Author SHA1 Message Date
unix-ninja
cef3c1cb06 Use C99 format specifier 2018-10-20 22:00:15 -04:00
unix-ninja
fddfd835d2 Support 64 bit timestamps properly 2018-10-19 15:35:52 -04:00
unix-ninja
770e21e5ee Support 64 bit timestamps properly 2018-10-19 15:16:46 -04:00
unix-ninja
8b2af6b207 More code style changes 2018-10-19 08:45:44 -04:00
R. Yushaev
4d457ca141 Fix conflicts caused by PR GH-1717 2018-10-19 10:53:23 +02:00
unix-ninja
3869ce9246 More coding style fixes 2018-10-18 08:55:55 -04:00
unix-ninja
db4ec8ed2c Fix formatting to comply with hashcat coding guidelines 2018-10-17 16:34:34 -04:00
unix-ninja
23ee9379c1 Fix zero-padding on token output for matches 2018-10-17 11:47:04 -04:00
unix-ninja
27366c3eff Don't duplicate existing functionality 2018-10-17 11:44:34 -04:00
unix-ninja
d66200a406 Force --keep-guessing on mode 18100 2018-10-17 08:17:48 -04:00
unix-ninja
83c78cdf0b Cleanup unused code 2018-10-17 08:15:49 -04:00
unix-ninja
37983de4b2 Fix compile warnings in totp_parse_hash() 2018-10-16 17:39:46 -04:00
unix-ninja
3c3b05d1e5 Resolve conflicts 2018-10-16 15:48:20 -04:00
unix-ninja
6cda8f7077 Change TOTP index from 17300 to 18100 2018-10-16 15:33:09 -04:00
unix-ninja
977b560bb4 Add support for TOTP (RFC 6238) 2018-10-16 15:05:14 -04:00
R. Yushaev
5c87720acc Add SHA3 and Keccak
The previous hash-mode 5000 covered Keccak-256 only. FIPS changed one
padding byte while adopting Keccak as the SHA3 standard, which gives us
different digests. Now we have separate kernels for SHA3 and Keccak.

 - Added hash-mode 17300 = SHA3-224
 - Added hash-mode 17400 = SHA3-256
 - Added hash-mode 17500 = SHA3-384
 - Added hash-mode 17600 = SHA3-512
 - Added hash-mode 17700 = Keccak-224
 - Added hash-mode 17800 = Keccak-256
 - Added hash-mode 17900 = Keccak-384
 - Added hash-mode 18000 = Keccak-512
 - Removed hash-mode 5000 = SHA-3 (Keccak)
2018-10-15 16:06:31 +02:00
Jens Steube
8452930795 Allow hashfile for -m 16800 to be used with -m 16801 2018-10-14 11:39:31 +02:00
Jens Steube
6afe989bed Fixed the tokenizer configuration in postgres hash parser 2018-10-14 11:38:31 +02:00
Jens Steube
1b980cf010 Allow hashfile for -m 16800 to be used with -m 16801 2018-09-29 11:52:21 +02:00
Michael Sprecher
1892b842d7
Increased the maximum size of edata2 in Kerberos 5 TGS-REP etype 23 2018-09-12 12:25:02 +02:00
jsteube
52c52836e3 Add new option --slow-candidates which allows hashcat to generate passwords on-host 2018-09-01 12:31:17 +02:00
Jens Steube
466ea8eaba Fixed detection of unique ESSID in WPA-PMKID-* parser 2018-08-31 15:47:48 +02:00
Jens Steube
3e149843ae Fixed detection of unique ESSID in WPA-PMKID-* parser 2018-08-30 11:13:44 +02:00
Michael Sprecher
e975612f82
Fixed the ciphertext max length in Ansible Vault parser 2018-08-16 12:13:22 +02:00
Michael Sprecher
5536ab9917
Getting rid of OPTS_TYPE_HASH_COPY for Ansible Vault 2018-08-15 23:32:58 +02:00
Jens Steube
ce9b56e06c Allow bitcoin master key length not be exactly 96 byte a multiple of 16 2018-08-14 15:39:39 +02:00
jsteube
634dd71384 Remove some suppressed warnings 2018-08-06 21:04:48 +02:00
jsteube
afd1efd59c Fixed a buffer overflow in precompute_salt_md5() in case salt was longer than 64 characters 2018-08-06 15:35:35 +02:00
Jens Steube
4a856b1149
Merge pull request #1643 from hops/master
Added hash-mode 16900 = Ansible Vault
2018-08-01 20:28:00 +02:00
Michael Sprecher
3a321c8dce
Added hash-mode 16900 = Ansible Vault 2018-08-01 19:44:30 +02:00
jsteube
d11070729b Fix Token Length Exception on NetNTLMv2 hashes 2018-08-01 19:09:41 +02:00
jsteube
39af031ced Fix Token Length Exception on NetNTLMv1 hashes 2018-07-31 17:31:54 +02:00
jsteube
bdec457951 TrueCrypt/VeraCrypt cracking: Do an entropy check on the TC/VC header on start 2018-07-31 16:18:45 +02:00
jsteube
b1788a934e Fix missing TOKEN_ATTR_VERIFY_SIGNATURE in phpass_parse_hash() 2018-07-26 13:22:28 +02:00
jsteube
88ebca40b8 Added hash-mode 16800 = WPA-PMKID-PBKDF2
Added hash-mode 16801 = WPA-PMKID-PMK
Renamed lot's of existing WPA related variables to WPA-EAPOL in order to distinguish them with WPA-PMKID variables
Renamed WPA/WPA2 to WPA-EAPOL-PBKDF2
Renamed WPA/WPA2 PMK to WPA-EAPOL-PMK
2018-07-25 16:46:06 +02:00
jsteube
cc8fa3ee80 Remove TOKEN_ATTR_TERMINATE_STRING from input_tokenizer() and replace with equalivalent code where it's needed 2018-07-24 13:55:23 +02:00
magnum
f5e9f4dc85 Fix a couple of gcc-6 -Wpointer-sign build warnings. 2018-07-24 10:57:54 +02:00
philsmd
2e1845ec11
fixes #1624: increase esalt/nonce buffer to 1024 for -m 11400 = SIP 2018-07-23 15:51:39 +02:00
Jens Steube
eb563f5a10 Fix minimum line length for token 3 in saph_sha1_parse_hash() 2018-07-21 14:09:52 +02:00
Jens Steube
a33af21642 Fix some output formats after refactorization with input_tokenizer() 2018-07-20 20:29:00 +02:00
jsteube
048298020e All remaining parser functions have been rewritten to make use of input_tokenizer():
chacha20_parse_hash
crammd5_dovecot_parse_hash
electrum_wallet13_parse_hash
ethereum_pbkdf2_parse_hash
ethereum_presale_parse_hash
ethereum_scrypt_parse_hash
filevault2_parse_hash
filezilla_server_parse_hash
jks_sha1_parse_hash
jwt_parse_hash
mywalletv2_parse_hash
netbsd_sha1crypt_parse_hash
plaintext_parse_hash
tacacs_plus_parse_hash
tripcode_parse_hash
Removed old generic salt parser function parse_and_store_salt()
2018-07-20 11:00:39 +02:00
jsteube
85aef30dff The following parser functions have been rewritten to make use of input_tokenizer():
opencart_parse_hash
des_parse_hash
win8phone_parse_hash
sha1cx_parse_hash
itunes_backup_parse_hash
skip32_parse_hash
2018-07-19 17:14:33 +02:00
jsteube
ed0ac581cd The following parser functions have been rewritten to make use of input_tokenizer():
keepass_parse_hash
zip2_parse_hash
2018-07-18 17:59:44 +02:00
jsteube
558c2c4aa5 The following parser functions have been rewritten to make use of input_tokenizer():
ms_drsr_parse_hash
androidfde_samsung_parse_hash
rar5_parse_hash
krb5tgs_parse_hash
axcrypt_parse_hash
2018-07-17 16:13:55 +02:00
jsteube
a6b52d6faf The following parser functions have been rewritten to make use of input_tokenizer():
ecryptfs_parse_hash
bsdicrypt_parse_hash
rar3hp_parse_hash
cf10_parse_hash
mywallet_parse_hash
2018-07-16 18:22:58 +02:00
jsteube
e1fd84255b Some fixes for seven_zip_parse_hash() using input_tokenizer() 2018-07-15 20:54:49 +02:00
jsteube
230ec5e004 Add TOKEN_ATTR_TERMINATE_STRING feature to input_tokenizer()
The following parser functions have been rewritten to make use of input_tokenizer():
bitcoin_wallet_parse_hash
sip_auth_parse_hash
crc32_parse_hash
oraclet_parse_hash
seven_zip_parse_hash
2018-07-15 18:10:04 +02:00
jsteube
39418571db The following parser functions have been rewritten to make use of input_tokenizer():
prestashop_parse_hash
postgresql_auth_parse_hash
mysql_auth_parse_hash
2018-07-14 22:40:03 +02:00
jsteube
cd552eb54d The following parser functions have been rewritten to make use of input_tokenizer():
pdf14_parse_hash
pdf17l8_parse_hash
pbkdf2_md5_parse_hash
pbkdf2_sha1_parse_hash
pbkdf2_sha256_parse_hash
pbkdf2_sha512_parse_hash
2018-07-14 12:48:54 +02:00
jsteube
6ee7709d27 The following parser functions have been rewritten to make use of input_tokenizer():
djangopbkdf2_parse_hash
siphash_parse_hash
crammd5_parse_hash
saph_sha1_parse_hash
pdf11_parse_hash
pdf11cm2_parse_hash
2018-07-13 09:59:59 +02:00
jsteube
bc8ed67a11 The following parser functions have been rewritten to make use of input_tokenizer():
oldoffice01_parse_hash
oldoffice01cm2_parse_hash
oldoffice34_parse_hash
oldoffice34cm2_parse_hash
2018-07-12 18:06:00 +02:00
jsteube
9f4655e131 The following parser functions have been rewritten to make use of input_tokenizer():
lotus8_parse_hash
cisco8_parse_hash
cisco9_parse_hash
office2007_parse_hash
office2010_parse_hash
office2013_parse_hash
2018-07-11 11:57:43 +02:00
jsteube
1b30a1d6c7 The following parser functions have been rewritten to make use of input_tokenizer():
nsec3_parse_hash
wbb3_parse_hash
racf_parse_hash
androidfde_parse_hash
scrypt_parse_hash
2018-07-09 12:49:42 +02:00
jsteube
f02e72425b The following parser functions have been rewritten to make use of input_tokenizer():
sapb_parse_hash
sapg_parse_hash
drupal7_parse_hash
sybasease_parse_hash
netscaler_parse_hash
cloudkey_parse_hash
2018-07-08 12:55:31 +02:00
jsteube
1c121ef79c The following parser functions have been rewritten to make use of input_tokenizer():
sha512macos_parse_hash
sha512grub_parse_hash
rakp_parse_hash
krb5pa_parse_hash
2018-07-07 11:25:25 +02:00
jsteube
0820fe4100 The following parser functions have been rewritten to make use of input_tokenizer():
sha1aix_parse_hash
agilekey_parse_hash
lastpass_parse_hash
fortigate_parse_hash
2018-07-06 13:48:39 +02:00
jsteube
18fed3053a The following parser functions have been rewritten to make use of input_tokenizer():
md5aix_parse_hash
sha256aix_parse_hash
sha512aix_parse_hash
2018-07-05 11:11:24 +02:00
jsteube
7e18ab05be The following parser functions have been rewritten to make use of input_tokenizer():
ikepsk_md5_parse_hash
ikepsk_sha1_parse_hash
2018-07-04 12:58:30 +02:00
jsteube
afd5fa760c The following parser functions have been rewritten to make use of
input_tokenizer():
androidpin_parse_hash
chap_parse_hash
lotus5_parse_hash
lotus6_parse_hash
radmin2_parse_hash
gost2012sbog_256_parse_hash
gost2012sbog_512_parse_hash
2018-07-03 10:23:04 +02:00
jsteube
8b2478d744 The following parser functions have been rewritten to make use of input_tokenizer():
sha256crypt_parse_hash
sha512crypt_parse_hash
keccak_parse_hash
blake2b_parse_hash
juniper_parse_hash
oracleh_parse_hash
gost_parse_hash
2018-07-02 09:20:15 +02:00
jsteube
87be2e8cce The following parser functions have been rewritten to make use of input_tokenizer():
sha224_parse_hash
sha256_parse_hash
sha256s_parse_hash
sha384_parse_hash
sha512_parse_hash
sha512s_parse_hash
ripemd160_parse_hash
whirlpool_parse_hash
hmacmd5_parse_hash
hmacsha1_parse_hash
hmacsha256_parse_hash
hmacsha512_parse_hash
mysql323_parse_hash
2018-07-01 10:49:30 +02:00
jsteube
c6eb269784 The following parser functions have been rewritten to make use of input_tokenizer():
mssql2000_parse_hash
mssql2005_parse_hash
mssql2012_parse_hash
oracles_parse_hash
episerver4_parse_hash
sha512b64s_parse_hash
hmailserver_parse_hash
phps_parse_hash
mediawiki_b_parse_hash
peoplesoft_parse_hash
skype_parse_hash
djangosha1_parse_hash
redmine_parse_hash
punbb_parse_hash
sha256b64s_parse_hash
atlassian_parse_hash
2018-07-01 09:49:33 +02:00
jsteube
06a34bd026 Convert sha1b64s_parse_hash() to make use of input_tokenizer() 2018-06-30 10:51:21 +02:00
jsteube
384fe1ba15 Add support for multiple valid signatures in input_tokenizer() 2018-06-30 10:39:28 +02:00
jsteube
5728933cd2 Convert sha1b64_parse_hash() to make use of input_tokenizer() 2018-06-30 10:25:10 +02:00
jsteube
d36e70b598 Convert pstoken_parse_hash() to make use of input_tokenizer() 2018-06-30 10:13:26 +02:00
jsteube
ea6fd41c01 Merge branch 'master' of https://github.com/hashcat/hashcat 2018-06-29 20:32:14 +02:00
jsteube
4991bb85d2 Remove the following obsolete functions and replace them with input_tokenizer():
dcc_parse_hash
ipb2_parse_hash
sha1sha1_parse_hash
smf_parse_hash
vb3_parse_hash
2018-06-29 20:31:52 +02:00
Jens Steube
07b49c17f8
Merge pull request #1605 from magnumripper/master
Mute another -Wpointer-sign warning.
2018-06-29 12:37:50 +02:00
jsteube
6817876324 Do not increase output length in parse_and_store_generic_salt() if OPTS_TYPE_ST_ADD80 or similar is used 2018-06-29 12:33:02 +02:00
magnum
35a4972bb3 Mute another macOS -Wpointer-sign warning. 2018-06-28 19:18:16 +02:00
jsteube
10556b6324 The following parser functions have been rewritten to make use of
input_tokenizer():
descrypt_parse_hash()
md5pix_parse_hash()
md5asa_parse_hash()
netntlmv1_parse_hash()
netntlmv2_parse_hash()
joomla_parse_hash()
2018-06-28 14:24:52 +02:00
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