1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-26 00:18:36 +00:00
Commit Graph

2010 Commits

Author SHA1 Message Date
jsteube
ccc9e46508 Vectorized Android FDE <= 4.3 kernel and added support for passwords up to length 256 2017-07-03 11:29:32 +02:00
jsteube
b149b87014 Update converted modules in interface.c 2017-07-01 14:50:39 +02:00
jsteube
52c1e15f3f Move kernel-code for -L to standalone files with -pure suffix 2017-07-01 13:02:07 +02:00
jsteube
194af74e91 Add support for maximum bcrypt password length 2017-07-01 11:04:59 +02:00
jsteube
c3f374c733 Fix some maximum password length handling with --length-limit-disable feature 2017-06-30 17:28:19 +02:00
jsteube
f97c0d38d7 Allow using -L with -a 7 (other modes need no modification) for fast hashes 2017-06-30 16:51:57 +02:00
jsteube
f7a8e7c54b Multiple changes:
* Added more preparations to support to crack passwords and salts up to length 256
* Added option --length-limit-disable to disable optimization based on password- and salt-length
* Added option --self-test-disable to disable self-test functionality on startup
2017-06-29 12:19:05 +02:00
jsteube
6fb79b726c Respect the use of OPTI_TYPE_PRECOMPUTE_MERKLE in interface.c parser 2017-06-28 13:46:03 +02:00
jsteube
c918173fcf Get rid of comb_t which can be safely replace with pw_t now 2017-06-25 00:56:25 +02:00
jsteube
297a64de8b Fix fread() on windows when loading the LZMA hcstat 2017-06-24 11:00:43 +02:00
jsteube
83d5302256 Fix install makefile target for use with hashcat.hcstat2 2017-06-24 10:50:39 +02:00
jsteube
7ca8ca241b Use hc_lzma2_decompress() instead of Lzma2Decode() directly 2017-06-23 14:50:44 +02:00
jsteube
a993395f28 Add code to read LZMA compressed hashcat.hcstat2 2017-06-23 14:43:43 +02:00
jsteube
c59432a760 Add hcstat2 support to enable masks of length up to 256, also adds a filetype header 2017-06-23 12:13:51 +02:00
jsteube
71d4926afa Converted -m 400 to password length 256 support
Something weird happend here, read on!

I've expected some performance drop because this algorithm is using the password data itself inside the iteration loop.
That is different to PBKDF2, which I've converted in mode 2100 before and which did not show any performance as expected.

So after I've finished converting this kernel and testing everything works using the unit test, I did some benchmarks to see how much the
performance drop is.

On my 750ti, the speed dropped (minimal) from 981kH/s -> 948kH/s, that's mostly because of the SIMD support i had to drop.
If I'd turn off the SIMD support in the original, the drop would be even less, that us 967kH/s -> 948kH/s which is a bit of a more reasable
comparison in case we just want to rate the drop that is actually caused by the code change itself.

The drop was acceptable for me, so I've decided to check on my GTX1080.Now the weird thing: The performance increased from 6619kH/s to
7134kH/s!!

When I gave it a second thought, it turned out that:

1. The GTX1080 is a scalar GPU so it wont suffer from the drop of the SIMD code as the 750ti did
2. There's a change in how the global data (password) is read into the registers, it reads only that amount of data it actually needs by using
the pw_len information
3. I've added a barrier for CLK_GLOBAL_MEM_FENCE as it turned out to increase the performance in the 750ti

Note that this kernel is now branched into password length < 40 and larger.

There's a large drop on performance where SIMD is really important, for example CPU.

