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

705 Commits

Author SHA1 Message Date
jsteube
c8858cd969 Abort session after NUM seconds of --runtime but do not count time in pause mode
From https://github.com/hashcat/hashcat/issues/472
2016-09-03 15:27:25 +02:00
Jens Steube
a289c37ecf Allow loading of bcrypt hashes with signature $2b$ (February 2014) 2016-09-02 10:03:22 +02:00
Jens Steube
54249835f4 Merge pull request #482 from neheb/master
Fix some more warnings.
2016-09-01 16:53:58 +02:00
Rosen Penev
edb07bc6c7
Missed a few 2016-08-30 18:19:09 -07:00
Rosen Penev
ed1ad9714d
Fix -Wmissing-declarations 2016-08-30 18:13:41 -07:00
jsteube
71a8459d85 Two new modes added:
* Added new hash-mode 14000 = DES (PT = $salt, key = $pass)
* Added new hash-mode 14100 = 3DES (PT = $salt, key = $pass)
This patch initial was created out of this PR: https://github.com/hashcat/hashcat/pull/452 which is now no longer required
I've replace the -a 3 kernel with a bitsliced version which is around 10 times faster
I've also added test.sh and test.pl patches, but some of the test scripts need to be fixed
2016-08-30 17:44:14 +02:00
Rosen Penev
88519f9437
Fix -Wfloat-conversion warnings 2016-08-28 12:44:19 -07:00
neheb
242e1c49d8 Fix for #473
__x86__ is not defined under 32-bit MinGW. But WIN32 is. WIN64 for consistency.
2016-08-27 17:45:56 -07:00
Rosen Penev
d666191d67
Sign fixes 2016-08-26 22:27:44 -07:00
Rosen Penev
c495f6a090
Remove unreachable code: break 2016-08-26 22:27:37 -07:00
Rosen Penev
aeee10fbeb
Fix -Wundef warnings 2016-08-26 22:27:33 -07:00
Rosen Penev
be47aebc24
Avoid float to double promotions 2016-08-26 22:27:30 -07:00
Rosen Penev
a0b89951c1
More sign conversion fixes 2016-08-19 15:56:43 -07:00
Jens Steube
57ce1fd81e Add program build info for MP and AMP kernels 2016-08-18 21:59:30 +02:00
jsteube
b22bcd0602 Give better logging, even in production release, in case of a kernel build error 2016-08-18 21:45:07 +02:00
Jens Steube
687b4a816d Prepare v3.10 release 2016-08-18 21:03:46 +02:00
philsmd
04baf0ee54
added additional forward slash between folder and file (to make sure) 2016-08-18 15:48:44 +02:00
philsmd
ab1005ab1a
fixes #425: flexible way of searching for CRT_glob.o on linux and cygwin 2016-08-18 15:16:10 +02:00
philsmd
665e960093
sanity check: do not allow mask files or increment w/ --skip/--limit 2016-08-18 14:39:07 +02:00
philsmd
ed8315ba21
add sanity check to disallow --show and --outfile-autohex-disable 2016-08-18 13:48:59 +02:00
philsmd
58ae741cbd
the actual changes for #461 :) 2016-08-18 12:17:51 +02:00
philsmd
d78deef080 added locking too, just to be save 2016-08-18 11:46:33 +02:00
philsmd
14677e915f new feature: allow -o to be used in stdout mode 2016-08-18 11:04:23 +02:00
Jens Steube
bdecbbee1a Merge pull request #446 from usernamestaken/master
CRAM_MD5 throws salt length exception when the issue is in the hash
2016-08-17 16:41:15 +02:00
radix
e30dac2c6e
If a custom char set is undefined, declare it as undefined rather than NULL 2016-08-17 09:30:42 -05:00
Michael Sprecher
7593db9483
Added new hash-mode 13900 = OpenCart 2016-08-02 15:00:58 +02:00
radix
494afc0f66
Added Custom.Chars for modes 6, and 7. 2016-07-30 20:39:23 -05:00
radix
817917591e
Had a typo in the output, fixed. 2016-07-30 20:20:46 -05:00
radix
004812819f
Add Custom.Chars to output window in the case of a user specifying -1, -2, -3, -4. 2016-07-30 20:14:46 -05:00
radix
d4dfe58a72
CRAM_MD5 throws salt length exception when the issue is in the hash 2016-07-28 10:38:31 -05:00
Rosen Penev
37eaafdabf Fix GCC sign warnings 2016-07-25 23:08:02 -07:00
jsteube
8acf5b3879 Add support for @ rule (RULE_OP_MANGLE_PURGECHAR) to use on GPU 2016-07-25 22:54:07 +02:00
jsteube
d3a95a67ae Fixed a bug where hashcat did not take into account how long it takes to prepare a session when auto-aborting with --runtime is in use 2016-07-24 22:26:40 +02:00
jsteube
215457d74d Workaround for OpenCL runtimes which do accept -I parameter in the OpenCL kernel build options, but do not allow quotes 2016-07-23 23:30:42 +02:00
jsteube
c837df09ae Workaround for OpenCL runtimes which do accept -I parameter in the OpenCL kernel build options, but do not allow quotes 2016-07-21 10:06:31 +02:00
jsteube
2b7e36b042 Output cracked hashes on Windows using \r\n and not \n
Replace RegGetValue() with RegQueryValueEx() to enable Windows XP 32 bit compatibility
This fixes https://github.com/hashcat/hashcat/issues/418
2016-07-17 20:32:47 +02:00
jsteube
2167df6915 Fix for -I parameter workaround, use chdir () before modifying cpath_real
Fixes https://github.com/hashcat/hashcat/issues/432
2016-07-13 11:36:57 +02:00
Jens Steube
752e548f4e Merge branch 'master' of https://github.com/hashcat/hashcat 2016-07-12 12:02:14 +02:00
Jens Steube
346400f518 Add missing continue 2016-07-12 12:01:55 +02:00
jsteube
e56a4e9c60 Workaround OpenCL runtimes that do not accept -I parameter in the OpenCL kernel build options even if this is an OpenCL standard option 2016-07-11 23:45:25 +02:00
jsteube
e2dbaa6efa Do not error and exit if an OpenCL platform has no devices, just print a warning and continue with the next platform 2016-07-11 17:15:57 +02:00
Jens Steube
f1cd53e335 Globally fix return parameter handling to not use brackets 2016-07-11 14:45:17 +02:00
Jens Steube
6ba0eb8b39 Get rid of exit() calls in OpenCL wrapper library with the goal to have a better control which error can be ignored under special circumstances
Note, not all return codes from some of the subfunctions are uset yet, it would be too much changes at once
This is a preparation for https://github.com/hashcat/hashcat/issues/416
2016-07-10 13:23:06 +02:00
jsteube
3fa2d10914 Allow the use of enc_id == 0 in hash-mode 10600 and 10700 as it takes no part in the actual computation
Fixes https://github.com/hashcat/hashcat/issues/423
2016-07-09 14:35:38 +02:00
Jens Steube
e7214abee3 Do not remove *.dictstat with make clean 2016-07-09 09:54:11 +02:00
jsteube
49f693a1c9 Replace LINUX macro with compiler predefined macro __linux__ 2016-07-08 23:23:16 +02:00
jsteube
96f2ade4bb Replace DARWIN macro with __APPLE__
As discussed on https://github.com/hashcat/hashcat/pull/409
2016-07-08 23:14:57 +02:00
jsteube
2043338859 Rewrite some code to workaround strict aliasing rule violation for older compilers
Rewrite some variable initializers on older compilers
2016-07-08 22:57:27 +02:00
Jens Steube
baea682491 Missing save of original platform id 2016-07-08 14:46:44 +02:00
Jens Steube
d77c63a12c Merge branch 'master' of https://github.com/hashcat/hashcat 2016-07-08 14:39:15 +02:00
Jens Steube
5909bbb7b7 Make use of cl_context_properties[] to clCreateContext(), even if OpenCL specification allow the use of NULL, some runtimes fail without 2016-07-08 14:38:57 +02:00
Jens Steube
7350f38bc4 Merge pull request #426 from philsmd/master
fixes -m #424: problem removing multiple already found WPA hashes
2016-07-08 14:33:10 +02:00
Jens Steube
72abe90e10 Merge pull request #421 from lifanov/freebsd-port
FreeBSD support
2016-07-08 14:32:59 +02:00
philsmd
6eec6d42f5
fixes -m 424: problem removing multiple already found WPA hashes 2016-07-08 12:38:49 +02:00
Nikolai Lifanov
6e04a52e53 enable path resolution on FreeBSD 2016-07-06 10:33:46 -04:00
Nikolai Lifanov
54ebe1fe23 fix get_path_exe: not sure what I was thinking 2016-07-06 10:20:46 -04:00
Nikolai Lifanov
1a3b610601 add tty handling for FreeBSD 2016-07-06 08:42:53 -04:00
Nikolai Lifanov
c2bcdbebcb implement thread affinity for FreeBSD 2016-07-06 08:24:09 -04:00
philsmd
a5700bf4ef
fixed problem where hashcat did not remove WPA/WPA2 hashes found in potfile 2016-07-06 10:05:34 +02:00
Nikolai Lifanov
883bc202db implement get_exec_path for FreeBSD 2016-07-05 15:43:03 -04:00
Nikolai Lifanov
3d3d212595 FreeBSD also needs stdio.h 2016-07-05 15:16:24 -04:00
Nikolai Lifanov
f1960ec73c use native compiler on FreeBSD 2016-07-05 15:14:11 -04:00
Nikolai Lifanov
dd66aba33f Revert "make native build play well with external build systems"
This reverts commit 61efadb684.
2016-07-05 15:09:40 -04:00
Nikolai Lifanov
61efadb684 make native build play well with external build systems 2016-07-05 14:59:46 -04:00
Nikolai Lifanov
4a598af78c add FreeBSD Makefile target 2016-07-05 14:58:28 -04:00
philsmd
f326c5de4c Merge remote-tracking branch 'upstream/master'
Conflicts:
	docs/changes.txt
