1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-24 23:48:39 +00:00
Commit Graph

823 Commits

Author SHA1 Message Date
Jens Steube
08fc0ec1fb Added self-test funcionality for OpenCL kernels on startup
Fixed a parser error for mode -m 9820 = MS Office <= 2003 $3, SHA1 + RC4, collider #2
2017-06-13 19:07:08 +02:00
Jens Steube
7e5b8d3f25 Added hash-mode 15500 = JKS Java Key Store Private Keys (SHA1) 2017-06-09 09:56:06 +02:00
jsteube
b8ad89c529 Rename function and variables containing 'unicode' to 'utf16le' because that's what's meant actually 2017-06-05 12:15:28 +02:00
jsteube
018bb208d9 Refactor OPTS_TYPE_PT_UNICODE -> OPTS_TYPE_PT_UNICODE_LE and add OPTS_TYPE_PT_UNICODE_BE 2017-06-04 22:46:05 +02:00
Jens Steube
6345fb53f9 Add missing struct names 2017-06-04 21:23:55 +02:00
Jens Steube
2a1fe6962d Move blake2_t and chacha20_t to interface.h 2017-06-04 21:21:18 +02:00
Jens Steube
b23ab71d5c - Added hash-mode 15600 = Ethereum Wallet, PBKDF2-HMAC-SHA256
- Added hash-mode 15700 = Ethereum Wallet, PBKDF2-SCRYPT
Resolves https://github.com/hashcat/hashcat/issues/1227
Resolves https://github.com/hashcat/hashcat/issues/1228
2017-06-03 23:23:03 +02:00
jsteube
b5f149476d Trim OpenCL device name whitespaces 2017-06-02 10:08:19 +02:00
jsteube
0cce17d268 Eventual fix for #1263 2017-05-30 12:15:55 +02:00
jsteube
ef33544bfa Show time spent for dictionary cache building on startup 2017-05-23 10:07:04 +02:00
Jens Steube
5611d7f950 Merge pull request #1256 from 0xbsec/reject_unless_equal
Add support for rejection rule _N
2017-05-20 11:24:38 +02:00
Jens Steube
865d885c59 Merge pull request #1257 from DoZ10/master
Removed unused structure blake2params_t
2017-05-19 14:35:05 +02:00
DoZ10
62df9648d6 Removed unused structure 2017-05-19 08:28:30 -04:00
DoZ10
556e64ffe6 Revert "Removed unused structure"
This reverts commit e7dab5d210.
2017-05-19 08:25:43 -04:00
DoZ10
e7dab5d210 Removed unused structure 2017-05-19 08:22:18 -04:00
mhasbini
1330424079 Add support for rejection rule _N 2017-05-19 15:13:07 +03:00
Christopher Schmitt
d24a6198e8 first pass at free'ing hashcat_status_t 2017-05-18 10:14:25 -04:00
Jens Steube
f2ad095191 Merge pull request #1237 from DoZ10/master
New algorithm: Chacha20
2017-05-18 13:51:47 +02:00
philsmd
af3619f3c5
-m 11600 = 7zip: do not allow truncated hashes anymore, but increase supported data length to ~320KB 2017-05-17 15:07:16 +02:00
philsmd
1f93d2060f
fixes #1239: remove AES padding attack for 7zip since we can't guarantee that the padding is always zero 2017-05-17 13:53:55 +02:00
Jens Steube
974128bdce Merge pull request #1245 from 0xbsec/rule-position-p
Add support for rule position 'p'
2017-05-17 10:55:08 +02:00
DoZ10
5683df2e17 Fixed conflicts 2017-05-16 20:36:55 -04:00
DoZ10
cfc3fa64c0 Implemented offset parameter to reach full ks block of 64 bytes 2017-05-15 08:47:40 -04:00
Fist0urs
a78dce94db All remarks treated:
1) done + got rid of all u8 datatypes in shared struct
	2) cf. previous
	3) necessary as this is computed in _init then used in _comp
	4) done
	5) done
	6) done => switch to 16
	7) done
