arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-25 16:08:18 +00:00
Code Issues Releases Wiki Activity
3,696 Commits 1 Branch 27 Tags 209 MiB
990a72affe
Commit Graph

1767 Commits

Author SHA1 Message Date
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
Royce Williams
37b870fa44 add help for new hash-mode 15100 - Juniper/NetBSD sha1crypt 2017-03-23 16:48:22 -08:00
jsteube
d1b2fa0b31 Added hash-mode 15100 = Juniper/NetBSD sha1crypt 2017-03-23 16:44:32 +01:00
jsteube
826de76bd6 Fix invalid strdup of NULL in stdin mode 2017-03-23 16:41:12 +01:00
philsmd
d60d6f9625
fix for previous commit: make sure that we do not override the hccapx structure values 2017-03-22 12:53:50 +01:00
philsmd
07c748e136
fixes #1199: introduce special bit (8) in message_pair (HCCAPX) to indicate if replay counter match 2017-03-22 12:09:15 +01:00
philsmd
c54b85a3be minor: cleaned up code and updated docs wrt #1195 2017-03-22 11:52:08 +01:00
Jens Steube
4647788280 Merge pull request #1195 from syntaxmonkey/patch-1 
Update outfile.c
 2017-03-22 11:05:43 +01:00
jsteube
a30a9f5b45 Fixed a hash validation error when trying to load Android FDE < 4.3 hashes 2017-03-21 14:07:16 +01:00
syntaxmonkey
85bcdd5ea7 Update outfile.c 2017-03-20 09:24:49 -04:00
syntaxmonkey
f623217a2b Update outfile.c 
Fix #1194.
crackpos was not being output properly when "--outfile-format 11" was used.
 2017-03-19 20:54:25 -04:00
Jens Steube
c7ed2ade17 Fixed a race condition when a session finishes the input-base was freed but accessed afterwards 
Fixes https://github.com/hashcat/hashcat/issues/1192
 2017-03-19 20:41:50 +01:00
jsteube
9558fcc012 Reset optind and optopt for second getopt loop 2017-03-19 15:27:43 +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
d78a58414c Parameter: Detect and warn when users try to use an empty string (length 0) for parameters like --session= 
Fixes https://github.com/hashcat/hashcat/issues/1190
 2017-03-19 14:18:11 +01:00
jsteube
53acb98cf8 Files: Detect and warn when users try to use -r with a parameter which is not a file 
Fixes https://github.com/hashcat/hashcat/issues/1191
 2017-03-19 13:59:36 +01:00
jsteube
20057d8516 Roll back status view progress percentage in case -s was used 2017-03-15 16:15:37 +01:00
jsteube
72071fba87 Do not try to use save_hash() in case hashlist_mode == HL_MODE_FILE 2017-03-14 08:51:53 +01:00
jsteube
e9d5b6d44d Merge branch 'master' of https://github.com/hashcat/hashcat 2017-03-13 23:00:33 +01:00
jsteube
7e449e75d1 Fixed status view progress percentage in case -s was used 2017-03-13 23:00:17 +01:00
philsmd
ae3fb3516b
remove: do not remove hashes unless --remove was specified 2017-03-13 22:42:51 +01:00
Jens Steube
963a9772ba Fixed --remove was not applied in case all hashes have been cracked by help of potfile or weak-hash check 2017-03-12 11:05:37 +01:00
philsmd
4021d5744c
fixes #1175: custom charsets and --stdout triggered a missing mask error 2017-03-11 08:25:58 +01:00
Jens Steube
30546ea425 Merge pull request #1173 from philsmd/master 
minor: fixed some comments about --skip/--limit/--keyspace
 2017-03-11 00:03:11 +01:00
jsteube
2bc65c2c4d A bit a different _comp kernel iteration for WPA which can have lots of handshakes 2017-03-10 19:54:00 +01:00
philsmd
b2d88a0832
minor: fixed some comments about --skip/--limit/--keyspace 2017-03-10 12:49:57 +01:00
philsmd
269b1ee6a5
renamed ST_9998 -> ST_0011 2017-03-08 08:46:42 +01:00
philsmd
9b0821bb20
fixes #1162: visual indication if checkpoint quit is enabled 2017-03-07 23:06:50 +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
67159b1936 Update Makefile: we're currently not in PRODUCTION=1 phase 2017-03-07 13:11:09 +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
Jens Steube
af39f63e6f Merge pull request #1161 from philsmd/master 
fixes #1160: parsing/displaying -m 7000 = Fortigate hashes
 2017-03-05 21:20:57 +01:00