2016-07-05 15:13:45 +02:00
philsmd
067c0b8e83
this fixes #400: --loopback was not working 2016-07-05 15:00:26 +02:00
Jens Steube
69e3e39568 Merge pull request #415 from anthraxx/master
extend global CFLAGS and LDFLAGS to aid distro packaging
2016-07-05 09:22:36 +02:00
jsteube
dc9696bc3f Make scrypt thread count fixed only for non-CPU OpenCL devices 2016-07-04 21:41:20 +02:00
jsteube
fc2b20b273 Fixed a bug where hashcat crashes in case of a scrypt P setting > 1 2016-07-04 21:13:23 +02:00
anthraxx
7f8aaf7430 extend global CFLAGS and LDFLAGS to aid distro packaging
This preserves globally defined CFLAGS and LDFLAGS and simply
extends those variables to aid distro based packaging toolchains
and predefined distro wide defaults like SSP, relro etc.
2016-07-04 21:01:51 +02:00
philsmd
d0f924580f
special case handling for commas within masks of .hcmask file 2016-07-04 12:47:16 +02:00
Jens Steube
362cb054a6 Merge pull request #409 from joshdekock/patch-2
hashcat.c: change osx to OSX use shared_dir
2016-07-04 09:18:05 +02:00
Josh de Kock
3db9be6eda hashcat.c: change osx to OSX use shared_dir
Fixes #408
2016-07-02 00:48:56 +01:00
Josh de Kock
86cf95e878 Makefile: remove .app for OSX 2016-07-02 00:11:37 +01:00
Josh de Kock
75a38b2e2e Makefile: fix sed on OSX
sed on OSX doesn't have -r so default to the usage of GNU sed
2016-07-02 00:08:12 +01:00
jsteube
b58f7a4675 Fixed a bug where hashcat crashes for accessing deallocated buffer if user spams "s" shortly before hashcat shuts down 2016-07-01 13:04:50 +02:00
jsteube
ad00844b26 The Time.Estimated attribute in status display should also show --runtime limit if user set it
This implements https://github.com/hashcat/hashcat/issues/383
2016-07-01 13:01:02 +02:00
jsteube
7b84980e4b Fixed a bug where hashcat did not check the return of realpath() and crashes uncontrolled if the path does not exist
This fixes https://github.com/hashcat/hashcat/issues/399
2016-07-01 11:24:02 +02:00
philsmd
4ee4794412
cosmetic: fix parenthesis of the help output 2016-07-01 09:57:41 +02:00
jsteube
edb5028a4d Fix for PR 69122fb554 which wasn't complete 2016-06-30 12:03:12 +02:00
Jens Steube
8fc1306b0b Fix https://github.com/hashcat/hashcat/issues/395 2016-06-30 08:43:10 +02:00
Moritz Kick
69122fb554 Make linux-build POSIX compatible
Also allow it to actually compile on musl-libc systems.

