1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-30 03:48:17 +00:00
Commit Graph

423 Commits

Author SHA1 Message Date
jsteube
cb1375bcd7 Add user_options_extra_t 2016-09-21 11:09:12 +02:00
jsteube
a70590b0dc Move sanity check into user_options.c 2016-09-20 17:04:31 +02:00
jsteube
e6f083b708 Add all defaults for user commandline parameters to user_options.h; Prepare user commandline parameter struct for easier handling of functions calls that require them 2016-09-20 16:04:22 +02:00
jsteube
ced3b3b82f Move global mux_counter variable into opencl_ctx_t 2016-09-20 13:26:19 +02:00
jsteube
3adbf3d0d5 Move global mux_dispatcher variable into opencl_ctx_t 2016-09-20 13:18:47 +02:00
jsteube
4cde17aea7 Fix race-condition in thread_keypress() 2016-09-20 12:32:39 +02:00
jsteube
9daf139fef Refactor devices_status to have better thread control 2016-09-19 15:52:01 +02:00
Gabriele Gristina
fdbc44ce6c Add option for show opencl info and exit 2016-09-18 15:51:47 +02:00
jsteube
caeedd5646 Move more code from hashcat.c to opencl.c related to opencl device initialization and shutdown 2016-09-17 17:05:01 +02:00
jsteube
0eff6b7cab Fix potfile remove logic 2016-09-16 17:31:31 +02:00
jsteube
a0f6ed6832 Introduce hashes_t; not finishe yet 2016-09-16 17:01:18 +02:00
jsteube
7ce2f2ff19 Introduce opencl_ctx_t; not finished yet 2016-09-15 16:02:52 +02:00
jsteube
d60e2529c1 Fix missing #endif in opencl.h 2016-09-15 09:38:21 +02:00
jsteube
dcdd0d89cd Move thread_monitor() to monitor.c 2016-09-15 04:29:22 +02:00
jsteube
1ce58f51d1 Move thread_keypress() to terminal.c 2016-09-15 04:21:41 +02:00
jsteube
3f5ce6bb8e Continue move thread_calc() and thread_calc_stdin() to dispatch.c 2016-09-15 04:17:19 +02:00
jsteube
81845d39a3 Move thread_calc() and thread_calc_stdin() to thread.c 2016-09-15 04:10:41 +02:00
jsteube
f4c5241275 Move thread_outfile_remove() to outfile_check.c 2016-09-15 04:04:54 +02:00
jsteube
e063b906ab Move thread_autotune() to autotune.c 2016-09-15 04:00:47 +02:00
jsteube
f1835dc7f5 Move more functions to thread.c 2016-09-14 20:22:38 +02:00
jsteube
e94ab8c113 Move autotune related stuff to autotune.c 2016-09-14 20:06:27 +02:00
jsteube
963cda3db6 Move more functions to hash_management.c 2016-09-14 19:50:53 +02:00
jsteube
bd9e092ea3 Do not write potfile if --potfile-disable is in use 2016-09-14 19:46:31 +02:00
jsteube
bc75ba70a1 Move tons of functions from hashcat.c into hash_management, interface, opencl, restore, status and weak_hash sources 2016-09-14 16:07:24 +02:00
jsteube
0fa43d52b8 Move some general outfile-check related functions to induct.c 2016-09-14 15:12:28 +02:00
jsteube
25f8a95306 Move some general induction-related functions to induct.c 2016-09-14 15:08:22 +02:00
jsteube
376e12efe6 Move debugfile related stuff to debugfile.c 2016-09-13 10:38:59 +02:00
jsteube
bd5bc294e6 Move loopback related stuff to loopback.c 2016-09-12 14:58:25 +02:00
jsteube
533a87b685 Move count_words() to wordlist.c 2016-09-12 12:59:40 +02:00
jsteube
2678592484 Move more hash-mode dependant configuration into hashconfig 2016-09-12 10:50:08 +02:00
jsteube
e25224a940 Move benchmark related stuff to benchmark.c 2016-09-12 10:16:42 +02:00
jsteube
10b4670682 Move version related stuff to version.h 2016-09-12 09:11:42 +02:00
jsteube
3daf0af480 Added docs/credits.txt
Added docs/team.txt
2016-09-11 22:20:15 +02:00
jsteube
2a6e03510b Add template files 2016-09-11 11:42:19 +02:00
jsteube
fe634d93aa More pre-sorting 2016-09-11 10:53:29 +02:00
jsteube
5126a86907 Move prompt functions to terminal.c 2016-09-11 10:39:19 +02:00
jsteube
7f1ecc7cb7 Use hashcat.c configuration macros to get an idea of the remaining features which should move into their own source file 2016-09-11 10:28:59 +02:00
jsteube
b7906f6b93 Move outfile specific functions into their own source file 2016-09-10 17:35:58 +02:00
jsteube
a61d1faaad Cleanup and redefine some potfile functions 2016-09-10 15:17:23 +02:00
jsteube
53db51dcc3 Finalize potfile specific functions migration to their own source file 2016-09-10 12:16:16 +02:00
jsteube
f809937b1e Move more potfile specific functions into their own source file 2016-09-10 11:32:26 +02:00
jsteube
63b47eebc9 Prepare move potfile specific functions into their own source file 2016-09-09 23:17:43 +02:00
jsteube
26172af89d Introduce hashconfig_t 2016-09-09 16:54:48 +02:00
jsteube
ecba0d295a Fully rewrite dictstat logic to make it possible to pack it into a module 2016-09-09 10:22:21 +02:00
jsteube
e923c29435 Add missing sources 2016-09-08 18:56:33 +02:00
jsteube
f006542317 Prepare move dictstat specific functions into their own source file 2016-09-08 18:27:53 +02:00
jsteube
15a7a42252 Move more logfile specific functions to logfile.h 2016-09-08 16:37:39 +02:00
jsteube
e304eed8c5 Move wordlist specific functions into their own source file 2016-09-08 16:32:24 +02:00
jsteube
367473c657 Move filename_from_filepath() to filenames.c 2016-09-08 16:17:28 +02:00
jsteube
18534fcdeb Move stdout specific functions into their own source file 2016-09-08 16:01:24 +02:00
jsteube
da8e9d50d9 Move hlfmt specific functions into their own source file 2016-09-08 14:36:15 +02:00
jsteube
515f22626a Cleanup rp_cpu.c 2016-09-08 14:22:10 +02:00
jsteube
ae457c992e get rid of hc_global_data_t data in shared.c 2016-09-08 14:11:35 +02:00
jsteube
245e2a3e73 shared.c is now clean, ready to cleanup on other sources 2016-09-08 14:05:53 +02:00
jsteube
6aee697112 Cleanup some macro values 2016-09-08 12:17:56 +02:00
jsteube
d9073296e4 Make hc_sleep() a function 2016-09-08 10:48:38 +02:00
jsteube
e3d0cd0bdd Move more functions out of shared.c 2016-09-08 10:01:49 +02:00
jsteube
51a059a606 Move status specific functions into their own source file 2016-09-08 09:21:25 +02:00
jsteube
9eb47153d4 Replace all #ifdef with #if defined (...) for convention 2016-09-07 22:29:57 +02:00
jsteube
eb00cd959f Move TUNING_DB_FILE to tuningdb.h 2016-09-07 22:06:43 +02:00
jsteube
9f416109d9 Fix psapi include for windows 2016-09-07 22:04:04 +02:00
jsteube
a56855e355 Move restore specific functions into their own source file 2016-09-07 22:01:34 +02:00
jsteube
1fc22dba03 Move bitmap specific functions into their own source file 2016-09-07 21:13:53 +02:00
jsteube
25726e4f4e Remove some (hopefully) redundant macros and compiler options 2016-09-07 20:30:14 +02:00
jsteube
80d7dce9b5 Move more functions out of shared.c 2016-09-07 16:04:42 +02:00
jsteube
8dd57b715b Create real opencl.c to better distinguish between opencl helper functions and library handling functions 2016-09-07 15:13:50 +02:00
jsteube
f9e1329ca9 Fix CRLF 2016-09-07 12:45:08 +02:00
jsteube
9336ca8838 Remove data. access from pthread_setaffinity_np (apple version) 2016-09-07 11:42:05 +02:00
jsteube
dda89fe610 Add includes to get OSX working 2016-09-07 11:24:21 +02:00
jsteube
3ba5c743f8 Move affinity specific functions into their own source file 2016-09-07 11:16:31 +02:00
Gabriele 'matrix' Gristina
b0c6eee06c Fix multiple build issues with OSX 2016-09-06 22:25:54 +02:00
jsteube
3ed4bfd237 Move tuningdb specific functions into their own source file 2016-09-06 19:44:27 +02:00
jsteube
b8e47c2ba2 Move locking specific functions into their own source file 2016-09-06 19:08:46 +02:00
jsteube
e4bf86dcbe Replace #pragma once with #ifndef #define #endif logic because #pragma once does not work cleanly on OSX 2016-09-06 18:44:05 +02:00
jsteube
c3fe5b40b1 Move folder specific functions into their own source file 2016-09-06 18:23:26 +02:00
jsteube
1902e6c2eb Create real cpu_crc32.c and rp_cpu.c 2016-09-06 15:28:56 +02:00
jsteube
0a5759ef1c Move usage specific functions into their own source file 2016-09-06 14:11:03 +02:00
jsteube
21666f77b7 Move maskprocessor and statusprocessor specific functions into their own source file 2016-09-06 13:52:26 +02:00
jsteube
d15ae38723 Move hwmon specific functions into their own source file 2016-09-06 13:29:50 +02:00
jsteube
5dd5c15966 Move tty_*() specific functions into their own source file 2016-09-06 13:16:38 +02:00
jsteube
eb5e192df5 Move logfile() specific functions into their own source file 2016-09-06 13:05:49 +02:00
jsteube
3dc77ced14 More preparation for easier integration of:
* https://github.com/hashcat/hashcat/pull/485
* https://github.com/hashcat/hashcat/pull/486
2016-09-06 11:49:26 +02:00
jsteube
238b3e4401 Test failed, go back to #pragma once 2016-09-06 09:53:40 +02:00
jsteube
d86a92f2bf Some test 2016-09-06 09:50:46 +02:00
jsteube
0fe3bc5cb9 system #include should go to header 2016-09-06 09:39:44 +02:00
jsteube
4b79ccd416 Preparation for easier integration of:
* https://github.com/hashcat/hashcat/pull/485
* https://github.com/hashcat/hashcat/pull/486
2016-09-05 21:47:26 +02:00
jsteube
ff376ce112 Moved bit operations out of shared.[hc] and created bitops.[hc]
based on 1aafa13e09
2016-09-05 14:12:31 +02:00
jsteube
d54b399561 add types for windows only in case _BASETSD_H was not set
based on 96ea03db72
2016-09-05 13:07:09 +02:00
jsteube
ddfd212513 Fix indents 2016-09-05 12:37:14 +02:00
jsteube
63c17cf2c1 replaced macros with enums and static const char types
based on a55052cc66
2016-09-05 12:34:36 +02:00
jsteube
61d119b068 Remove unused typedefs for windows build
Based on 96ea03db72
2016-09-05 12:30:51 +02:00
jsteube
8d661f7c40 replaced macros with enums and static const char types
based on 4323b4a70a
2016-09-05 11:41:05 +02:00
jsteube
6eb9e700f9 replaced macros with enums and static const char types
based on 75a3ab9d47
2016-09-05 11:14:31 +02:00
jsteube
d24c200dfe moving macros out of function in cpu-*.c
based on 58b728230b
2016-09-05 10:27:32 +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
e664139699
Fix missing prototypes 2016-08-30 18:37:16 -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
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
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
Michael Sprecher
7593db9483
Added new hash-mode 13900 = OpenCart 2016-08-02 15:00:58 +02: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
Rosen Penev
37eaafdabf Fix GCC sign warnings 2016-07-25 23:08:02 -07: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
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
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
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
Nikolai Lifanov
1a3b610601 add tty handling for FreeBSD 2016-07-06 08:42:53 -04:00
Nikolai Lifanov
a2663fb93a include the right cl.h on FreeBSD 2016-07-05 15:12:05 -04: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
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
3370820109 Merge pull request #392 from unix-ninja/master
Various refactor changes
2016-06-27 18:51:00 +02:00
Unix-Ninja
d8bb00cf77 Make POSIX limits.h explicit declaration 2016-06-27 08:18:50 -04: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
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
Jens Steube
e7df9b112a windows path update 2016-06-25 10:37:24 +02:00
Unix-Ninja
fce2363fec Clean end-of-line output usage (not actually POSIX) 2016-06-24 18:08:02 -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
Jens Steube
8298cd4926 Drop -m 190, no reason to keep it 2016-06-23 18:20:55 +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
2bd49e6720 Added --gpu-temp-retain support for windows through nvapi 2016-06-18 18:21:40 +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
jsteube
5542e46022 Added option --stdout to print candidates instead of trying to crack a hash 2016-06-14 21:49:33 +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
Jens Steube
3022abf956 some axcrypt fixes 2016-06-11 23:08:33 +02:00
jsteube
b9eefd9b20 Added new hash-mode 13800 = Windows 8+ phone PIN/Password 2016-06-10 09:46:41 +02:00
jsteube
106e781a2f Fix some workload balancing issue 2016-06-06 21:39:11 +02:00
jsteube
829289b109 Fix calling conventions for external libraries (mingw doesn't handle it alone); Fix first print of PROMPT after autotune; 2016-06-04 00:54:28 +02:00
jsteube
2e706edc18 Do not show *throttle* in status display if the reason is unknown 2016-06-03 16:26:05 +02:00
jsteube
3e30b62bf6 Remove some ugly code from nvapi.h 2016-06-03 16:20:59 +02:00
jsteube
08934db58c Add NvAPI_GPU_GetPerfPoliciesInfo() and NvAPI_GPU_GetPerfPoliciesStatus() for later use 2016-06-03 16:08:32 +02:00
jsteube
a3e6690a9c Remove union in hm_attrs_t; Remove code related to threshold_slowdown which will be replaced with NvGetPerfPoliciesInfo() 2016-06-03 15:37:53 +02:00
jsteube
040bbd416a More nvapi preparations and display skip reason in benchmark 2016-06-03 11:33:59 +02:00