1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-12-16 11:48:15 +00:00
Commit Graph

332 Commits

Author SHA1 Message Date
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