From glibc's termio.h:
/* Compatible <termio.h> for old `struct termio' ioctl interface.
   This is obsolete; use the POSIX.1 `struct termios' interface
   defined in <termios.h> instead.  */
2016-06-29 18:23:08 +02:00
jsteube
6be99f523c Limit scrypt to 64 threads has no performance impact but makes it easier to handle 2016-06-28 11:47:32 +02:00
jsteube
8702d0e3e1 Workaround memory allocation limit from OpenCL by using multiple buffers for scrypt 2016-06-28 11:03:04 +02:00
jsteube
4ed8977e48 Dynamic tmp_t length for scrypt 2016-06-27 21:28:48 +02:00
Jens Steube
37bf9d65b0 Do our own include-file permission check before an OpenCL runtime fails loading them and erroring out with a confusing error messages like "file not found" 2016-06-27 19:13:56 +02:00
Jens Steube
3370820109 Merge pull request #392 from unix-ninja/master
Various refactor changes
2016-06-27 18:51:00 +02:00
Unix-Ninja
2188a01ae9 Refactor OSX preprocessor constants to read 'DARWIN' 2016-06-27 08:13:50 -04:00
jsteube
115c95eb02 Use dedicated variables to control shutdown of parallel threads like keypress and monitoring 2016-06-27 12:13:46 +02:00
Jens Steube
cf9c184cd5 Set exhausted status was too late 2016-06-27 09:25:34 +02:00
Jens Steube
772e2ac33f Fix benchmark devices_status bug 2016-06-27 08:54:45 +02:00
Jens Steube
ed1863c263 Move macros DGST_R0 - DGST_R3 to host, define dgst_size for opencl kernel from host; both at runtime 2016-06-26 23:39:42 +02:00
jsteube
0e68b2af25 Don't use device_processor_cores for scrypt 2016-06-26 22:59:52 +02:00
jsteube
6191e8bf79 Fix reset to automatic for NvAPI 2016-06-26 20:41:11 +02:00
jsteube
49811cfee1 Set fanspeed to automatic on shutdown
Increase retain temperature from 65c to 75c; Because GTX1080 hits its reference boost clocks of 1733mhz at 80c
2016-06-26 20:18:46 +02:00
jsteube
78c1d45b09 Disable use of nvmlDeviceSetComputeMode() and nvmlDeviceSetGpuOperationMode() - no advantage of using it
Fix https://github.com/hashcat/oclHashcat/issues/391
2016-06-26 16:59:56 +02:00
jsteube
de1d1da454 Disable some of NVMLs useless throttle reasons 2016-06-26 16:29:51 +02:00
jsteube
a5baa829c5 Move thread_monitor() to outer threads 2016-06-26 16:09:05 +02:00
jsteube
5c338de519 Fix race condition in thread_keypress 2016-06-26 15:55:23 +02:00
jsteube
057909fdfd Do not overwrite quit status when user forced it with keypress 2016-06-26 11:15:29 +02:00
jsteube
c081d3cf05 Fix a bug related to --limit 2016-06-26 10:01:50 +02:00
jsteube
3a275a95e6 Fix some devices_status handling 2016-06-26 09:47:02 +02:00
jsteube
6ab712d247 Add some small section with basic examples to --help; some device status fixes 2016-06-25 21:56:18 +02:00
Jens Steube
a5a38620d4 Move keyspress detecting thread to outer loop 2016-06-25 12:05:16 +02:00
Jens Steube
e7df9b112a windows path update 2016-06-25 10:37:24 +02:00
philsmd
ffd90774fc
do not ignore keypress / status changes 2016-06-25 09:55:39 +02:00
Unix-Ninja
fce2363fec Clean end-of-line output usage (not actually POSIX) 2016-06-24 18:08:02 -04:00
Unix-Ninja
78a819417b Add -D short flag for --opencl-device-types 2016-06-24 17:05:27 -04:00
Jens Steube
1550b9de07 OSX didn't know about MAX_PATH, had to include limits.h; Use heap not stack memory 2016-06-24 21:40:11 +02:00
Jens Steube
6d2aa559a6 Windows doesn't accept escape characters, falling back to old method for windows 2016-06-24 21:29:23 +02:00
Jens Steube
268b1e3ad0 Remove workaround with multiple include folders; Instead use a naive escape function 2016-06-24 16:57:20 +02:00
philsmd
79d02466af
cosmetic fix: don't show prompt and warning within the same line 2016-06-24 12:55:54 +02:00
Jens Steube
8298cd4926 Drop -m 190, no reason to keep it 2016-06-23 18:20:55 +02:00
Jens Steube
c172da1bd2 Evil bug fixed caused by variable-name collision 2016-06-22 11:58:00 +02:00
Jens Steube
fe18f51406 Fix invalid error CL_INVALID_VALUE caused by a zero length copy when using large hashlists 2016-06-22 11:32:40 +02:00
_NSAKEY
26dada5a19 Capitalization. 2016-06-21 06:11:00 -05:00
_NSAKEY
c713196d8b Another trivial log message edit. 2016-06-21 06:09:27 -05:00
_NSAKEY
2504b59eea Trivial log message touch-ups. 2016-06-21 06:05:07 -05:00
jsteube
39042d39e8 Fix a race condition in output file handling 2016-06-21 12:25:07 +02:00
Jens Steube
5a2f0bb5be Remove benchmark info; Better align status display if more than 9 devices 2016-06-21 10:39:23 +02:00
radix
5d41b93514
Update wording on some warning messages. 2016-06-19 13:42:22 -05:00
dropdead
30aebe81fa Cleaned log output 2016-06-19 16:36:41 +02:00
jsteube
6b2b11fdc0 Increase --stdout output performance 2016-06-19 15:58:52 +02:00
jsteube
4444c17ec6 Speed up startup time for --stdout by using an empty kernel 2016-06-19 14:33:50 +02:00
jsteube
07acd52ed4 Some optical change on startup 2016-06-19 12:55:03 +02:00
jsteube
d57ac912cc Fix https://github.com/hashcat/oclHashcat/issues/374
Fix https://github.com/hashcat/oclHashcat/issues/375
2016-06-19 10:08:55 +02:00
jsteube
92a111be74 Fixed some macros 2016-06-18 21:56:19 +02:00
jsteube
e8aefb412c Reenable --gpu-temp-retain (65c by default), now that we have fan set support on Linux and Windows 2016-06-18 21:29:24 +02:00
jsteube
2bd49e6720 Added --gpu-temp-retain support for windows through nvapi 2016-06-18 18:21:40 +02:00
jsteube
6a2ec331ef Check permission to set fan speed before actually doing it, otherwise X11 becomes mad and drops the connection 2016-06-18 14:42:57 +02:00
jsteube
e43be7aba3 Do not try to set fanspeed if connection to X11 failed 2016-06-18 11:26:51 +02:00
jsteube
9a970c0955 Added support for XNVCTRL on Linux to add support for --gpu-temp-retain for NVidia GPU 2016-06-18 10:59:58 +02:00
jsteube
28505c350b Add commandline support to override cpu spinning damper for nvidia runtime 2016-06-16 07:46:24 +02:00
Jens Steube
fd3813f279 save_hash() always works with a file, therefore no branch required 2016-06-15 12:17:18 +02:00
Jens Steube
c61798434e Merge branch 'master' of https://github.com/hashcat/oclHashcat 2016-06-15 12:10:38 +02:00
Jens Steube
90181e565a This patch should remove a bottleneck causing slow writing performance of hash files which can be annoying when using --remove in combination with large hashlists 2016-06-15 12:10:09 +02:00
jsteube
5542e46022 Added option --stdout to print candidates instead of trying to crack a hash 2016-06-14 21:49:33 +02:00
jsteube
eda36a9877 Make sure to not overflow 2016-06-14 10:55:03 +02:00
Jens Steube
4f0709b3c9 Another slow-hash improvement 2016-06-14 10:18:42 +02:00
jsteube
d275772b9f Fix for 100% CPU burning loop workaround for slow hashes 2016-06-14 09:17:03 +02:00
jsteube
8abc42e346 Simple, but effective workaround to solve the 100% CPU burning loop bug in Nvidias OpenCL runtime, works Linux and Windows, 0% cpu (alsmost), 100% performance in comparison to CPU burning loop variant. Replaces old previous try with overwritten clock_gettime() function 2016-06-13 23:50:49 +02:00
jsteube
217f9e6004 Do not try to use clock_gettime() on OSX 2016-06-12 18:07:26 +02:00
jsteube
7ef80fb12b Do not automatically enable powertune in benchmark, but allow the user to enable it manually 2016-06-12 17:51:32 +02:00
jsteube
9174767847 Inform user about how to verify reported cracking speed 2016-06-12 14:39:42 +02:00
jsteube
94e9fe7836 No need to check for cracked hashes in benchmark mode 2016-06-12 14:25:41 +02:00
jsteube
b2ff9922c9 Pure black magic to workaround 100% CPU usage bug in NVidias OpenCL runtime on Linux 2016-06-12 12:26:47 +02:00
Jens Steube
eb88171bdd Fix precompute bug in PeopleSoft PS_TOKEN 2016-06-11 23:29:20 +02:00
Jens Steube
3022abf956 some axcrypt fixes 2016-06-11 23:08:33 +02:00
Jens Steube
0d38489c9d Fix typo 2016-06-11 20:16:52 +02:00