philsmd
a2708e1063
fixes #1160: parsing/displaying -m 7000 = Fortigate hashes 2017-03-05 17:14:55 +01:00
Rosen Penev
df3c2e712e
Change c99 to gnu99. _GNU_SOURCE conflicts with c99 2017-03-04 18:51:46 -08:00
Rosen Penev
a7d9e242ac
Linux ifdefs atime to atim. No need for this 2017-03-04 18:27:33 -08:00
philsmd
522c047860
min pass length init: typo fixed 2017-03-04 20:02:47 +01:00
philsmd
0a8b139ae3
minor: comment fix, rephrase the explanation of the conditional expression 2017-03-04 09:03:16 +01:00
philsmd
8bd6001072
fixes #1153: incorrect error message when --keyspace combined with custom charsets was used 2017-03-04 08:58:22 +01:00
jsteube
6b77606bdd Fixed recursion in loopback handling when session was aborted by the user 2017-03-02 23:30:43 +01:00
jsteube
ce337c5863 Replace __builtin_clz() and __builtin_clzll() with some straight forward solution 2017-03-02 23:12:31 +01: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
jsteube
5f7c3590ba Status screen: Do not try to clear prompt in --quiet mode 2017-03-01 21:42:17 +01:00
mhasbini
a415ec7afb fix rule 'i' in host mode in case pos = length 2017-03-01 21:05:27 +02:00
philsmd
22d1129818
added -m 12001 = Atlassian (PBKDF2-HMAC-SHA1) #611 2017-02-28 14:22:03 +01:00
jsteube
da93d216da Update for scrypt patch 2017-02-28 12:45:26 +01:00
jsteube
b2684553f0 In scrypt we really need to get all memory we can get, thus we workaround the 1/4 limit by allocating 4 blocks but this can eventually be larger than the total maximum available memory 2017-02-28 12:12:06 +01:00
jsteube
6f33d799c2 Remove temporary 2gb limit testwise 2017-02-28 12:11:20 +01:00
jsteube
c47f9d4b3e Fix a bug in wpa_essid_reuse_next() destroying reuse PBKDF2 intermediate keys if duplicate essid logic 2017-02-28 10:20:46 +01:00
jsteube
fea62b78dc Fixed cracking of Plaintext (-m 99999) in case MD4 was used in a previous session 2017-02-28 09:55:38 +01:00
jsteube
d431874cef Merge branch 'master' of https://github.com/hashcat/hashcat 2017-02-27 14:47:49 +01:00
jsteube
708adbc54b Fixed cracking of Plaintext (-m 99999) in case MD4 was used in a previous session 2017-02-27 14:47:41 +01:00
Jens Steube
e82ce9243d Added support for filtering hccapx message pairs using --hccapx-message-pair 2017-02-27 12:09:49 +01:00
Jens Steube
0fc949ef69 Fixed cracking of PeopleSoft Token if salt length + password length is >= 128 byte 2017-02-27 11:06:53 +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
de186ceda5 Fix some typo 2017-02-23 18:34:51 +01:00
jsteube
f381b107a3 Remove some unused variable 2017-02-23 12:15:19 +01:00
jsteube
877b3fdc4d Fix some case to make GCC on OSX happy 2017-02-23 12:05:35 +01:00
jsteube
d6b843901b In case of multiline error message use only the first line as error and the description as warning 2017-02-23 11:59:34 +01:00
jsteube
aa5ed1ca89 OpenCL Runtime: Added a warning about using Mesa OpenCL runtime 2017-02-23 11:48:21 +01:00
jsteube
4e2adc031a Add some compiler independant integer overflow functions 2017-02-23 10:39:17 +01:00
jsteube
7797826c8d Continue with WPA hashing logic as it was already 2017-02-23 09:46:26 +01:00
jsteube
57371376a3 Fix some formating from merged PR 2017-02-23 09:45:31 +01:00
jsteube
d8e056d59f Also add WPA keymic to parser hash 2017-02-23 00:49:12 +01:00
Jens Steube
f302576a79 Merge pull request #1125 from yhfudev/opencl_error_messages 
a complete opencl error messages
 2017-02-22 20:55:38 +01:00
