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

1073 Commits

Author SHA1 Message Date
jsteube
761e3f0d96 Move out words_cur from restore_ctx to status_ctx and let the dispatcher update it 2016-10-20 21:27:42 +02:00
jsteube
a460ab01b6 Bring back --username handling to --show and --left 2016-10-19 12:42:41 +02:00
jsteube
f5a92900c6 Rudimentary --show support is back 2016-10-19 11:55:43 +02:00
jsteube
f6334b5f90 Handling --show and --left need to be refactored, do not use those flags atm 2016-10-18 20:42:34 +02:00
jsteube
0fd48b228f Get rid of all event_log_* calls in monitor.c and replace them with real events 2016-10-18 01:24:03 +02:00
jsteube
1f72aa95e6 Destinguish between EVENT_POTFILE_HASH_CRACKED and EVENT_CRACKER_HASH_CRACKED for prompt handling 2016-10-18 00:50:54 +02:00
jsteube
c3266e363a Make status_display_machine_readable() use of hashcat_status_t 2016-10-18 00:13:40 +02:00
jsteube
89e3168280 Make status_display(), status_benchmark_automate() and status_benchmark() use of hashcat_status_t 2016-10-17 23:49:44 +02:00
jsteube
65b3910dc0 Converted status_benchmark_automate() 2016-10-17 17:20:19 +02:00
jsteube
1d0810a759 Added status_get_hwmon_dev() to status.c 2016-10-17 17:02:56 +02:00
jsteube
2b28010aae Added status_get_input_candidates_dev() to status.c 2016-10-17 16:46:16 +02:00
jsteube
8d81d3bd55 Added progress_mode to status.c 2016-10-17 16:22:32 +02:00
jsteube
86c1c7ef10 Added CPT functions for later use in status.c 2016-10-17 15:19:25 +02:00
jsteube
df521d664b Move restore_* variables into separate functions for later use in status.c 2016-10-17 14:25:16 +02:00
jsteube
615d977b7c Add new functions to hashcat_get_status() 2016-10-17 13:55:55 +02:00
jsteube
b044271b01 Move more status display calculate logic into separate functions 2016-10-17 13:44:07 +02:00
jsteube
2545ec6bf9 Prepare hashcat_get_status() 2016-10-16 19:32:43 +02:00
jsteube
7bcbbbea74 Add some more returncode checks 2016-10-15 19:47:53 +02:00
jsteube
7383bb14f5 Add some more returncode checks 2016-10-15 19:30:57 +02:00
jsteube
694de36694 Print warnings in yellow and errors in red 2016-10-15 16:12:20 +02:00
jsteube
191269f4f0 Add --speed-only mode 2016-10-14 21:38:52 +02:00
jsteube
056083fdba Revert "Prepare for hashcat_ctx_run_session()"
This reverts commit 0179097a53.
2016-10-14 19:25:13 +02:00
jsteube
0179097a53 Prepare for hashcat_ctx_run_session() 2016-10-14 13:27:35 +02:00
jsteube
8de576f5e9 Make it possible to access error messages without using an event 2016-10-13 19:16:24 +02:00
jsteube
8598a79732 Removed exit() from memory.c, resulting in all exit() calls removed from all code in the repository 2016-10-13 10:07:04 +02:00
jsteube
62284f79b1 Get rid of exit() in hashcat.c 2016-10-12 14:56:53 +02:00
jsteube
386efb7fb5 Make use of EVENT_CRACKER_HASH_CRACKED, do not print a cracked hash to stdout directly, let the client do it 2016-10-12 11:27:10 +02:00
jsteube
a3bf6fd4ef Make use of nvmlDeviceGetCount() 2016-10-11 12:18:06 +02:00
jsteube
2a5545d2b7 Move logfile stuff back to hashcat.c, it's a core feature which should be handled by the library 2016-10-10 11:23:21 +02:00
jsteube
6d2c58d8df Add main_potfile_remove_parse_post() 2016-10-10 11:10:04 +02:00
jsteube
8fc4da795b Replace fprintf(stderr, ...) on malloc.c with log_event_error() 2016-10-10 11:03:11 +02:00
jsteube
0f96c57ead Remove some workarounds to use get rid of unused variable warnings 2016-10-10 09:12:36 +02:00
jsteube
27bec8be13 Get rid of logging.c and most exit() calls replaced with return() for true library usage 2016-10-09 22:41:55 +02:00
jsteube
fa4de96ab0 switch cpu_crc32.c to event_log_* 2016-10-08 23:53:52 +02:00
jsteube
88565b4a5e Switch CPU affinity stuff to event_log_* 2016-10-08 23:38:34 +02:00
jsteube
42677df2a6 Start context-related logging with goal to get rid of logging.c 2016-10-08 23:16:40 +02:00
jsteube
f469694030 Add event_set_kernel_power_final() 2016-10-07 22:25:52 +02:00
jsteube
d993aa5ffa Get rid of more log_info() in hashcat() 2016-10-07 22:16:03 +02:00
jsteube
27887bf9ce Get rid of more log_info() in hashcat() 2016-10-07 21:47:11 +02:00
jsteube
81650dcc46 Initial proposal 2016-10-07 16:56:44 +02:00
jsteube
bea228dabe Add straight_ctx_update_loop() 2016-10-06 22:18:20 +02:00
jsteube
4ed2fb4913 Add mask_ctx_update_loop() 2016-10-06 22:00:02 +02:00
jsteube
39d333d551 Add user_options_extra_amplifier() 2016-10-06 21:37:03 +02:00
jsteube
034c0699bb Added status_words_base_calculate() 2016-10-06 21:28:40 +02:00
jsteube
30a190b174 Update hlfmt.c function parameters 2016-10-06 21:12:32 +02:00
jsteube
29942f5fb3 Update rp.c function parameters 2016-10-06 21:03:10 +02:00
jsteube
0ea8b6f3d0 Update terminal.c function parameters 2016-10-06 20:57:29 +02:00
jsteube
52068e25d5 Add some additional start-up checks 2016-10-06 17:26:15 +02:00
jsteube
0885c0ec6b Update loopback.c function parameters 2016-10-06 17:01:29 +02:00
jsteube
3f05b7c0a7 Update dictstat.c function parameters 2016-10-06 16:55:17 +02:00
jsteube
14248d38e3 Update tuning_db.c function parameters 2016-10-06 16:51:01 +02:00
jsteube
ef582be4eb Update induct.c function parameters 2016-10-06 16:46:08 +02:00
jsteube
c48ca34e1b Update outfile_check.c function parameters 2016-10-06 16:43:02 +02:00
jsteube
076784d235 Update user_options.c function parameters 2016-10-06 16:40:29 +02:00
jsteube
14334e4129 Update restore.c function parameters 2016-10-06 16:34:30 +02:00
jsteube
000534cdbc Update logfile.c function parameters 2016-10-06 16:25:24 +02:00
jsteube
662ddec0bb Update folder.c function parameters 2016-10-06 16:17:29 +02:00
jsteube
a5e83c27c3 Update wordlist.c function parameters 2016-10-06 16:16:56 +02:00
jsteube
a97e31881c Update interface.c function parameters 2016-10-06 15:49:07 +02:00
jsteube
9b8092abf9 Update outfile.c and potfile.c function parameters 2016-10-06 15:40:27 +02:00
jsteube
0579f93402 Update opencl.c and autotune.c function parameters 2016-10-06 15:16:30 +02:00
jsteube
f084aaf61b Update hwmon.c function parameters 2016-10-06 11:10:00 +02:00
jsteube
684a28af36 Update debugfile.c and hashes.c function parameters 2016-10-06 10:55:14 +02:00
jsteube
702c175f84 Update cpt.c function parameters 2016-10-06 10:26:47 +02:00
jsteube
077a94600d Update straight.c function parameters 2016-10-06 10:21:39 +02:00
jsteube
1610a3565c Update mpsp.c function parameters 2016-10-06 10:14:19 +02:00
jsteube
d9c1c89a57 Update combinator.c function parameters 2016-10-06 10:10:04 +02:00
jsteube
0155c9d44a Update bitmap.c function parameters 2016-10-06 09:56:17 +02:00
jsteube
3fb10fe9b4 Update status.c function parameters 2016-10-06 09:47:34 +02:00
jsteube
15d2f9b11e Add some reserved scratch buffer for innerloop combinator instead of reallocating each time 2016-10-05 15:41:56 +02:00
jsteube
eeb8210951 Added the current first and last password candidate test queued for execution per device on status view 2016-10-04 18:30:00 +02:00
jsteube
0b2c568ba6 Simplify status_display_* and status_benchmark_* function parameters 2016-10-04 16:35:24 +02:00
jsteube
6d3277ab17 Created build_plain(), build_crackpos() and build_debugdata() out of code from check_hash() 2016-10-04 16:18:49 +02:00
jsteube
7f2ab2db60 Add unlink_restore() 2016-10-04 11:03:20 +02:00
jsteube
23462528c3 Add mp_css_append_salt() and mp_css_split_cnt() 2016-10-04 08:52:56 +02:00
jsteube
7544adce8f Add mp_css_unicode_expand() 2016-10-04 08:21:03 +02:00
coolbry95
a78fd4e915 changed uint to u32 2016-10-04 00:35:49 -04:00
jsteube
fb5d840cf8 Move wordlist folder scan to straight.c and combinator.c init functions 2016-10-03 16:27:34 +02:00
jsteube
57cb082fda Add some useful stuff to main.c 2016-10-03 01:27:55 +02:00
jsteube
50d2cec912 Fix some variable name convention 2016-10-03 00:01:37 +02:00
jsteube
667a8b1d3d Make use of argc/argv easier 2016-10-02 23:30:31 +02:00
jsteube
2994afd81a Use hc_stat from types.c instead of OS dependant branching 2016-10-01 14:22:50 +02:00
jsteube
5f18fb40f1 Added hc_mkdir instead of mkdir macro 2016-10-01 13:51:06 +02:00
jsteube
b17d00d873 Added fix for Visual Studio compiler in C mode 2016-10-01 13:42:40 +02:00
jsteube
8dcb587e44 Define NOMINMAX macro to prevent definition min and max macros in stdlib header files 2016-10-01 13:40:09 +02:00
jsteube
339367a8d3 Because of different variants of WIN macrodef define them all 2016-10-01 13:37:09 +02:00
jsteube
e2c3575ecc Use NvAPI_Status for RC with NvAPI instead of pure int 2016-10-01 13:33:39 +02:00
jsteube
ac9315190e fixing calling conventions in ext_adl.h 2016-10-01 13:25:51 +02:00
jsteube
1534f2c067 Replaced dynloader macros with real functions 2016-10-01 13:03:31 +02:00
jsteube
743dba56db Replaced timer macros with inlines 2016-10-01 12:55:39 +02:00
jsteube
ac3b850e40 replaced swap_workaround macro with byte_swap_32() from bitops.c 2016-10-01 12:39:48 +02:00
jsteube
91efbc4562 Renamed __hc_device_param to hc_device_param__ to comply with standard naming convention 2016-10-01 12:33:59 +02:00
jsteube
a02f6f5ad6 Give all those anonymous structures a name, makes it easier to load the project into VS 2016-10-01 11:54:00 +02:00
jsteube
55f1dc321a Replace ssort() with sort_r.h 2016-10-01 10:47:03 +02:00
jsteube
fb3e6bab0d Finished refactoring to remove all global variables 2016-09-30 22:52:44 +02:00
jsteube
ae0300dabb Rename kernel read and write function and make them static 2016-09-30 18:43:12 +02:00
jsteube
892eccfd14 Fix some missing sign conversions 2016-09-30 18:39:31 +02:00
jsteube
a5f842c4b5 Fix some missing sign conversions 2016-09-30 17:41:40 +02:00
jsteube
683077b42a Use larger counter to handle larger wordlists 2016-09-30 16:43:59 +02:00
jsteube
fe289da141 Make wordlist support modular 2016-09-30 13:02:15 +02:00
jsteube
eb6dffd52a Make tuning_db support modular 2016-09-30 12:58:06 +02:00
jsteube
46866dd0b1 Make potfile support modular 2016-09-30 12:37:29 +02:00
jsteube
a26f624032 Remove unneeded includes from outfile_check.c 2016-09-30 12:28:29 +02:00
jsteube
6bc0d94f56 Make opencl support modular 2016-09-30 12:21:09 +02:00
jsteube
4aebe51407 Make loopback support modular 2016-09-30 12:07:49 +02:00
jsteube
8034fb31b8 Make bitmaps, cracks-per-time and debugfile support modular 2016-09-30 11:48:14 +02:00
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
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
jsteube
34bcbb3091 Prepare for reintegration of nvapi for checking thermal limit 2016-06-02 14:20:51 +02:00
jsteube
3c6296801a Prepare for reintegration of nvapi for checking thermal limit 2016-06-02 14:20:15 +02:00
Jens Steube
7ba1322d7f Redesign some of the kernel_power features like too small wordlist detection etc, now based on autotuning results 2016-06-02 12:32:24 +02:00
jsteube
d329451cc1 Here it is: --powertune-enable for nvidia -- Works on both linux and windows 2016-06-01 19:01:44 +02:00
jsteube
a23c0c4716 Added a ton of new NVML stuff 2016-06-01 00:57:57 +02:00
jsteube
d89a8a68d6 Finally got rid of NvAPI on Windows, replace with NVML 2016-05-31 22:48:58 +02:00
jsteube
19e36694da Added support for --gpu-temp-retain for nvidia devices on windows
Disabled retain support by default, you can reactive it using --gpu-temp-retain
Completely get rid of HAVE_ADL, HAVE_NVML and HAVE_NVAPI in sources
2016-05-30 00:05:46 +02:00
jsteube
8ffbeac954 Add NvAPI_GPU_GetPerfDecreaseInfo() -- but i doesn't work, so deactive it 2016-05-29 20:51:52 +02:00
jsteube
63de7cdca8 Add NvAPI support for PCIE Lanes 2016-05-29 17:43:25 +02:00
jsteube
72384c1fc3 Add NVML support for PCIE Lanes 2016-05-29 16:54:07 +02:00
Jens Steube
53a4e0cbb7 Add PCI-E Lanes to status display, if available 2016-05-29 15:54:51 +02:00
Jens Steube
3e6ae89297 Add ADL_Overdrive6_TargetTemperatureData_Get() which for some reason does not work 2016-05-29 15:34:28 +02:00
jsteube
3e4badd9b4 Send a notice to user in case the drivers temperature threshold for slowdown is reached and a performance drop is expected due to throttling 2016-05-29 00:59:24 +02:00
jsteube
3227ef167e Added NvAPI support for querying current engine clock and current memory clock 2016-05-28 17:44:09 +02:00
jsteube
36def60bfa Added NVML support for querying current engine clock and current memory clock 2016-05-28 16:49:23 +02:00
Jens Steube
e97fa06a7a Added current engine clock and current memory clock to the status display (ADL only atm)
Automatically enable AMD powertune in benchmark-mode
2016-05-28 16:32:45 +02:00
radix
083c90a0ab
Update macros to match option --machine-readable 2016-05-27 04:26:39 -05:00
radix
2b2a0c585e
Change --status-automate to --machine-readble. The former didn't really illustrate the point of the command though the functionallity is great to have. Updated ASCII tables around options output. 2016-05-27 03:50:52 -05:00
radix
b0c158fba9
Helps to actually save files before trying to commit them. 2016-05-26 22:03:15 -05:00
jsteube
2dd8156d24 Introduce a true memset kernel, currently operates on 16 byte per item 2016-05-26 16:45:52 +02:00
jsteube
fd7bc2736d More vendor related changes 2016-05-26 14:56:42 +02:00
jsteube
f5f9073f45 Better distinguish between platform vendor and device vendor 2016-05-26 14:28:05 +02:00
Jens Steube
2899f53a15 Move files from include/ to OpenCL/ if they are used within kernels
Rename includes in OpenCL so that it's easier to recognize them as such
2016-05-25 23:04:26 +02:00
Jens Steube
c6c865e32e Some final fixes for d_return_buf refactorization; Initial kernels vor veracrypts SHA256 KDF (not working) 2016-05-21 00:39:22 +02:00
Jens Steube
37953cdc8f Optimize handling of cracked hashes, was a bottleneck if too many at once 2016-05-20 18:24:33 +02:00
Jens Steube
5d5d1a5843 More VeraCrypt stuff; SHA256 kernels missing and --veracrypt-pim missing 2016-05-19 22:37:43 +02:00
Jens Steube
d37b6c6c30 Prepare for VeraCrypt integration 2016-05-19 20:53:17 +02:00
jsteube
eea3424c38 Added SIMD code for all generic PBKDF2-HMAC-* modes 2016-05-15 19:54:56 +02:00
Jens Steube
5987029441 Added SIMD code for DCC2 2016-05-15 01:13:09 +02:00
Jens Steube
9d74f2958d Added SIMD code for WPA/WPA2 2016-05-14 19:45:51 +02:00
Jens Steube
d0123e63b1 Add WinZip test.pl and test.sh 2016-05-12 22:15:44 +02:00
Jens Steube
0891989404 Fix WinZip multihash 2016-05-12 13:05:12 +02:00
Jens Steube
7a4ab2b42d Prepare for WinZip integration 2016-05-12 09:26:54 +02:00
jsteube
e47030ed7d Prepare to rename project into hashcat
This release markes the fusion of "hashcat" and "oclHashcat" into "hashcat".
It combines all features of all hashcat projects in one project.
2016-05-10 19:07:07 +02:00
jsteube
768ffbdad8 Remove OPENCL EXTENSION, failing on Intel OpenCL SDK 2016-05-10 10:22:13 +02:00
jsteube
4317ac60f4 Remove unroll access for Drupal for NV gpus 2016-05-09 23:14:26 +02:00
jsteube
c79bed3b7d Prepare for a more dynamic #pragma unroll use 2016-05-09 21:32:12 +02:00
Jens Steube
8316210233 Unlock kernel_threads > 64 2016-05-04 00:52:53 +02:00
neheb
0397d4f0e0 Remove clang extension
It's only needed for using the static keyword. Since you removed those, clover builds it fine without it. Also removed the check since Mesa is considered IS_GENERIC now.
2016-05-01 17:39:44 -07:00
jsteube
9b3d18f87d SIMD for slow hashes prototype 2016-05-01 18:34:59 +02:00
Jens Steube
aef8dc2b01 First working version of -m 13500 2016-04-26 22:45:23 +02:00
Jens Steube
9294aaccae Merge pull request #311 from fgaudreault/master
Adding parser and basic kernels for -m 13500
2016-04-26 20:12:33 +02:00
Jens Steube
7cbce12ea7 Add platform vendor_id detection 2016-04-26 13:59:14 +02:00
Francois Gaudreault
96e60bfb05 Fixing minor definitions. 2016-04-25 09:11:49 -04:00
Jens Steube
42c83df959 Fix for 0H/s issue on different algorithms 2016-04-24 16:28:33 +02:00
Jens Steube
50ea3a88dd Merge pull request #305 from neheb/master
Disable AMD optimizations for LLVM
2016-04-24 15:18:17 +02:00
Jens Steube
96ef261326 Increase benchmark accuracy by using a result based on the last meassured speed after benchmark values changed by less than 0.1% after kernel repeats
Goal is a "what you see is what you get" value compared to: "singlehash -a 3 ?b?b?b?b?b?b?b" -- both with the same fixed -u and -n values
As a positive side-effect, this decreases total benchmark runtime
Add speed_cnt_total and speed_ms_total as a preparation to get rid of SPEED_MAXAGE which produces 0H/s display on very slow-hash types
Replace some floats with double which can (theoretically) become really big
2016-04-24 12:24:21 +02:00
Mangix
530651e96a Disable AMD optimizations for LLVM 2016-04-22 20:22:28 -07:00
Martin Lemay
8cf6607c87 Refactored 134 to 13500. Added esalt struct 2016-04-22 12:26:03 -04:00
Francois Gaudreault
2df81367df Adding parser and basic kernels for -m 134 2016-04-21 13:22:05 -04:00
Jens Steube
444a5f4d52 Test fix for broken AMD support after https://github.com/hashcat/oclHashcat/pull/303 2016-04-20 21:19:15 +02:00
Mangix
2c9fcbf17e Fix LLVM compilation for OpenCL kernels
Fix LLVM compilation for OpenCL kernels