2017-05-14 19:45:35 +02:00
mhasbini
be0dec621a Add support for rule position 'p' in host mode 2017-05-14 18:50:45 +03:00
DoZ10
9dee1d274d Removed plain_length parameter and copied esalt buffer to salt ofr sorting mechanism. 2017-05-14 07:14:57 -04:00
DoZ10
0d3b5393ef Swapped mode 670 -> 15400 2017-05-14 06:52:14 -04:00
Fist0urs
7ff09c6710 Preparing PR 2017-05-09 20:14:07 +02:00
DoZ10
c50e8bc486 Fixed position parameters. Tested all kernels. Ok. 2017-05-07 14:02:00 -04:00
DoZ10
3c67e0054c Implemented Perl test and fixed issues. Now have a working base. 2017-05-06 20:40:10 -04:00
DoZ10
cd9dc989ce Implemented Chacha20 crypto. 2017-05-06 14:24:50 -04:00
Fist0urs
40bbb0023c Merge branch 'master' of https://github.com/hashcat/hashcat into DPAPImk 2017-05-06 17:00:17 +02:00
Fist0urs
d537712f27 Both DPAPImk v1 and v2 work for single hash, still a bug on multi-hash
Remaining this bug + tests.pl before PR
2017-05-06 16:55:36 +02:00
DoZ10
f6cd42352d CPU parsing mostly done. Kernel showing good values. 2017-05-05 09:02:18 -04:00
DoZ10
152f0b5152 Init work on Chacha20 2017-05-04 22:34:52 -04:00
Jens Steube
b924901bb0 Merge pull request #1226 from DoZ10/master
Blake2b raw hash implementation
2017-05-03 16:38:03 +02:00
DoZ10
9d0855c02f Fixed interface.c to remove XORing madness and blake2_t naming convention 2017-05-01 16:38:48 -04:00
Fist0urs
014278ab0e Working:
- MD4/sha1
  - hmac-sha1
  - pbkdf2-hmac-sha1
  - pbkdf2-hmac-sha512
Remaining:
  - handling of long salt (SID)
  - (AES256/DES3) + the end