We could workaround this issue by sticking to SIMD inside the length < 40 branch, but I don't know yet how this can be done efficiently.
2017-06-22 13:49:15 +02:00
Jens Steube
8d93b160c4 Combinator mode for slow hashes wasn't set since self-test functionality was added 2017-06-22 10:49:57 +02:00
jsteube
83455817a7 Working example of password up to length 256 for mode 2100 2017-06-20 17:30:07 +02:00
jsteube
ad242c2f12 Working example of generic salt up to length 256 for mode 2100 2017-06-20 17:17:13 +02:00
jsteube
4174f06008 PoC using a length-independant MD4 hash processing in -m 2100 2017-06-18 23:31:40 +02:00
jsteube
a673aee037 Very hot commit, continue reading here:
This is a test commit using buffers large enough to handle both passwords and salts up to length 256.
It requires changes to the kernel code, which is not included in here.
It also requires some of the host code to be modified. Before we're going to modify kernel code to support the larger lengths I want to be
sure of:
1. Host code modification is ok (no overflows or underflows)
2. Passwords and Salts are printed correctly to status, outfile, show, left, etc.
3. Performance does not change (or only very minimal)
This is not a patch that supports actual cracking both passwords and salts up to length 256, but it can not fail anyway.
If if it does, there's no reason to continue to add support for both passwords and salts up to length 256.
2017-06-17 17:57:30 +02:00
jsteube
7905d79a28 Limit -m 2100 password length to 27 because if utf16 2017-06-16 23:17:56 +02:00
jsteube
c9caca2b0c Increase max password length for DCC2 to 32 2017-06-16 19:28:55 +02:00
jsteube
2c95be5c87 Do not modify a specific thread count if a kernel forces it to run on a specific thread count 2017-06-16 14:02:15 +02:00
Jens Steube
1ef4abae70 Set self-test kernel-thread always to 1 except it's a bitsliced algorithm in BF, this helps algorithms that set a fixed thread count on kernel function declaration 2017-06-16 13:28:56 +02:00
jsteube
d7e66996c9 Add support for self-test modes that use a binary hashfile (wpa, tc, vc, etc) 2017-06-14 14:05:50 +02:00
jsteube
94a35ae50a Add support for hooks in selftest function 2017-06-14 12:07:33 +02:00
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
jsteube
9a8f4036ec Set github master back into development mode 2017-06-10 13:02:20 +02:00
Jens Steube
acd93cf780 Mark release for production 2017-06-09 17:37:01 +02:00
Jens Steube
5be3840d9a Add some hint for the user to a scrypt error message 2017-06-09 10:20:05 +02:00
Jens Steube
7e5b8d3f25 Added hash-mode 15500 = JKS Java Key Store Private Keys (SHA1) 2017-06-09 09:56:06 +02:00
Jens Steube
9d49ae547b Merge pull request #1271 from DoZ10/chacha20
Chacha20: Fixed error in format parser separator validation
2017-06-08 19:15:25 +02:00
DoZ10
e6c549e4a0 Complied with other parsers coding style 2017-06-07 08:28:13 -04:00
DoZ10
531473cc72 Fix. Added undef INVALID_SEPARATOR_POINTER 2017-06-06 13:29:50 -04:00
DoZ10
990a72affe Fixed error in separator check 2017-06-06 13:26:10 -04:00
Royce Williams
b9d68d2377 $chacha20$ (all lower case) per @magnumripper 2017-06-06 04:51:32 -08:00
Chick3nman
e7c36bc97f Cosmetic change
Fixed column spacing for modes 9810/9820
2017-06-06 03:21:31 -05:00
Chick3nman
6a38f3c477 Fixed mode 9810/9820 labeling
Removed $4 from label to avoid confusion.
2017-06-06 03:16:29 -05:00
Chick3nman
a973d4b94b Fixed mode 9810/9820 labeling
Removed $4 from label to avoid confusion.
2017-06-06 03:09:50 -05: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
Royce Williams
3fc185a66b tidy changes.txt and name normalizations 2017-06-04 13:54:41 -08: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
3d888b6b2d it's possible to crack scrypt on GPU even with higher scrypt setting
the trick is to intentionally under-utilize the GPU warps
120H/s on my 4*1080: https://pastebin.com/z124G2cN
2017-06-04 15:49:09 +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
Jens Steube
ab2610d9df Also add reduced startup time for GPU for scrypt 2017-06-03 19:36:19 +02:00
Jens Steube
872f2b4f8b Improve scrypt cracking speed on CPU by 20%, preparation for Ethereum KDF 2017-06-03 19:19:03 +02:00
jsteube
b5f149476d Trim OpenCL device name whitespaces 2017-06-02 10:08:19 +02:00
magnum
291c9f22fe Mute gcc 7.1.1 warnings about intentional fall-throughs. See #1264. 2017-06-01 00:03:26 +02:00
Christopher Schmitt
4c45939aa7 opencl_ctx_devices_destroy should be before opencl_ctx_destroy 2017-05-30 12:19:43 -04:00
jsteube
23b5e7f10e Fix compiler warnings for 32 bit windows by changing datatype for parameter 1 for gmtime_r() 2017-05-30 15:03:43 +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
Fist0urs
f8c3fecec3 interface.c: dpapimk_parse_hash, fix signed/unsigned comparison 2017-05-19 14:49:42 +02:00
mhasbini
1330424079 Add support for rejection rule _N 2017-05-19 15:13:07 +03:00
Christopher Schmitt
efd18121d5 Review/Style Changes 2017-05-19 08:09:14 -04:00
Christopher Schmitt
b5f5591b1a main_monitor_status_refresh shouldnt call status_display if status_ctx is not accessible 2017-05-18 10:36:14 -04: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
aa14b4ec9e
for -m 11600 = 7zip we need to remove special case, since the padding attack is now gone 2017-05-17 14:15:13 +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
DoZ10
6ced398c3c Addressed comments and added 15400 to benchmark.c and tab_completion 2017-05-17 07:35:56 -04:00
jsteube
7bd391df71 Fixed a condition that caused a hybrid attack using a maskfile to not select all wordlists from a wordlist folder
Fixes https://github.com/hashcat/hashcat/issues/1244
2017-05-17 12:33:46 +02:00
jsteube
bb2118a290 Workaround added for NVidia NVML library: If libnvidia-ml.so couldn't be load try again using libnvidia-ml.so.1 2017-05-17 11:21:06 +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
8b6120243d Applied performance changes and fixed multi-mode bad implementation 2017-05-16 19:59:46 -04:00
Jens Steube
2eabc360d7 Merge pull request #1238 from Fist0urs/DPAPImk
Add new format -m 15300 Dpapi master key file version 1 and version 2
2017-05-16 11:00:38 +02:00
DoZ10
264ec951c2 Enhanced test.pl for 15400 and removed endianess confusion 2017-05-15 19:21:49 -04:00
DoZ10
6af53218d4 Cleanup 2017-05-15 18:37:39 -04:00
DoZ10
8dfd1bf066 Final. Implemented offset parameter to reach next keystream in kernels. Tested all kernels with scalar and vector modes 2017-05-15 18:34:34 -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
f0842f6d17 Implemented size and hex checks in interface.c 2017-05-14 07:32:33 -04: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
Royce Williams
b4264c7d0a minor grammar when restore value is greater than keyspace 2017-05-11 06:02:33 -08:00
DoZ10
9c311091d0 Fixed pw_max to 32 2017-05-09 21:31:07 -04:00
Fist0urs
7ff09c6710 Preparing PR 2017-05-09 20:14:07 +02:00
DoZ10
a208007d9d Removed forgotten comment. 2017-05-08 20:04:58 -04:00
DoZ10
83bb3dc06a Undo test. 2017-05-07 14:23:45 -04: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
fb86f89f63 Fixed print output endianess in interface.c 2017-05-05 09:23:14 -04: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
Fist0urs
29d331ee17 hmac-sha1 + SID almost working, padding problem 2017-05-02 23:56:00 +02:00
DoZ10
31fbe481fa Fixed final details 2017-05-02 07:17:29 -04:00
DoZ10
86de556446 Removed cpu_blake.c since not used for now 2017-05-01 20:05:03 -04: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
98b9e38d54 Fix for app compilation error on mingw 2017-04-30 21:31:51 -04:00
DoZ10
f0f96140b2 Fixed Attack modes 1 & 3 2017-04-30 21:10:54 -04: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
e71c68e0af Fixed endianness to remove unecessary kernel swaps ops 2017-04-29 22:10:06 -04:00
DoZ10
58c1f46b19 Merge and conflict resolve. 2017-04-24 21:47:35 -04:00
DoZ10
e23f88fec8 Fixed Test files to match output. $Blake2$ Tag added to interface hash output 2017-04-23 10:28:58 -04:00
DoZ10
de477580a0 Code Cleanup and short doc additions 2017-04-22 21:50:22 -04:00
DoZ10
a60cddc2cc Added Blake2 signature according for JtR format. 2017-04-22 07:35:22 -04:00
DoZ10
f56ffdc32f Removed OPTS_TYPE_ST_ADDBITS15 2017-04-20 19:17:36 -04:00
DoZ10
3cc681989c fix: changed salt configuration. 2017-04-20 19:09:03 -04:00
DoZ10
afdef5ce1c fix: Kernel m00600_a3.cl function s04. 2017-04-19 13:27:28 -04:00
Jens Steube
086a07264a Switch from libiconv to win-iconv 2017-04-19 12:58:25 +02:00
Jens Steube
79609e8a54 Building: On binary release package, link libiconv static for windows binaries 2017-04-19 10:51:28 +02:00
DoZ10
c2af1e7c5c undo: debug 2017-04-16 11:55:21 -04:00
DoZ10
c0cedbf15f add: now target hash is okay. 2017-04-16 11:28:06 -04:00
DoZ10
d5ca5d59db add: lots of things.... 2017-04-16 10:07:12 -04: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
e3cef832be Use the ROUNDS_MYWALLET instead of a hard-coded value 2017-04-16 12:47:14 +02:00
Pierre-Antoine Haidar-Bachminska
4e30ec5489 Fix compilation error on macOs (missing iconv linking) 2017-04-14 18:54:34 +02:00
Royce Williams
54aaa1597e fix usage for encoding-to 2017-04-14 06:41:32 -08: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
25e061ce1c fix: syntax bug.. 2017-04-13 20:26:21 -04:00
DoZ10
0a8f17c24a fix: g madness... 2017-04-13 17:33:08 -04:00
DoZ10
bf45f87d39 random work... 2017-04-13 17:06:48 -04:00
DoZ10
4e9bb8b093 init 2017-04-13 08:38:59 -04:00
Jens Steube
fab4ede364 Merge pull request #1223 from stephengroat/patch-1
fix strings
2017-04-11 14:41:37 +02:00
jsteube
318ba234f8 OpenCL Runtime: Updated AMDGPU-Pro driver version check, do warn if version 17.10 is detected which is known to be broken 2017-04-11 13:33:25 +02:00
sgroat
21efc80975 fix string 2017-04-10 13:35:01 -07:00
magnum
ba0b2ee641 Ensure 'make clean' is a safe operation (eg. do not remove output and
session files). Add a 'make distclean' target for removing such files
as well. Closes #1218.
2017-04-06 11:39:29 +02:00
Royce Williams
b668aa2a81 label for 5700 Cisco type 4; update readme.txt 2017-04-04 05:14:08 -08:00
Royce Williams
4a393cacf6 5800 is Samsung only 2017-04-04 05:03:01 -08:00
Royce Williams
8620e4113f a few minor hash-mode name fixes 2017-04-03 06:55:35 -08:00
Royce Williams
46b83926fa clarify and standardize hash-mode names 2017-04-03 00:16:56 -08:00
Royce Williams
9074693e6f standardize usage output 2017-04-02 20:23:07 -08:00
Royce Williams
be4cf9ef67 more event_log_* standardization 2017-04-02 00:18:59 -08:00
Royce Williams
067372f5ce more event_log_* standardization 2017-04-01 23:50:06 -08:00
jsteube
f1c7b60d6a Status View: Add rejected counter to machine readable output
Fixes https://github.com/hashcat/hashcat/issues/1213
2017-03-30 09:47:52 +02:00
jsteube
0f1d68c358 Update fixed length for compress_terminal_line_length for hash target 2017-03-28 16:43:08 +02:00
jsteube
98cedd9422 Remove unused argument 2017-03-27 10:35:31 +02:00
jsteube
c3e118f5ea Instead of checking some path checks to result in files change it to disallow folders 2017-03-27 10:27:53 +02:00
Royce Williams
68ae2bc791 event_log_: length <80, end logs with '.', grammar 2017-03-25 22:49:13 -08:00
jsteube
368f8b39bc Add function to distinguish between warning and advice messages 2017-03-25 20:50:37 +01:00
jsteube
99fbaa8bcc Dictionary Cache: Split long status line into multiple lines to stay < 80 chars 2017-03-25 16:11:01 +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
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