Whoops
2016-04-20 09:43:35 -07:00
Fist0urs
2ce6fb997d Increase max size of input line to 0x50000 2016-04-18 18:40:13 +02:00
Fist0urs
9e8b7a1d9a -m 13400 Increased max kdb size to 300KB 2016-04-18 18:27:51 +02:00
Jens Steube
1bc9e3ec85 Do not modify the original positions of mac1, mac2, nonce1 and nonce2 in hccap files
Should fix https://github.com/hashcat/oclHashcat/issues/288
2016-04-17 10:44:14 +02:00
Michael Sprecher
0dcb762a8e
Added new hash mode -m 125 = ArubaOS 2016-04-10 00:58:28 +02:00
Fist0urs
34b8d89422 Added support of keyfiles within Keepass 1.x and Keepass 2.x 2016-04-06 16:05:09 +02:00
Jens Steube
09e971c938 Use a fixed path for the potfile rather than session depending 2016-04-03 15:46:05 +02:00
Jens Steube
3cd83a4ab9 Reverted an unnecessary change from https://github.com/hashcat/oclHashcat/pull/158 2016-04-03 14:41:03 +02:00
Fist0urs
52b17a602f New format -m 13400, Keepass 1 (AES/Twofish) and Keepass 2 (AES) 2016-04-02 14:45:05 +02:00
Jens Steube
88fafeb928 Synchronize maximum output line size with input line size 2016-03-31 16:12:13 +02:00
Jens Steube
c4e6ffc346 Removed some unused macros 2016-03-26 13:14:51 +01:00
Jens Steube
00724b40d7 Merge pull request #280 from MestreLion/patch-1
use a GCC equivalent for __stdcall where applicable
2016-03-26 10:54:46 +01:00
Jens Steube
0fdebf904d Replace BUFSIZ with HCBUFSIZ and move them from stack to heap 2016-03-26 10:37:59 +01:00
Rodrigo Silva
34b9de9a24 use a GCC equivalent for __stdcall where applicable
GCC on 32-bit architectures has __attribute__((stdcall)) as
an equivalent to Windows __stdcall, so use it conditionally
instead of leaving it blank for all non-Windows platforms.

