1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-27 02:18:21 +00:00
Commit Graph

567 Commits

Author SHA1 Message Date
jsteube
0d8b179d40 Move around some types and globals were they belong to 2016-09-30 09:34:06 +02:00
jsteube
a5800b41f4 Rename hash_management.c to hashes.c 2016-09-30 09:25:51 +02:00
jsteube
ed571a3ec8 Remove unneeded includes 2016-09-30 00:38:29 +02:00
jsteube
133c9295f5 Cleaned up data_t, only contexts left 2016-09-29 23:49:33 +02:00
jsteube
12a2d6d2a0 Move more stuff to status_ctx_t 2016-09-29 23:25:29 +02:00
jsteube
831ef1490b Prepare status_ctx_t 2016-09-29 22:27:04 +02:00
jsteube
84f96c4dda Add cpt_ctx_t 2016-09-29 15:19:12 +02:00
jsteube
658f135763 Replace some uint with u32 2016-09-29 14:56:02 +02:00
jsteube
e12abeb9de Add inner2_loop() 2016-09-29 14:46:51 +02:00
jsteube
936655e0ee Add missing include for windows 2016-09-29 00:25:36 +02:00
jsteube
dfb88a7002 Remove unneeded objects 2016-09-29 00:23:24 +02:00
jsteube
df23d5b4e9 Move more functions out of hashcat.c 2016-09-28 23:53:46 +02:00
jsteube
de21c005fd Move setup_console() to terminal.c 2016-09-28 23:40:16 +02:00
jsteube
9f61fb3024 Make hm_adapters_* attributes local ones 2016-09-28 23:07:25 +02:00
jsteube
ee30055401 Get rid of data. global variable in wordlist.c 2016-09-28 22:52:42 +02:00
jsteube
de5d0349c6 Fixes https://github.com/hashcat/hashcat/issues/517 2016-09-28 22:38:09 +02:00
jsteube
7191780296 Make use of hwmon_ctx_t 2016-09-28 22:28:44 +02:00
jsteube
81bc9081ad Prepare hwmon_ctx_t, not used yet 2016-09-28 15:26:56 +02:00
jsteube
f8d538413e Move pw_min and pw_max to hashconfig_t and bring back data.shutdown_* 2016-09-28 13:51:00 +02:00
jsteube
171bfbbb8b Get rid of shutdown_inner and shutdown_outer 2016-09-28 13:15:23 +02:00
jsteube
cc740f2cb2 Move PW_DICTMAX to common.h 2016-09-28 11:55:02 +02:00
jsteube
94680cb311 Move hardware_power_all, kernel_power_all and kernel_power_final to opencl_ctx_t 2016-09-28 11:49:08 +02:00
jsteube
48917b5843 Move tmp size and hook size to hashconfig_init() 2016-09-28 11:11:14 +02:00
jsteube
ce02b3c54f Add hashconfig_enforce_kernel_loops () 2016-09-28 10:47:39 +02:00
jsteube
47f027d249 Created hashconfig_kernel_thread_force() 2016-09-28 10:41:06 +02:00
jsteube
f1cf902c35 Add missing combinator files 2016-09-27 20:07:49 +02:00
jsteube
814206801a refactor mask_ctx_parse_maskfile() 2016-09-27 20:02:12 +02:00
jsteube
c71f1bfb0c Introduct combinator_ctx_t 2016-09-27 18:32:09 +02:00
jsteube
67dd2e9b67 Separate rules and straight mode from each other, remove rules_ctx_t 2016-09-27 13:13:07 +02:00
jsteube
edd50de047 Add opencl_session_update_mp() and opencl_session_update_mp_rl() 2016-09-27 11:43:05 +02:00
jsteube
cf154b3af1 Make DEFAULT_BENCHMARK_ALGORITHMS_CNT a true constant int 2016-09-27 11:09:17 +02:00
jsteube
eeccb01998 Add opencl_ctx_devices_reset() 2016-09-27 10:59:02 +02:00
jsteube
69ad06ec12 Fix some casts 2016-09-26 23:42:37 +02:00
jsteube
75682a5008 Get rid of local_free() and global_free(), no longer required 2016-09-26 23:22:07 +02:00
jsteube
04fb85cf1a Fix bfs_cnt in -i mode 2016-09-26 17:50:47 +02:00
jsteube
3eaac31445 Fix for https://github.com/hashcat/hashcat/issues/514 2016-09-26 17:15:07 +02:00
jsteube
0ca4ebe1e6 Do not initialize masks for attack-modes not using masks 2016-09-26 15:11:46 +02:00
jsteube
54a4ea3db2 Large but needed refactoring of mask handling, maskfiles, default mask, etc., expect smaller bugs 2016-09-26 01:18:00 +02:00
jsteube
92e263a761 Add noop-check to rules_ctx.c 2016-09-25 14:53:57 +02:00
jsteube
fd72834322 data. no longer required in restore 2016-09-25 01:02:44 +02:00
jsteube
59ebe10b07 Move functions from filenames.c to opencl.c and shared.c 2016-09-24 21:44:43 +02:00
jsteube
521db46c11 Move dictstat_init() out of outer loop, also add enabled flag 2016-09-24 13:01:17 +02:00
jsteube
62b97a6fe6 Move loading rules into outer loop 2016-09-24 12:05:56 +02:00
jsteube
ebe9f1c07f Prepare for rules_ctx_t 2016-09-24 11:08:35 +02:00
jsteube
ca48c49575 Move OpenCL device initialization to outer loop 2016-09-23 22:23:13 +02:00
jsteube
1c9aa25886 Fix some memory leaks at shutdown 2016-09-23 21:50:35 +02:00
jsteube
0a330d4335 Rewrote logfile handling from scratch 2016-09-23 21:41:05 +02:00
jsteube
d3d9b4e679 Reduce max. number of allowed function calls per rule from 256 to 32 to save GPU memory 2016-09-22 22:54:20 +02:00
jsteube
319d548766 Move all outfile-check folder related host code into outfile_check.c 2016-09-22 22:40:47 +02:00
jsteube
919b5d5148 Move all induction folder related host code into induct.c 2016-09-22 17:06:53 +02:00
jsteube
b6f966970b Move all bitmap related host code into bitmap.c 2016-09-22 16:23:36 +02:00
jsteube
095dfdc730 Get rid of quiet variable in data. context 2016-09-22 15:56:32 +02:00
jsteube
f2f7dccb90 Get rid of force variable in data. context 2016-09-22 15:52:18 +02:00
jsteube
f9ec232b9b Get rid of attack_kern variable in data. context 2016-09-22 15:50:49 +02:00
jsteube
f1d93d576a Get rid of attack_mode variable in data. context 2016-09-22 15:41:59 +02:00
jsteube
479e93ae7d Get rid of logfile_disable variable in data. context 2016-09-22 15:30:21 +02:00
jsteube
83baf7fcf2 Get rid of hex_salt variable in data. context 2016-09-22 15:27:27 +02:00
jsteube
b579542db6 Get rid of hex_charset variable in data. context 2016-09-22 15:26:51 +02:00
jsteube
3da185a3c8 Get rid of wordlist_mode variable in data. context 2016-09-22 15:20:24 +02:00
jsteube
5b0835258c Get rid of hex_wordlist variable in data. context 2016-09-22 15:14:55 +02:00
jsteube
6b5d8ed62c Get rid of truecrypt_keyfiles variable in data. context 2016-09-22 15:12:13 +02:00
jsteube
77cd4b8a63 Get rid of veracrypt* variable in data. context 2016-09-22 15:11:31 +02:00
jsteube
d619e39952 Get rid of segment_size variable in data. context 2016-09-22 15:10:29 +02:00
jsteube
07221ecf3b Get rid of scrypt_tmto variable in data. context 2016-09-22 15:09:48 +02:00
jsteube
d4074d87a1 Get rid of powertune_enable variable in data. context 2016-09-22 15:09:11 +02:00
jsteube
88f97f2cca Get rid of runtime variable in data. context 2016-09-22 15:08:28 +02:00
jsteube
21d852b194 Get rid of benchmark variable in data. context 2016-09-22 15:07:19 +02:00
jsteube
59ba4c2d93 Get rid of machine_readable variable in data. context 2016-09-22 15:00:31 +02:00
jsteube
b4a3dd35b0 Get rid of outfile_check_timer variable in data. context 2016-09-22 14:59:48 +02:00
jsteube
d321e0d5a4 Get rid of session variable in data. context 2016-09-22 14:56:38 +02:00
jsteube
bdad458c41 Get rid of loopback variable in data. context 2016-09-22 14:55:30 +02:00
jsteube
e4b4855fbd Get rid of status* variables in data. context 2016-09-22 14:52:51 +02:00
jsteube
6d992ec37e Get rid of remove* variables in data. context 2016-09-22 14:46:04 +02:00
jsteube
a3b4cc5a80 Get rid of restore, restore_disable and restore_timer variables in data. context 2016-09-22 14:45:00 +02:00
jsteube
2476f36ffe Get rid of install_dir, profile_dir, shared_dir, and session_dir variables from data. context 2016-09-22 14:38:02 +02:00
jsteube
a628cd399a Get rid of gpu_temp_* variables in data. context 2016-09-22 12:55:48 +02:00
jsteube
93d3b3a809 Get rid of rp_* variables in data. context 2016-09-22 12:45:48 +02:00
jsteube
c18d6a3302 Get rid of skip and limit variables in data. context 2016-09-22 12:33:33 +02:00
jsteube
7393378841 Get rid of hash_info array in data. context 2016-09-22 12:27:23 +02:00
jsteube
fe88c763af Get rid of custom_charset_* variables in data. context 2016-09-22 12:23:26 +02:00
jsteube
1c9027cb03 Get rid of rule_buf_l, rule_buf_r, rule_len_l and rule_len_r in data. context 2016-09-22 12:15:13 +02:00
jsteube
f56b6d2065 Get rid of data.username 2016-09-22 11:56:06 +02:00
jsteube
3664f02670 Get rid of global get_next_word_func function pointer variable 2016-09-22 11:35:08 +02:00
jsteube
97d9a5d9cc Fix missing includes in folder.h
Fix some warning message
2016-09-22 11:05:04 +02:00
jsteube
2215174c2e Replace "#if defined (HAVE_HWMON)" with "user_options->powertune_enable = false" which give a more easy to read sourcecode 2016-09-22 10:55:33 +02:00
jsteube
1cc4358820 Introduce folder_config_t 2016-09-21 23:06:11 +02:00
jsteube
80685d94c4 Get rid of truecrypt_keyfiles and veracrypt_keyfiles variable in main 2016-09-21 22:21:35 +02:00
jsteube
a4647baba5 Get rid of segment_size variable in main 2016-09-21 22:07:10 +02:00
jsteube
f5e5dc8ab3 Get rid of outfile, outfile_format, outfile_autohex, outfile_check_timer variable in main 2016-09-21 21:14:06 +02:00
jsteube
b7f0a6959d Get rid of hash_mode, hex_salt, increment_max, increment_min, increment and separator variable in main 2016-09-21 21:02:49 +02:00
jsteube
f3c427407e Reuse user_options_parse() for restore case 2016-09-21 20:32:56 +02:00
jsteube
ecdb74f440 Get rid of bitmap_min and bitmap_max variable in main 2016-09-21 16:38:55 +02:00
jsteube
4718bb3d2d Move wordlist_mode into user_options_extra 2016-09-21 16:25:36 +02:00
jsteube
c008b11de3 Make more use of new user_options_t* 2016-09-21 16:07:49 +02:00
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