2017-05-01 22:21:54 +02:00
DoZ10
87e0281237 Moved init params in CPU (interface.c). Fixed vector-type problem in kernel a0. 2017-04-30 20:34:01 -04:00
Fist0urs
73d48dcd26 Initial commit, new format DPAPImk, works till hmac-sha1 2017-05-01 00:48:09 +02:00
mhasbini
5734741392 Add support for rule: eX 2017-04-30 16:23:39 +03:00
DoZ10
58c1f46b19 Merge and conflict resolve. 2017-04-24 21:47:35 -04:00
DoZ10
a60cddc2cc Added Blake2 signature according for JtR format. 2017-04-22 07:35:22 -04:00
Jens Steube
086a07264a Switch from libiconv to win-iconv 2017-04-19 12:58:25 +02:00
Jens Steube
26a345334f Added hash-mode 15200 = Blockchain, My Wallet, V2
Fixes https://github.com/hashcat/hashcat/issues/109
2017-04-16 13:19:23 +02:00
Jens Steube
5cc3b7807f Test for target Endianness and abort if it's big-endian 2017-04-15 17:33:59 +02:00
Jens Steube
7cabb848d2 Wordlist encoding: Support added for internal convert from and to user-defined encoding during runtime
Wordlist encoding: Added parameters --encoding-from and --encoding-to to configure wordlist encoding handling
Dictstat: Structure for dictstat file changed as it has to include --encoding-from and --encoding-to parameter now
2017-04-14 16:36:28 +02:00
DoZ10
69dad31a29 fix: changed -m 6200 -> 600 2017-04-13 20:45:48 -04:00
DoZ10
0a8f17c24a fix: g madness... 2017-04-13 17:33:08 -04:00
DoZ10
4e9bb8b093 init 2017-04-13 08:38:59 -04:00
sgroat
21efc80975 fix string 2017-04-10 13:35:01 -07:00
jsteube
26949a4fce WPA cracking: Improved nonce-error-corrections mode to fix corrupt nonce generated on Big-Endian devices
WPA cracking: Reduced --nonce-error-corrections default from 16 to 8 to compensate speed drop caused due to Big-Endian fixes
Fixes https://github.com/hashcat/hashcat/issues/1221
2017-04-10 10:11:32 +02:00
jsteube
ac99df6618 Versions: Changed version naming convention from x.yz to x.y.z 2017-03-31 15:28:20 +02:00
jsteube
368f8b39bc Add function to distinguish between warning and advice messages 2017-03-25 20:50:37 +01:00
jsteube
e933d12838 Rename Input.Mode, Input.Base, ... to Guess.Mode, Guess.Base, ... 2017-03-24 23:39:09 +01:00
jsteube
6d66ff96c1 Truncate longer hash format in status output 2017-03-24 10:45:40 +01:00
jsteube
d1b2fa0b31 Added hash-mode 15100 = Juniper/NetBSD sha1crypt 2017-03-23 16:44:32 +01:00
jsteube
378f852cec Parameter: Detect and error when users try to use a non-digit where a digit is expected
Fixes https://github.com/hashcat/hashcat/issues/1189
2017-03-19 15:11:41 +01:00
jsteube
bea0e52cdb Remove unused variable 2017-03-09 10:17:34 +01:00
jsteube
c04dd5c8b1 WPA cracking: Added support for WPA/WPA2 handshake AP nonce automatic error correction
WPA cracking: Added parameter --nonce-error-corrections to configure range of error correction
2017-03-07 14:41:58 +01:00
jsteube
33a043ec63 Refactored internal use of esalt from sync with number of salts to sync with number of digests
This enables a true N esalts per salt feature which is required for WPA/WPA2 handling
In case we need that for a future algorithm, just make sure to have a unique value in digest in hash parser.
Fixes https://github.com/hashcat/hashcat/issues/1158
2017-03-07 09:44:58 +01:00
Rosen Penev
bbdaf647f3
Add _FORTIFY_SOURCE to check for overflows 2017-03-04 19:11:28 -08:00
Rosen Penev
184d69f574
Adjust version level for the *time_r functions 2017-03-04 18:51:01 -08:00
Rosen Penev
fdc0bf913d
Remove unnecessary includes 2017-03-04 18:30:39 -08:00
Rosen Penev
84cbad2ba8
Only Apple has a different cl.h location. Simplify a bit 2017-03-04 18:28:50 -08:00
jsteube
54ad27da7d Session Management: Automatically set dedicated session names for non-cracking parameters, for example: --stdout 2017-03-02 19:57:34 +01:00
philsmd
22d1129818
added -m 12001 = Atlassian (PBKDF2-HMAC-SHA1) #611 2017-02-28 14:22:03 +01:00
Jens Steube
e82ce9243d Added support for filtering hccapx message pairs using --hccapx-message-pair 2017-02-27 12:09:49 +01:00
jsteube
d2e95d5e1b Fix WPA/WPA2 incorrectly reports cracked passwords in some cases 2017-02-27 09:30:02 +01:00
jsteube
dc170907ed Compress multiple newlines to one in host code, too 2017-02-26 15:48:14 +01:00
Rosen Penev
4ceb7a1afa
Prefer _WIN to _POSIX for defines.
Also miscellaneous fixes here and there.
2017-02-23 15:55:06 -08:00
jsteube
4e2adc031a Add some compiler independant integer overflow functions 2017-02-23 10:39:17 +01:00
Rosen Penev
abd7b2bfcc
Simplify common.h a bit. 2017-02-22 14:09:57 -08:00
jsteube
922fea7616 Add more integer overflow checks 2017-02-22 16:33:23 +01:00
jsteube
62bc8689b7 Mask Checks: Added integer overflow detection for a keyspace of a mask provided by user 2017-02-22 12:28:23 +01:00
Jens Steube
14883bcd53 Merge pull request #1114 from neheb/master
Add ADL support to Cygwin
2017-02-22 10:38:23 +01:00
Rosen Penev
a1619f640d
Add ADL support to Cygwin 2017-02-21 21:57:05 -08:00
jsteube
9b08d4af0f Update hccapx format to version 4 2017-02-21 20:07:18 +01:00
jsteube
c3251cebd8 Hardware Management: Bring back kernel exec timeout detection for NVidia on user request 2017-02-20 18:38:31 +01:00
Jens Steube
dd55c1eb66 WPA: Changed format for outfile and potfile from essid:mac1:mac2 to hash:mac_ap:mac_sta:essid
Fixes https://github.com/hashcat/hashcat/issues/1113
2017-02-19 14:45:27 +01:00
jsteube
79e8b6a6b9 Make sure to unlink the pidfile only if our instance created it, but even in case of error 2017-02-17 08:59:22 +01:00
philsmd
c440dec867
file locking: check return value of fcntl () 2017-02-14 15:15:50 +01:00
jsteube
dc4f96f42e Fixed string not null terminated when reading maskfiles 2017-02-14 11:14:32 +01:00
jsteube
63b7321be2 Fixed WPA/WPA2 cracking in case eapol frame is >= 248 byte 2017-02-13 18:31:15 +01:00
jsteube
9c5cfd17ac Added support for automatic merge of LM halfes when --show and --left is used
Fixes https://github.com/hashcat/hashcat/issues/1034
2017-02-13 16:46:37 +01:00
philsmd
227c0be95e
resolves #1018: added -m 3910 = md5(md5($pass).md5($salt)) 2017-02-12 18:12:17 +01:00
jsteube
9aabc20248 Add a warning message if old hccap file is detected and abort 2017-02-08 20:25:04 +01:00
Jens Steube
dec6307729 Merge pull request #1031 from neheb/master
Add NVML and NVAPI support to Cygwin. Disable file globbing.
2017-02-08 10:19:22 +01:00
Rosen Penev
ee0911c26e Add NVML and NVAPI support to Cygwin 2017-02-07 16:19:41 -08:00
Jens Steube
9005b66626 Fixed clEnqueueNDRangeKernel(): CL_UNKNOWN_ERROR caused by an invalid work-item count during weak-hash-check 2017-02-07 17:50:02 +01:00
Jens Steube
c1f0adebe6 Force #pragma pack(1) for struct hccapx 2017-02-07 11:19:09 +01:00
Jens Steube
65d5921eda Merge pull request #1020 from neheb/master
Restore strerror as %m is unsupported by the BSDs
2017-02-06 19:37:05 +01:00
jsteube
717da7f4f2 Added support for loading hccapx files 2017-02-06 17:03:42 +01:00
Rosen Penev
2a2bd0e2b1
Restore strerror as %m is unsupported by the BSDs
The BSDs just print m instead of the actual error message. Benefit
is not worth the cost.
2017-02-03 17:53:50 -08:00
philsmd
15a9644f2a
fixes #943: added -m 15000 = FileZilla Server >= 0.9.55 2017-02-03 00:07:31 +01:00
philsmd
fe6309caa7
fixes #398: added -m 4110 md5($salt.md5($pass.$salt)) 2017-02-01 19:56:49 +01:00
philsmd
8e689058d0
#398: add -m 4010 = md5($salt.md5($salt.$pass)) 2017-02-01 16:56:14 +01:00
jsteube
2135ea3329 WPA: Changed format for outfile and potfile from essid:mac1:mac2 to hash:essid
WPA: Changed format for outfile_check from essid:mac1:mac2 to hash
2017-02-01 12:25:21 +01:00
philsmd
dfd4084b3b
fixes #963: show all user's hashes if --show/--left was specified 2017-02-01 09:00:16 +01:00
philsmd
ed74ce1aca
fixes #928: new mode -m 1411 = SSHA-256(Base64), LDAP {SSHA256} 2017-01-31 12:40:43 +01:00
jsteube
e0c3f447da Added hash-mode 4520 = sha1($salt.sha1($pass))
Added hash-mode  4522 = PunBB
OpenCL Kernel: Renumbered hash-mode 7600 to 4521
The mode 4520 is the first to support salt length up to 64
2017-01-31 11:44:58 +01:00
philsmd
96e312ccb6
fixes #537: added -m 7000 = Fortigate (FortiOS) 2017-01-30 21:18:37 +01:00
jsteube
1b8c2a29f1 Added hash-mode 14900 = Skip32 2017-01-29 16:43:08 +01:00
jsteube
dd263c1d20 Optimize luks_tmp_t type size 2017-01-29 10:39:45 +01:00
jsteube
e0189cb741 Fix some compiler warnings for older compilers 2017-01-29 10:23:34 +01:00
jsteube
2d2eadd2f6 Use hc_path_create() for additional write checks on startup 2017-01-28 00:08:12 +01:00
jsteube
ac5d274845 Sessions: Move out handling of multiple instance from restore file into separate pidfile 2017-01-27 16:29:18 +01:00
jsteube
84fcd8289f Files: Do several file and folder checks on startup rather than when they are actually used to avoid related error after eventual intense operations 2017-01-27 14:50:39 +01:00
jsteube
17548d3ee8 Helper: Added functions to check existence, type, read- and write-permissions and rewrite sources to use them instead of stat() 2017-01-27 11:46:45 +01:00
Jens Steube
07c89833c9 Added hash-mode 14800 = iTunes Backup >= 10.0 2017-01-26 21:16:29 +01:00
philsmd
9327475b41 added -m 14700 = iTunes Backup < 10.0 2017-01-25 19:07:07 +01:00
philsmd
297c797521
hook code: refactored the hook salt to be part of the hash_t struct 2017-01-24 15:23:48 +01:00
philsmd
6fe0173a79
#965: new hook function to support LZMA1/LZMA2 decompression for -m 11600 = 7-Zip 2017-01-24 10:28:35 +01:00
jsteube
53d467abf8 Fix travis-ci error caused by __builtin_bswapXX() 2017-01-21 18:03:47 +01:00
jsteube
8257883ec1 Added hash-mode 14600 = LUKS 2017-01-21 15:37:44 +01:00
jsteube
c7999c66bc Returncode: Added dedicated returncode (see docs/status_codes.txt) for shutdowns caused by --runtime and checkpoint keypress 2017-01-06 08:45:40 +01:00
jsteube
038b915e2d Fixed runtime limit: No longer required so sample startup time after refactorization 2017-01-05 22:34:47 +01:00
jsteube
1f266fb0f2 Added new event EVENT_WEAK_HASH_ALL_CRACKED if all hashes have been cracked during weak hash check 2017-01-03 09:56:40 +01:00
jsteube
dca74af23f Prepare for v3.30 release 2017-01-02 10:14:07 +01:00
jsteube
83151ec2bb Do not set _GNU_SOURCE if it's set already 2016-12-29 19:13:06 +01:00
jsteube
4a81601c0a Reenabled automatic status screen display in case of stdin used 2016-12-29 13:05:29 +01:00
Jens Steube
f22836b35e Switched matching xnvctrl device with OpenCL device by using PCI bus, device and function 2016-12-27 19:20:27 +01:00
Jens Steube
c77c9ff72e Switched matching NvAPI device with OpenCL device by using PCI bus, device and function 2016-12-27 17:41:29 +01:00
jsteube
ee6b81aa62 Add hm_NVML_nvmlDeviceGetPciInfo() for later use 2016-12-27 14:01:24 +01:00
jsteube
f0b287e838 Get rid of bin_to_hex_lower(), add u8_to_hex_lower(), u32_to_hex_lower() and u64_to_hex_lower() 2016-12-26 12:52:06 +01:00
jsteube
a077a72a4e Merge branch 'master' of https://github.com/hashcat/hashcat 2016-12-24 00:41:16 +01:00
jsteube
6ece83760d Add wrapping function for asprintf() 2016-12-24 00:40:40 +01:00
jsteube
fa5b5d298d Hash Parser: Improved error detection of invalid hex characters where hex character are expected 2016-12-23 14:57:46 +01:00
jsteube
72af615e8b WPA cracking: Reuse PBKDF2 intermediate keys if duplicate essid is detected 2016-12-22 02:17:49 +01:00
Gabriele Gristina
8b0764bc4d Add support for SHA-224 2016-12-16 02:05:12 +01:00
jsteube
72599fd109 Fixed kernel loops in leading to slower performance in --increment mode 2016-12-15 13:19:10 +01:00
jsteube
ec5610271a New option --progress-only: Quickly provides ideal progress step size and time to process it per device based on the user hashes and selected options, then quit 2016-12-09 23:44:43 +01:00
jsteube
1342cf2ce3 Use $HEX[...] in case the password includes the separater character, increases potfile reading performance 2016-12-09 14:54:13 +01:00
Rosen Penev
f27675a0ec
Only apply gnu_printf to MinGW 2016-12-03 16:04:38 -08:00
Rosen Penev
96591f3118
Replace ctime with _r variant 2016-12-02 21:32:18 -08:00
Rosen Penev
5c0bd0a15f
Remove strerror in favor of thread safe %m 2016-12-02 21:26:10 -08:00
jsteube
db8ce269b2 Remove no longer used type cpu_rule_t 2016-12-01 16:53:31 +01:00
Rosen Penev
4d09cc10fd
Fix some formats and conversion errors 2016-11-30 15:14:42 -08:00
jsteube
cad3b3e10b Get rid of truecrypt_mdlen 2016-11-30 11:41:31 +01:00
jsteube
3c40b88eff Status: Do not show Recovered/Time as floats but as integers to reduce over-information 2016-11-30 11:12:56 +01:00
Jens Steube
60bc53311c Merge pull request #891 from neheb/master
Fix compilation for native Cygwin
2016-11-30 00:29:42 +01:00
Rosen Penev
96783ed7a3 Fix compilation for native Cygwin 2016-11-29 14:10:39 -08:00
jsteube
db5291a76c Add special weak-hash detection section for LM
Fixes https://github.com/hashcat/hashcat/issues/889
2016-11-29 20:37:29 +01:00
jsteube
a048bdc02c Fix some variable names in hashcat.log 2016-11-22 18:39:02 +01:00
jsteube
7ca6a45781 Add some hint about performance for new users 2016-11-21 18:30:36 +01:00
jsteube
06c1d4a52e Hardware-Management initialization refactor, to show HM related errors only once on startup 2016-11-21 15:58:44 +01:00
jsteube
ea4fd1de50 Remove complicated checks after memory allocation and in case of error print to stderr instead. This makes the memory allocation functions more natural to use. 2016-11-20 22:54:52 +01:00
jsteube
0c55626689 Remove kernel exec timeout detection, should no longer occur due to autotune 2016-11-19 16:57:24 +01:00
jsteube
e8078f2c73 Add output buffer size to ascii_digest() 2016-11-19 16:10:01 +01:00
jsteube
105513e307 On OSX, unset device_param->skipped back to true in case skipped_temp is set to true 2016-11-18 10:26:48 +01:00