This may benefit all platforms where GCC or compatible
compilers are used, including (but not limited to) Linux.
2016-03-25 16:05:26 -03:00
philsmd
3c1e05aaf3 #234: increase max. salt length to 28 for -m 22 = Juniper Netscreen/SSG (ScreenOS) 2016-03-07 15:52:50 +01:00
Jens Steube
55cadb6834 Fix broken -m 1500 and -m 3000 in -a 3 mode 2016-03-06 14:24:21 +01:00
philsmd
4ede3c1f7e #244: ADL array out-of-bound fix 2016-03-06 13:31:12 +01:00
Fist0urs
b0f1cb8a98 New format -m 13300 AxCrypt in memory SHA1 2016-03-02 14:35:10 +01:00
Fist0urs
ad17fba9b6 New format -m 13200 AxCrypt 2016-03-01 19:11:13 +01:00
Jens Steube
efad2bafac Evil Bug: Because of not-zeroing a buffer it's possible a hash was cracked but not reported as cracked because it was not in scope, but when it was in scope it was already marked as cracked and therefore not reported 2016-02-23 10:36:43 +01:00
Jens Steube
6bc98368ba Get rid of old pw_cache mechanism to control host-based vector data-types 2016-02-22 11:57:37 +01:00
Jens Steube
990f973c48 Add hard-wired Device-Name for Tuning-Database which matches all Device-Types:
- DEVICE_TYPE_CPU
- DEVICE_TYPE_GPU
- DEVICE_TYPE_ACCELERATOR
Optimized IRIS GPU workaround settings
2016-02-20 00:58:22 +01:00
Jens Steube
96bde85378 Allow mixed settings auto and fixed values for parameter and inside tuningdb for loops and accel 2016-02-19 18:58:03 +01:00
magnum
a5be8a75ed Allow and support vector-width 16, which is current maximum for
OpenCL. Closes #226.
2016-02-18 08:51:45 +01:00
Fist0urs
c3dabdd69e Initial commit 2016-02-16 16:34:46 +01:00
Jens Steube
0cbe2347cd Merge pull request #223 from gm4tr1x/clEnqueueNDRangeKernelMod
Get rid of hc_clEnqueueNDRangeKernel double call
2016-02-15 18:56:03 +01:00
Jens Steube
709f79a7da Add option to repeat the kernel on the device NUM times to increase benchmark accuracy 2016-02-15 17:42:09 +01:00
Jens Steube
c09bc848f7 Autotuning engine prototype 2016-02-14 15:45:52 +01:00
Jens Steube
c0293928dd Prepare for better autotuning capabilities 2016-02-13 16:07:58 +01:00
Gabriele 'matrix' Gristina
2a1d0d21ff Get rid of hc_clEnqueueNDRangeKernel double call 2016-02-12 17:11:23 +01:00
Jens Steube
2dfe9200d6 Remove Wordload-Profiles from tuningdb, we can simply calculate it 2016-02-11 14:16:08 +01:00
jsteube
5c01349ba6 Update event handling to workaround event handling error in nvidia opencl runtime 2016-02-11 09:54:50 +01:00
Gabriele 'Matrix' Gristina
20ee62e196 Revert "Use per-device timer resolution in total_time calculations" 2016-02-10 22:31:43 +01:00
Jens Steube
02ad834c7f Added new concept of a tuning database; tryout phase 2016-02-10 20:40:21 +01:00
Gabriele 'matrix' Gristina
523a7bfe93 Use CL_DEVICE_PROFILING_TIMER_RESOLUTION per-device value in total_time calculations 2016-02-09 21:48:18 +01:00
Jens Steube
9fc360e39d Added the execution time of the running kernel to the status display 2016-02-09 20:01:50 +01:00
Gabriele 'matrix' Gristina
74be8e2e25 skip device if buildProgram() fail 2016-02-07 21:20:10 +01:00
Jens Steube
6d37c123a5 Merge branch 'master' of https://github.com/hashcat/oclHashcat 2016-02-06 23:22:38 +01:00
Jens Steube
ab5ecd8eaa Fix some updated buffer sizes and new optimizer descriptions 2016-02-06 23:22:26 +01:00
Jens Steube
0362df07ed Merge pull request #210 from gm4tr1x/hd4000v0
Fix SHA-3(Keccak) issue with HD4000 (issue #191) and reorder macro
2016-02-06 22:07:38 +01:00
Gabriele 'matrix' Gristina
225fc28dff Fix SHA-3(Keccak) issue with HD4000 (issue #191) and reorder macro 2016-02-06 18:18:21 +01:00
Gabriele 'matrix' Gristina
e2db8afdf8 Add missing pthread_setaffinity_np for osx 2016-02-06 18:00:04 +01:00
Jens Steube
fa0e6fb78e Merge pull request #204 from gm4tr1x/LoopAccelMod
gpu loops/accel per-device
2016-02-05 17:17:04 +01:00
Gabriele 'matrix' Gristina
fa7465aa86 gpu loops/accel per-device 2016-02-05 15:27:09 +01:00
Jens Steube
22834781f5 Hack in NvAPI_GPU_GetCoolerSettings(); Enables query fanspeed in percentage on windows 2016-02-05 11:28:31 +01:00
Gabriele 'matrix' Gristina
89e5ed2574 handling possible clEnqueueFillBuffer not found in opencl lib 2016-02-04 21:06:19 +01:00
Jens Steube
2381af313d Some cleanups 2016-02-04 15:47:52 +01:00
Gabriele 'matrix' Gristina
e67eec1ae0 get rid of nvidia nvapi static linking 2016-02-03 20:53:00 +01:00
Gabriele 'matrix' Gristina
f3407cd7f4 HWMon mod 2016-02-02 01:14:33 +01:00
Gabriele 'matrix' Gristina
88087295b3 Removed deprecated and unused ADL function (ADL_DisplayEnable_Set) 2016-02-01 15:39:44 +01:00
Gabriele 'matrix' Gristina
0f159d42e6 Fixed HC_LOAD_FUNC macro 2016-02-01 13:07:14 +01:00
Jens Steube
b8285cbce2 Fix broken ADL on windows 2016-02-01 12:18:05 +01:00
Jens Steube
f256363448 Merge pull request #190 from gm4tr1x/fixLoopsAccelV3
Fixed loops/accel for 6800, 11300 and 11600 (osx)
2016-02-01 08:08:20 +01:00
Gabriele 'matrix' Gristina
d120ede655 Update ADL Library Loader 2016-01-31 23:48:38 +01:00
Gabriele 'matrix' Gristina
b542d4a431 Fixed loops/accel for 6800, 11300 and 11600 (osx) 2016-01-31 21:48:08 +01:00
Jens Steube
55d4904dd3 Merge pull request #185 from gm4tr1x/fixLoopsAccelv2
Fixed some gpu loops/accel settings
2016-01-31 18:27:21 +01:00
Gabriele 'matrix' Gristina
53faf6a24a Fixed some gpu loops/accel settings 2016-01-31 17:38:05 +01:00
Jens Steube
6846348602 Use a different workaround for a catalyst bug which takes effect in sha512crypt 2016-01-31 17:24:12 +01:00
Gabriele 'matrix' Gristina
f9598f691d Fixed CL_INVALID_WORK_GROUP_SIZE error with Apple CPU 2016-01-30 22:28:41 +01:00
Gabriele 'matrix' Gristina
d147d89f5e cleanup unnecessary clGetProgramBuildInfo code 2016-01-30 20:05:39 +01:00
Jens Steube
060af27dd9 Merge branch 'master' of https://github.com/hashcat/oclHashcat 2016-01-29 18:38:46 +01:00
Jens Steube
eb60d6bb23 Remove MD4/MD5 *H1/*H2 functions and use original H functions. Modern compilers will find this easy optimization automatically 2016-01-29 18:38:34 +01:00
magnum
ce170ea980 Acquire an exclusive lock before writing to any file. Note that in
some cases we never explicitly unlock a file because fclose will do
it implicitly. Closes #172.
2016-01-29 16:48:19 +01:00
Gabriele 'matrix' Gristina
3952fa7e06 Updated gpu accel for -m 6211 and default runtime value to 8 2016-01-27 23:39:58 +01:00
magnum
115d2b6a5a Drop dependencies on non-distributable ADL/NVML headers. The needed glue
is copied into our respective local headers. Should close #120.
2016-01-27 18:48:54 +01:00
Jens Steube
cae457df0c Merge pull request #167 from gm4tr1x/issue84
Issue84
2016-01-27 18:43:18 +01:00
Jens Steube
9ec2c86cd0 Merge pull request #165 from gm4tr1x/gcc-warnings
Fixed gcc warnings
2016-01-27 18:19:50 +01:00
Jens Steube
9d5a757ae5 Merge pull request #157 from gm4tr1x/loops-accel
Improved osx support with custom kernel loops and gpu accel (issue #63)
2016-01-27 18:19:11 +01:00
Gabriele 'matrix' Gristina
b7d3a7c5bc Fixed gcc warnings 2016-01-27 01:08:35 +01:00
Gabriele 'matrix' Gristina
5bae9de3a3 Implemented OpenCL library loader 2016-01-26 21:40:49 +01:00
Gabriele 'matrix' Gristina
6ba392c0df Modified as @jsteube request 2016-01-26 12:07:19 +01:00
Gabriele 'matrix' Gristina
6cbe3cee50 Cosmetix fix for types.h 2016-01-25 12:28:06 +01:00
Gabriele 'matrix' Gristina
dcc4b5a60f Added custom OSX kernel loops and gpu accel default values
Disabled some not yet worked hash types in OSX
2016-01-24 22:48:01 +01:00
Jens Steube
20b0c23af1 Merge pull request #146 from gm4tr1x/master
Fixed some memory allocations and other small things
2016-01-23 15:43:47 +01:00
Jens Steube
1d3795a3ab Converted _a3 kernels, use SIMD for CPU and GPU 2016-01-23 15:32:31 +01:00
Gabriele 'matrix' Gristina
076597fe01 Fixed some memory allocations and other small things 2016-01-21 17:20:02 +01:00
Jens Steube
bfc4495bd3 Expanded version information as discussed in https://github.com/hashcat/oclHashcat/issues/138 2016-01-21 10:17:22 +01:00
Gabriele 'matrix' Gristina
5da79e4411 Added support for build without ADL/NVML/NVAPI (issue #120)
Added support for build OSX native binaries (issue #63)
2016-01-20 20:55:09 +01:00
jsteube
e3c0c80b6f Prepare new SIMD code for kernel, -m 0, 10, 20, 1000 should work in -a 3 mode and other hopefully stay unaffected 2016-01-17 22:17:50 +01:00
jsteube
5ae5a4bc25 Reorder device mapping 2016-01-15 17:23:07 +01:00
Jens Steube
63e06f582b Prepare fix for datatypes, not final 2016-01-15 17:16:43 +01:00
Jens Steube
49d0767aa8 Run weak-hash checks only in straight-attack mode, this greatly reduces code complexity 2016-01-13 22:22:46 +01:00
Jens Steube
52d71de0d4 Added support to utilize multiple different OpenCL platforms in parallel, ex: AMD + NV 2016-01-13 17:10:40 +01:00
Jens Steube
6b4e4c060a Replace typedef for bool with stdbool.h 2016-01-12 18:56:26 +01:00
Jens Steube
0ff49c5b44 Fix segfault in related to weak-hash-check on CPU devices
Move typedef for bool datatype to common.h
2016-01-12 17:18:01 +01:00
Jens Steube
730044e26e Added option --opencl-device-types to filter for specific OpenCL device types 2016-01-12 00:44:28 +01:00
philsmd
02cecce247 fixed hardware monitor: mapping between supported ADL devices and available GPU (and CPUs) fixed 2016-01-12 00:30:28 +01:00
Jens Steube
1d628ca6e0 The weak-hash-check feature didn't work for algorithms that made use of some automatic optimizer flags
We'll enforce a weak-hash-check on an _a0 kernel for them
2016-01-10 21:02:03 +01:00
jsteube
3cdee2e06e We need an esalt to hold the unused IV otherwise the unique salt count becomes incorrect in multihash sitations 2016-01-09 21:35:29 +01:00
jsteube
f0a84a2410 Added new hash mode -m 13000 = RAR5 2016-01-09 20:34:12 +01:00
jsteube
332b3c35e5 Added new hash mode -m 12900 = Android FDE (Samsung DEK) 2016-01-09 00:49:54 +01:00
jsteube
e8229af09b Fix for -m 1500, -m 3000: Missing "defined" keyword
Fix for -m 1000: MD4_H1 copy/paste error
Fix for -m 8900, -m 9300: Invalid value for device_processor_cores for CPU devices
Fix for -m 9100: Variable salt2 initializer needed some clauses for clearness
Temporary limit gpu_accel for CPU devices to 1 for development phase
Mark pocl as too bleeding edge for production use, recommend native drivers
Remove workarounds for pocl
Rename VENDOR_ID_UNKNOWN to VENDOR_ID_GENERIC in host code
Rename IS_UNKNOWN to IS_GENERIC in kernel code
2016-01-07 20:14:34 +01:00
jsteube
6e680aa31c Workaround for either pocl or llvm fails and produces invalid optimized code 2016-01-06 11:48:18 +01:00
jsteube
331188167c Replace the substring GPU to a more appropriate "device" or "kernel" substring depending on the context 2016-01-05 08:26:44 +01:00
jsteube
894140b816 Generate a more easy to read filename for cached kernels 2016-01-04 20:56:15 +01:00
jsteube
8baf705f6a Preparation for distinguish between OpenCL device types at runtime (mostly for HMS) 2016-01-04 20:12:34 +01:00
jsteube
c4b1c8e7ca small fix for unknown opencl platforms 2016-01-04 16:13:10 +01:00
jsteube
3b589e3aac Prepare for allow other OpenCL platforms thans AMD and NVidia 2016-01-04 13:17:20 +01:00
jsteube
0428514f61 Extended support from 14 to 255 functions calls per rule on GPU 2016-01-03 19:49:47 +01:00
philsmd
d378319ea6 this patch makes it much clearer where the sessions under ~/.hashcat are located 2016-01-03 17:11:36 +01:00
jsteube
d008a45f3c Activate reordering or files to help integration into linux distributions
Details can be found here: https://github.com/hashcat/oclHashcat/issues/20
2016-01-03 00:40:31 +01:00
jsteube
31292946e2 Fix some scrypt default values 2015-12-30 23:06:45 +01:00
jsteube
c17bf5e865 - Fixed PHY memory handling for scrypt based algorithms
- Bring back kernel exec timeout checking for NV
2015-12-23 15:51:55 +01:00
jsteube
84568e5b3d Increase bcrypt speed for NV 2015-12-22 23:43:39 +01:00
jsteube
7be2c2fd8d Fixed some speeds:
1800
3200
7100
7200
7400
8200
9300
9000
9600
11300
11600
2015-12-21 14:29:04 +01:00
jsteube
378258d789 Fix caching system for use with AMD and NV, drop BINARY_KERNEL define 2015-12-21 12:01:38 +01:00
jsteube
9115547601 Revert "Fix -m 10700"
This reverts commit 15da53da38.
2015-12-19 18:18:28 +01:00
jsteube
15da53da38 Fix -m 10700 2015-12-19 18:17:19 +01:00
jsteube
91249942ab Fix -m 1800 for NV 2015-12-17 19:19:31 +01:00
jsteube
9c392b472e Removed useless comments 2015-12-16 11:18:57 +01:00
jsteube
c29c7c093f Fix use of LOP3 2015-12-16 11:11:31 +01:00
Jens Steube
0f1ae86be9 Fix invalid VENDOR_ID for AMD 2015-12-16 10:00:33 +01:00
philsmd
cff683eac1 change in library loading: libnvidia-ml now does load dynamically only on NVidia systems 2015-12-15 20:34:07 +01:00
philsmd
3ab7a23cd5 fixed hardware monitor for amd/nv (one problem that is still there since last commit: dynamic loading of libnvidia-ml) 2015-12-15 18:41:11 +01:00
jsteube
0bf4e3c34a - Dropped all vector code since new GPU's are all scalar, makes the code much easier
- Some performance on low-end GPU may drop because of that, but only for a few hash-modes
- Dropped scalar code (aka warp) since we do not have any vector datatypes anymore
- Renamed C++ overloading functions memcat32_9 -> memcat_c32_w4x4_a3x4
- Still need to fix kernels to new function names, needs to be done manually
- Temperature Management needs to be rewritten partially because of conflicting datatypes names
- Added code to create different codepaths for NV on AMD in runtime in host (see data.vendor_id)
- Added code to create different codepaths for NV on AMD in runtime in kernels (see IS_NV and IS_AMD)
- First tests working for -m 0, for example
- Great performance increases in general for NV so far
- Tested amp_* and markov_* kernel
- Migrated special NV optimizations for rule processor
2015-12-15 12:04:22 +01:00
Jens Steube
586441fa25 Revert "Fixed a bug where oclHashcat rejected to load a rule which calls 15 functions although it is supported"
This reverts commit f230ed73dc.

Some kernel require too much constant memory and do not compile anymore
2015-12-13 18:46:21 +01:00
Jens Steube
f230ed73dc Fixed a bug where oclHashcat rejected to load a rule which calls 15 functions although it is supported 2015-12-13 14:54:39 +01:00
Jens Steube
1537390fae Prepare reordering or files to help integration into linux distributions as discussed in https://github.com/hashcat/oclHashcat/issues/20
TODOS:
- Let oclHashcat actually use the new paths
- Find a better way for native compilation
- Replace /bin/cp with /usr/bin/install where it has to copy files recursive
2015-12-13 12:21:36 +01:00
jsteube
968265fffb - Prepared for JIT use of hash-mode 1500, 8900 and 9300, works already on OpenCL (AMD)
- Changed PROMPT
2015-12-07 21:37:12 +01:00
philsmd
946b4a37d0 implements the enhancement mentioned in issue #10 (cancel on next checkpoint) 2015-12-07 18:31:45 +01:00
philsmd
ef548d3088 fixes issue #5: formatting problem with tabs vs spaces 2015-12-06 11:29:29 +01:00
Jens Steube
5065474b4e Initial commit 2015-12-04 15:47:52 +01:00