yhfudev
eba49f0dae a complete opencl error messages 2017-02-22 12:45:07 -05:00
Timo Juhani Lindfors
289744e7a3 Fix spelling of MHz 2017-02-22 19:34:33 +02:00
jsteube
922fea7616 Add more integer overflow checks 2017-02-22 16:33:23 +01:00
jsteube
080131c86e Use type independant __builtin_mul_overflow() 2017-02-22 12:36:05 +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
Jens Steube
2dd027af65 Make sure to zero scratch buffer for WPA/WPA2 and LUKS 2017-02-21 13:09:00 +01:00
jsteube
5f58a25dcc Building: Removed compiler option -march=native as this created problems for maintainers on various distributions 2017-02-20 18:45:04 +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
5ec763fa20 Let is_hexify() call is_valid_hex_string() for better verification 2017-02-19 14:51:45 +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
778f568d91 Prepare for v3.40 release 2017-02-17 18:28:16 +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
jsteube
ef004e85f0 Fix some variable initializationg warnings in older GCC 2017-02-16 10:10:38 +01:00
jsteube
0aca372ce8 Hardware Monitor: In case NVML initialization failed, do not try to initialiaze NVAPI or XNVCTRL because they both depend on NVML 2017-02-15 19:43:22 +01:00
philsmd
bd9fdc1849
use putenv () with the COMPUTE environment as it was before 2017-02-15 14:32:24 +01:00
Jens Steube
f31330679f Revert "tainted string: test number 2, try to limit the length of the compute variable" 2017-02-15 14:18:11 +01:00
Jens Steube
899b120316 Revert "tainted string: maybe strdup () helps us out" 2017-02-15 14:17:48 +01:00
philsmd
0ca0448bd9
tainted string: maybe strdup () helps us out 2017-02-15 13:57:07 +01:00
philsmd
d21fbe0b2f
tainted string: test #2, try to limit the length of the compute variable 2017-02-15 13:45:02 +01:00
jsteube
7858f37800 Fix for CID 1402403 2017-02-15 13:27:33 +01:00
jsteube
e47932262d Fix uint datatype (should be u32) 2017-02-15 13:26:02 +01:00
philsmd
6eaa7e3741
tainted string fix: check some lower/upper bounds of the strings 2017-02-15 13:19:53 +01:00
philsmd
98129da7dc
add dummy check around hashcat_get_status () within inner2_loop to make coverity happy 2017-02-15 12:57:18 +01:00
philsmd
fe33957303
rule engine: prevent integer underflow and dead code 2017-02-15 12:41:32 +01:00
jsteube
b4bfade4ec Merge branch 'master' of https://github.com/hashcat/hashcat 2017-02-15 12:36:09 +01:00
jsteube
b381b38fd8 Fix CID 1402374 2017-02-15 12:36:03 +01:00
philsmd
1a0b1cd144
cpu MD5: use smaller than (<) instead of != to make coverity happy 2017-02-15 12:11:18 +01:00
jsteube
8b28940630 Merge branch 'master' of https://github.com/hashcat/hashcat 2017-02-15 12:09:30 +01:00
jsteube
104958af2d Fix CID 1402413 2017-02-15 12:09:14 +01:00
philsmd
12517f1b7a
typo: don't add URI_prefix_len and URI_suffix_len twice 2017-02-15 11:50:35 +01:00
philsmd
02480f906a
prevent buffer overflow in case of OPTS_TYPE_ST_ADD80 and/or OPTS_TYPE_ST_ADD01 2017-02-15 11:33:52 +01:00
philsmd
0993f2e748
fixed maximum salt_len for pbkdf2 buffers 2017-02-14 22:05:47 +01:00
philsmd
54915e4d7b
minor: do not use UINT_MAX as upper bound for the salt_len 2017-02-14 21:54:49 +01:00
philsmd
f351461ecd
max esalt_buf for sip fixed: we also need to append 0x80 2017-02-14 21:45:18 +01:00
jsteube
be3ce44f75 Fix CID 1402444 (#1 of 1): Out-of-bounds read 2017-02-14 21:40:11 +01:00
philsmd
056d1f3da4 minor: use 2 distinct return value to avoid dead code detections 2017-02-14 21:24:45 +01:00
jsteube
f61788eac1 Merge branch 'master' of https://github.com/hashcat/hashcat 2017-02-14 21:22:04 +01:00
jsteube
0642639b81 CID 1402417 (#1 of 1): Division or modulo by float zero 2017-02-14 21:21:24 +01:00
philsmd
1f88ae42ef
dead code: hash_len is always > 0 at this location 2017-02-14 21:09:04 +01:00
jsteube
ed772a02a4 Check for at least one active OpenCL device before running weak-hash-check 2017-02-14 21:05:44 +01:00
philsmd
9ed93fcce9
dead code: here we do not need to check for NULL 2017-02-14 21:01:52 +01:00
jsteube
6bcfca26b3 Fix CID 1402873: Dereference before null check 2017-02-14 20:53:42 +01:00
philsmd
f535eb2bd0
always check the input for NULL before the strtok_r () calls 2017-02-14 20:46:03 +01:00
Jens Steube
f9bbd42b4a Merge pull request #1092 from philsmd/master 
fix our usage of strtok_r (), it was not 100% correct
 2017-02-14 20:12:18 +01:00
philsmd
12047861c5
also double-check input/output of strtok_r () 2017-02-14 20:07:49 +01:00
jsteube
4b3d39623c Restore: Add some checks on the rd->cwd variable in restore case 2017-02-14 20:05:44 +01:00
jsteube
b2dbd22979 Moved datatype from double to u32 in autotune.c as this makes no difference 2017-02-14 19:51:49 +01:00
philsmd
a82f6fb77c
our usage of strtok_r () was not totally correct (but almost) 2017-02-14 19:48:07 +01:00
philsmd
e5ecbb9a59
minor: within parse_and_store_salt () do the initialization of the buffer at the very start 2017-02-14 19:30:36 +01:00
Jens Steube
33da74f6db Merge pull request #1090 from philsmd/pr/hwmon_step_fix 
minor: the step value should never be zero
 2017-02-14 19:25:46 +01:00
philsmd
5ea1bd2a99
minor: the step value should never be zero 2017-02-14 19:22:51 +01:00
philsmd
05f8abdbe7
minor: useless code (since we removed the swaps) 2017-02-14 19:17:45 +01:00
philsmd
f87c65d081
minor: check return value of hc_stat () and use fclose () in case of error 2017-02-14 19:12:24 +01:00
philsmd
7818712090
minor: check for return value of sscanf () within the zip2 parse function 2017-02-14 18:58:25 +01:00
philsmd
9efc429928
dead code: in office parse functions 2017-02-14 18:49:35 +01:00
philsmd
94a37157c1
dead code: both hashes_avail and hash_len can't be 0 here 2017-02-14 18:33:53 +01:00
philsmd
4eadbf221e
dead code: already implied length within the android fde parsing function 2017-02-14 18:25:20 +01:00
philsmd
8fa361dffa
dead code: already implied length within the android fde parsing function 2017-02-14 18:22:46 +01:00
jsteube
d069c980d0 Testfix for CID 1402439 (#1 of 1): Out-of-bounds read 2017-02-14 18:07:33 +01:00
jsteube
958ca90132 Test failed to workaround coverity false-positive 2017-02-14 17:59:23 +01:00
Jens Steube
b682091155 Merge pull request #1082 from philsmd/master 
we always need to check for NULL after strchr ()
 2017-02-14 17:55:37 +01:00
jsteube
231592101e Test commit to workaround coverity false-positive 2017-02-14 17:54:36 +01:00
philsmd
d366a93bb3
we always need to check for NULL after strchr () 2017-02-14 17:54:18 +01:00
philsmd
49ba6cb05d
-m 13100 = Kerberos 5 TGS-REP: parser failed to correctly verify the hash 2017-02-14 17:45:05 +01:00
philsmd
6915bfad8b
keyfiles: for VeraCrypt/TrueCrypt keyfiles we need to free the memory in case of errors 2017-02-14 17:32:39 +01:00
philsmd
23368c7304
fix: added additional fclose () whenever an hash parsing error occurs 2017-02-14 17:22:52 +01:00
jsteube
906bcf52f9 CID 1402488 (#1 of 1): Resource leak 2017-02-14 17:18:57 +01:00
jsteube
7f3d107129 Fixed pointer to local outside scope in case -j or -k is used 2017-02-14 17:13:36 +01:00
Jens Steube
a3efaa219c Merge pull request #1078 from philsmd/master 
if fstat () fails we shouldn't forget to close the file
 2017-02-14 17:08:25 +01:00
jsteube
6eb4747dce Merge branch 'master' of https://github.com/hashcat/hashcat 2017-02-14 17:08:10 +01:00
jsteube
cc223123e9 OpenCL Kernel: Refactored read_kernel_binary to load only a single kernel for a single device 2017-02-14 17:08:08 +01:00
philsmd
d20079bfe1
if fstat () fails we shouldn't forget to close the file 2017-02-14 17:05:35 +01:00
Jens Steube
bcb05697c0 Merge pull request #1077 from philsmd/master 
if fstat () fails we shouldn't forget to close the file
 2017-02-14 17:04:40 +01:00
philsmd
aed01460f2
if fstat () fails we shouldn't forget to close the file 2017-02-14 17:02:52 +01:00
jsteube
5a2e7f2a3a CID 1402490 (#1 of 1): Resource leak 2017-02-14 17:02:08 +01:00
jsteube
dcdafdbc08 CID 1402467 (#1 of 1): Resource leak 2017-02-14 17:01:13 +01:00
jsteube
b2c9172f65 Fix missing free() in pidfile.c 2017-02-14 16:58:18 +01:00
jsteube
20ab1af2b3 OpenCL Kernel: Move kernel binary buffer from heap to stack memory 2017-02-14 16:56:41 +01:00
philsmd
f2b370e470
file locking: for windows we need to just return 0 (otherwise compiler complains) 2017-02-14 16:53:01 +01:00
Jens Steube
7209b0562a Merge pull request #1075 from philsmd/master 
mp: memory checks added to avoid leaks
 2017-02-14 16:51:29 +01:00