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

4021 Commits

Author SHA1 Message Date
Martin Lemay
d9889727e6 Removed SHA1 optimization. 2016-04-25 09:33:43 -04:00
Martin Lemay
a1aef652c2 Fixed snprintf. 2016-04-25 09:32:41 -04:00
Francois Gaudreault
96e60bfb05 Fixing minor definitions. 2016-04-25 09:11:49 -04:00
jsteube
082b1504b1 Initial MESA support, needs more fixes 2016-04-25 13:51:18 +02:00
Jens Steube
dcbf665313 Use a more optimal salt value for descrypt benchmark 2016-04-24 18:08:11 +02:00
Jens Steube
42c83df959 Fix for 0H/s issue on different algorithms 2016-04-24 16:28:33 +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
Martin Lemay
89ebc48942 Fixed snprintf cast warnings 2016-04-24 14:29:19 -04:00
Francois Gaudreault
f76b9d0013 Adding Tests, fix one compile warning 2016-04-22 19:36:07 -04:00
Martin Lemay
39445340ae Minor adj. and sanity check on pstoken_parse_hash(). 2016-04-24 07:29:53 -04:00
Martin Lemay
f0535b1a52 ascii_digest additions. 2016-04-22 16:21:55 -04:00
Martin Lemay
1c8368d1cd changed to OPTS_TYPE_PT_ADD80 2016-04-22 15:33:31 -04:00
Martin Lemay
ac35ab8111 esalt hex convertion. 2016-04-22 15:32:06 -04: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
37c40dcfb4 Accept \r as newline in thread_keypress() 2016-04-19 13:11:28 +02:00
Jens Steube
6fcf58e106 Fix for https://github.com/hashcat/oclHashcat/issues/302 2016-04-19 13:04:33 +02:00
Jens Steube
13b2758084 Added parameter --potfile-path to override default potfile path 2016-04-17 19:14:55 +02:00
Jens Steube
63ba540f2b Add some additional information to error-text in read_restore() 2016-04-17 17:48:48 +02:00
Jens Steube
e6b9071b52 Cleanup -m 9800 kernels to latest standard 2016-04-17 15:49:02 +02:00
Jens Steube
fb6dec55af Small fix related to 3cd83a4ab9 2016-04-17 11:00:53 +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
Jens Steube
0f73c778d5 Optimized -m 8300 (DNSSEC) cracking performance in -a 3 mode 2016-04-16 11:50:48 +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
jsteube
5f05fbf103 Prevent NV OpenCL runtime to cache kernels to ~/.nv by using an undocumented environment variable CUDA_CACHE_DISABLE 2016-04-03 17:39:33 +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
2b6fc52c72 Merge pull request #286 from Fist0urs/Keepass
-m 13400 add missing 'break;' statement
2016-04-03 10:16:16 +02:00
Jens Steube
32fff7cd13 Merge pull request #285 from philsmd/pr-keepass-parser-fix
fixed some parser checks for new keepass format (-m 13400)
2016-04-03 10:15:14 +02:00
Fist0urs
a027805608 -m 13400 add missing 'break;' statement 2016-04-03 01:50:28 +02:00
philsmd
9ea2f5fef1 fixed some parser checks for new keepass format (-m 13400) 2016-04-02 18:16:08 +02:00
philsmd
b3dfd7057e fixed -m 10200 = Cram MD5 parser: check for NULL pointers ASAP, check base64 input length 2016-04-02 18:05:08 +02:00
Fist0urs
c7cb30167f Cosmetic change: add newline to --help 2016-04-02 15:49:02 +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
d0e7ee6824 Merge pull request #281 from philsmd/master
fixed base64_decode () input length validation for -m 8900
2016-04-02 13:36:03 +02:00
Jens Steube
88fafeb928 Synchronize maximum output line size with input line size 2016-03-31 16:12:13 +02:00
philsmd
9b75b245d5 fixed base64_decode () input length validation for -m 8900 2016-03-29 09:49:05 +02:00
Jens Steube
027631bdc8 Eventual patch for issue https://github.com/hashcat/oclHashcat/issues/279 2016-03-26 11:01:20 +01:00
Jens Steube
0fdebf904d Replace BUFSIZ with HCBUFSIZ and move them from stack to heap 2016-03-26 10:37:59 +01:00
philsmd
9a135de1c1 fixed problem with -m 5600 = NetNTLMv2 parser 2016-03-21 18:51:21 +01:00
philsmd
e7e5333d23 fixed -m 5500 parser, avoid strange crashes 2016-03-21 09:11:10 +01:00
philsmd
e179c53f19 fixed some parser checks to avoid crashes (-m 5300/5400) 2016-03-20 19:24:21 +01:00
philsmd
5174de48c9 fixed -m 133 = PeopleSoft (-a 0/-a 1 problem only) + added to test.sh 2016-03-16 09:11:54 +01:00
philsmd
3c2f8fb88b added some checks to the -m 1711 = SSHA-512(Base64), LDAP {SSHA512} parser 2016-03-15 16:28:57 +01:00
Jens Steube
5d886658da Merge pull request #270 from philsmd/pr-hlfmt-hash-len-check
added check for hash_len/hash_buf after calls to hlfmt_hash ()
2016-03-13 19:01:59 +01:00
philsmd
1699057516 show a warning if hlfmt_hash () fails 2016-03-13 18:21:27 +01:00
philsmd
b76495e0f5 also add check for NULL pointers 2016-03-13 17:42:12 +01:00
philsmd
27ef5885f4 added check for hash_len after calls to hlfmt_hash () 2016-03-13 17:39:53 +01:00
philsmd
bc965c9c9b fixed checks in -m 500 parser 2016-03-13 15:57:53 +01:00
philsmd
b755e5b6f3 added some checks to the -m 111 = nsldaps, SSHA-1(Base64), Netscape LDAP SSHA parser 2016-03-11 17:55:19 +01:00
Jens Steube
d7f8b356ef Fix for #265: hashcat_tuning.hctab wasn't installed automatically 2016-03-10 19:20:05 +01:00
philsmd
8634bde118 added additional check for max. ESSID length to prevent eventual crashes 2016-03-09 11:13:41 +01: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
536f9c955e Merge pull request #257 from philsmd/master
show autotuned kernel accel and kernel loop values only when debugging
2016-03-07 11:43:39 +01:00
Jens Steube
e71313b871 Fix invalid progress value and ETA in case of cracked salts 2016-03-07 11:38:00 +01:00
philsmd
73f897193e show autotuned kernel accel and kernel loop values only when debugging 2016-03-06 17:25:05 +01:00
Jens Steube
4709550a57 Merge pull request #256 from philsmd/pr-cl-debug-buildlog
show build log whenever 'make DEBUG > 0' is set
2016-03-06 14:30:18 +01:00
philsmd
01a7adc12a show build log whenever 'make DEBUG > 0' is set 2016-03-06 14:27:19 +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
6636cc144d #245: Makefile DEBUG fix 2016-03-06 12:03:08 +01:00
Fist0urs
b0f1cb8a98 New format -m 13300 AxCrypt in memory SHA1 2016-03-02 14:35:10 +01:00
Fist0urs
9811a21098 -m 13100 Fix overflow in input hash parsing 2016-03-02 10:31:54 +01:00
Fist0urs
ad17fba9b6 New format -m 13200 AxCrypt 2016-03-01 19:11:13 +01:00
philsmd
93a134e9b6 cast to uint is required with some gcc versions, otherwise we get a shift-negative-value warning 2016-02-27 19:56:20 +01:00
philsmd
0ea05ab292 minor: reformatting of recently changed code + use uint instead of unsigned int 2016-02-25 11:13:11 +01:00
philsmd
2ea295171c this fixes the beta issue #163 (-d and --opencl-platforms not within valid range) 2016-02-24 19:50:05 +01:00
Jens Steube
31ee4e67d1 Merge pull request #237 from gpuhash/master
Fairly strict stamping of WPA salt components
2016-02-24 15:56:02 +01:00
Jens Steube
531f72c905 Fix this evil bug, pw->i is u32, not u8 2016-02-23 21:24:03 +01:00
gpuhash
541f231c23 Minor bugfix 2016-02-23 22:01:55 +03:00
gpuhash
d56394c849 Fairly strict stamping of WPA salt components 2016-02-23 21:31:18 +03:00
Jens Steube
8c89ef0490 Ensure a minimum length for password candidates in autotune 2016-02-23 18:51:28 +01:00
Jens Steube
2236bb972c We still need on initial testrun in autotune 2016-02-23 15:36:06 +01:00
Jens Steube
01c847ba94 Do not use values that can actually crack a hash in autotune 2016-02-23 15:00:56 +01:00
Jens Steube
75c6d28a5f Fix missing memset after previous fix 2016-02-23 10:52:02 +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
61f87b2981 Try to load libOpenCL.so.1 if libOpenCL.so was not found 2016-02-23 07:57:52 +01:00
Jens Steube
f9834f3dfa Zero pws_buf before reuse 2016-02-22 21:33:33 +01:00
Jens Steube
e6e5005a6b Revert "Zero pws_buf before reuse"
This reverts commit b409e5e9e1.
2016-02-22 21:32:38 +01:00
Jens Steube
b409e5e9e1 Zero pws_buf before reuse 2016-02-22 21:20:16 +01:00
Jens Steube
6c10ca5853 Fix use of find_kernel_power_div() 2016-02-22 12:50:04 +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
ec869595d1 Add auto-append for 0x01 and 0x80 in ATTACK_MODE_HYBRID2 2016-02-22 10:36:04 +01:00
Jens Steube
bb732686b1 Autotune should respect --quiet parameter 2016-02-21 18:23:04 +01:00
Jens Steube
9a128ce667 Fix force_jit_compilation usage 2016-02-21 13:30:28 +01:00
Jens Steube
7190dcf855 Prepare NEW_SIMD_MODE for -a 1 kernels 2016-02-20 16:13:06 +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
Fist0urs
62bed36638 Add verification of checksum for -m 13100
This avoid collisions by arc4'ing all data then hmac-md5
when valid ASN1 structures headers are found.
Performance should not be impacted.
2016-02-19 23:12:46 +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
Jens Steube
14fe45b1f0 Simplify steps for autotune 2016-02-18 14:44:44 +01:00
Jens Steube
a83622faaf Fix final autotune balancing 2016-02-18 13:04:25 +01:00
Jens Steube
f05944395a Move fake word generation to try_run() to avoid unwanted caching 2016-02-18 10:49:23 +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
magnum
998605ef89 Simplify code. No change in functionality at all. 2016-02-17 18:24:35 +01:00
philsmd
8298afa462 minor: some formatting fixes re: #225 (-m 13100 = Kerberos 5 TGS-REP etype 23) 2016-02-17 11:02:40 +01:00
Fist0urs
c3dabdd69e Initial commit 2016-02-16 16:34:46 +01:00
Jens Steube
4bc02e5ac8 Replace OpenCL event's with own timers, this saves us a thread-pair spawned on nvidia's OpenCL runtime and doesn't affect others 2016-02-15 22:27:30 +01:00
Jens Steube
c44b50c2e2 Use CL_DEVICE_NATIVE_VECTOR_WIDTH_* instead of CL_DEVICE_PREFERRED_VECTOR_WIDTH_* 2016-02-15 21:19:41 +01:00
Jens Steube
1af0f9c67b Fix autotune in -i mode 2016-02-15 21:08:16 +01:00
jsteube
bbadabe278 Fix another source of 0H/s in benchmark mode 2016-02-15 20:32:01 +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
eaf7a7cb2f Final balance meassurements for autotune 2016-02-15 14:57:03 +01:00
Jens Steube
a9e3ef0576 In benchmark-mode, do not depend any longer on a fixed time, better use a single iteration instead 2016-02-15 12:38:54 +01:00
Jens Steube
8af57d55f4 Disable GPU-Temp monitoring during benchmark 2016-02-14 20:15:14 +01:00
jsteube
f1e0cd6d56 Autotune: 200 loops should be fine for a start 2016-02-14 20:07:16 +01:00
Jens Steube
515385c57d Add dedicated steps for loops and accel 2016-02-14 18:23:21 +01:00
Jens Steube
72e0553e44 Fixed a missing condition 2016-02-14 15:50:29 +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
Gabriele 'matrix' Gristina
c97dbf56cb Fix bug in weak_hash_check(), wrong kernel_loops assigned 2016-02-12 14:04:13 +01:00
Jens Steube
2dfe9200d6 Remove Wordload-Profiles from tuningdb, we can simply calculate it 2016-02-11 14:16:08 +01:00
Jens Steube
10dc25f807 Merge pull request #217 from magnumripper/master
Use device's preferred vector width, not its native one.
2016-02-11 10:08:57 +01:00
jsteube
5c01349ba6 Update event handling to workaround event handling error in nvidia opencl runtime 2016-02-11 09:54:50 +01:00
magnum
162bc25a3d Use device's preferred vector width, not the native one. Also, don't
assume vector width for 'long' is half of that for 'int'.
2016-02-10 23:43:08 +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
Jens Steube
8d85b7539d Fixed a bug in line counter: Conditional jump or move depends on uninitialised value 2016-02-10 16:56:51 +01:00
Jens Steube
e80541d6dd Check for allocatable device-memory depending on kernel_accel amplifier before trying to allocate 2016-02-10 13:31:04 +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
952c20e0f8 Merge pull request #211 from gm4tr1x/issue150
Fixed "VENDOR_ID" format (probably relate with issue #150)
2016-02-06 22:08:34 +01:00
Gabriele 'matrix' Gristina
91fae7e49a Fixed bug in 8900 (probably relate with issue #150) 2016-02-06 19:36:00 +01:00
Gabriele 'matrix' Gristina
e2db8afdf8 Add missing pthread_setaffinity_np for osx 2016-02-06 18:00:04 +01:00
Gabriele 'matrix' Gristina
5953130062 Fix clEnqueueNDRangeKernel() error -54 2016-02-06 15:40:22 +01:00
Jens Steube
8650212b80 Remove Workload display in benchmark, remove unused variable 2016-02-05 17:26:51 +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
Jens Steube
6c5938201b Revert "Merge pull request #202 from magnumripper/master"
This reverts commit 28edfbd654, reversing
changes made to b6f10a2a81.
2016-02-04 23:32:18 +01:00
magnum
947a927ed2 Do not silently ignore -w2 for -b. Closes #201. 2016-02-04 23:20:37 +01:00
magnum
68dbaa6f8a Bugfix: putenv(3) was used with a stack variable, that's a no-no. 2016-02-04 22:49:34 +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
Jens Steube
4d2be9073e Consolidate hardware monitoring interface status on startup 2016-02-04 15:07:38 +01:00
Gabriele 'matrix' Gristina
74db620d51 Add missing memset and update ext_nvapi.c header 2016-02-04 13:36:52 +01:00
Jens Steube
e01038083c Update Makefile and BUILD.md 2016-02-04 09:44: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
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
Jens Steube
102dee00eb Merge pull request #192 from gm4tr1x/ADL_LibraryLoader
Update ADL/OpenCL Library Loader
2016-02-01 08:08:13 +01:00
Gabriele 'matrix' Gristina
d120ede655 Update ADL Library Loader 2016-01-31 23:48:38 +01:00
jsteube
d0d3507dc2 Fix TI series detection 2016-01-31 22:53:28 +01:00
jsteube
21525b74e1 Remove more unnecessary libOpenCL*.a related stuff 2016-01-31 22:01:32 +01:00
Gabriele 'matrix' Gristina
b542d4a431 Fixed loops/accel for 6800, 11300 and 11600 (osx) 2016-01-31 21:48:08 +01:00
Gabriele 'matrix' Gristina
dcb4888dd5 Remove unnecessary libOpenCL*.a from Makefile 2016-01-31 19:48:40 +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
Gabriele 'matrix' Gristina
0a907fc210 Fixed typo in help 2016-01-31 13:59:36 +01:00
Gabriele 'matrix' Gristina
0f0984fe86 Fixed all gpu code (see PR #179 for details) 2016-01-30 23:02:15 +01:00
Jens Steube
9aea991424 Use a rc for first result, easier to read 2016-01-30 22:47:13 +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
Gabriele 'matrix' Gristina
5d4160dc8c Fixed gcc warnings about missing field initializers 2016-01-30 14:59:26 +01:00
Jens Steube
2c4ad77275 Some systems don't like using the same buffer for both input and output at the same time with snprintf() 2016-01-29 22:47:42 +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
ebd28553a5 Handling clBuildProgram failure (show build log on errors) 2016-01-28 21:02:36 +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
Jens Steube
bfe3f148d7 As long as we depend on NVAPI for windows we also need to add a path to its includes 2016-01-27 20:09:17 +01:00
Gabriele 'matrix' Gristina
9eefb4bcd7 Fixed get_profile_dir and get_session_dir byte missing bug 2016-01-27 19:29:51 +01:00
Jens Steube
2232b1632e Merge pull request #169 from magnumripper/onetwenty
Drop dependencies on non-distributable ADL/NVML headers.
2016-01-27 19:15:31 +01:00
Jens Steube
af7ff57b3d Merge pull request #168 from magnumripper/onesixfour
Do not create a kernel cache file if build failed (actually if size ended up as zero).
2016-01-27 18:52:10 +01:00
Jens Steube
98ec1bcee7 Merge pull request #156 from gm4tr1x/master
Updated test.sh (support for osx and some fixes)
2016-01-27 18:51:28 +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
magnum
f5d6f9b6d4 Do not create a kernel cache file if build failed. Also disregard any
existing cache files with size of zero. Should close #164.
2016-01-27 18:39:45 +01:00
Jens Steube
9ec2c86cd0 Merge pull request #165 from gm4tr1x/gcc-warnings
Fixed gcc warnings
2016-01-27 18:19:50 +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
1124687270 OpenCL runtime environment is no longer required with --keyspace option 2016-01-25 15:44:04 +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
Gabriele 'matrix' Gristina
479327fc20 Re-enable gpu-temp-disable argument for osx build 2016-01-24 17:49:15 +01:00
Gabriele 'matrix' Gristina
58359f3b7e Fixed 'buf' initialization for windows 2016-01-24 17:20:01 +01:00
Jens Steube
0997ae029e Remove NO-BREAK SPACE character (utf8) from sources 2016-01-24 17:08:49 +01:00
Jens Steube
9c89b58f76 Merge pull request #153 from gm4tr1x/missingcheck
Added missing check for in_len in _old_apply_rule function
2016-01-24 16:24:57 +01:00
Jens Steube
d275748c7c Merge pull request #152 from gm4tr1x/buf
Optimized memset calls and also some initializations
2016-01-24 16:24:10 +01:00
Gabriele 'matrix' Gristina
17d885ffa4 Added missing check for in_len in _old_apply_rule function 2016-01-24 15:13:43 +01:00
Gabriele 'matrix' Gristina
8674959a93 @philsmd suggestion (PR #152) 2016-01-24 14:33:19 +01:00
Gabriele 'matrix' Gristina
3abacf515c Optimized memset calls and also some initializations 2016-01-24 13:25:47 +01:00
Gabriele 'matrix' Gristina
8d891ef0ba Avoid sprintf 2016-01-24 13:05:02 +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
4c0e520fd8 Test convert for -m 1000 with -a 0 for SIMD, speed is now on par or faster than hashcat 2016-01-21 16:47:38 +01:00
Jens Steube
add18eaa6d Fix for last commit 2016-01-21 10:22:57 +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
philsmd
751a364125 #137: fixes padding for base64_encode () and base64_decode() 2016-01-19 22:32:20 +01:00
philsmd
e1ae2538c6 cosmetic fix: some fixed typos e.g. to -> too 2016-01-19 20:47:18 +01:00
philsmd
5e92020180 buffer overflow fix for -m 8900 = scrypt 2016-01-19 19:04:52 +01:00
Jens Steube
a62b7ed06e Upgrade kernel to support dynamic local work sizes 2016-01-19 16:06:03 +01:00
Jens Steube
44b0cb4e65 Merge pull request #135 from gm4tr1x/master
Fixed a buffer overflow in ascii_digest for hash type 8300
2016-01-17 22:29:12 +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
Gabriele 'matrix' Gristina
29636ca0a3 Re-fix ascii_digest 2016-01-17 22:10:19 +01:00
Gabriele 'matrix' Gristina
e9bc4caed3 Fixed a buffer overflow in ascii_digest for hash type 8300 2016-01-17 18:52:25 +01:00
Jens Steube
45431d9201 Fixed a buffer overflow in potfile handling 2016-01-17 02:18:07 +01:00
jsteube
471c10c4f7 Make sure to spawn threads for all devices, even skipped, and then instantly return 2016-01-16 15:12:42 +01:00
jsteube
954be23a12 Fix some code formating 2016-01-16 13:47:43 +01:00
Jens Steube
b9c61eb66f Merge pull request #134 from yhfudev/add-cl-error-messages
human-readable error message for the OpenCL error codes.
2016-01-16 13:42:34 +01:00
jsteube
0524e78617 Enable forced JIT compilation for MD5, if requested 2016-01-16 12:36:56 +01:00
jsteube
09de56b720 Make sure to select an active device for weak_hash_check 2016-01-16 12:24:08 +01:00
Jens Steube
36251e1fe5 Merge pull request #132 from neheb/master
Remove some memsets
2016-01-16 11:47:17 +01:00
yhfudev
edc6c920a9 human-readable error message for the OpenCL error codes. 2016-01-16 00:41:31 -05:00
jsteube
9fb506f15f Fixed out of bounds access in -m 11300 2016-01-15 23:25:24 +01:00
Mangix
54c7c23ad4 Remove some memsets 2016-01-15 10:51:47 -08:00
Jens Steube
bc24e3d79b Add bitness to filename for cached kernels, otherwise a user would load a 32 bit kernel with a 64 bit host binary in case he used the 32 bit binary before which leads to a segfault 2016-01-15 17:48:27 +01:00
Jens Steube
98b1a9370c Fix AMD OpenCL runtime bug in clGetProgramInfo() 2016-01-15 17:32:43 +01:00
Jens Steube
b35d2dd2eb Fix native compiler 2016-01-15 17:24:51 +01:00
Jens Steube
05505030b8 Fix CFLAGS 2016-01-15 17:24:20 +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
2e61685f48 Fix outputting wrong password for weak-hash-check in case user defined -r or -g 2016-01-14 23:03:23 +01:00
Jens Steube
ed91e69ae3 Fix out of bounds access in -m 7500 2016-01-14 22:13:06 +01:00
Jens Steube
f3b85a6363 Fix some clang compiler warnings 2016-01-14 21:45:11 +01:00
jsteube
76612ac031 Fix more missing casts to uint in rule-engine 2016-01-14 20:54:41 +01:00
jsteube
497b41fee4 Fix more missing casts to uint 2016-01-14 20:44:11 +01:00
jsteube
d3981ee66a Fix missing cast to uint 2016-01-14 20:42:07 +01:00
Jens Steube
7bfee268d4 Fixed some heap buffer overflow 2016-01-14 20:30:38 +01:00
Jens Steube
245301c9b4 Started optimizing some of the OpenCL kernel for latest AMD Catalyst 15.12:
- Replaced SBOX for DES:

replaced JtR's * Bitslice DES S-boxes making use of a vector conditional select operation (e.g., vsel on PowerPC with AltiVec).
with     JtR's * Bitslice DES S-boxes for x86 with MMX/SSE2/AVX and for typical RISC architectures.

Performance increased for DEScrypt from 355MH/s to 405MH/s and for LM from 11100MH/s to 12000MH/s

BTW, the same effect can be seen with non-maxwell GPU's

- Remove some volatile keywords no longer needed thanks to fixed catalyst bugs

- Fix weak-hash-check parameter for use with tools/test.sh
2016-01-14 19:44:47 +01:00
Jens Steube
24b5aa6226 Merge pull request #128 from philsmd/pr-set-iter-for-dcc2
set default iteration count for -m 2100 = DCC2 to 10240
2016-01-14 09:02:13 +01:00
philsmd
cbe6be9246 set default iteration count for -m 2100 = DCC2 to 10240 2016-01-14 00:14:43 +01:00
philsmd
88cbb45ca5 add skipped devices to the --benchmark output 2016-01-13 23:38:07 +01:00
philsmd
7b53ccab70 minor: remove quiet_sav, was just intended for debugging 2016-01-13 23:06:03 +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
cfff6220fc Fix -m 1500 in combination with new weak-hash-check 2016-01-13 21:39:34 +01:00
philsmd
4ed6b2c10a HMS: nvapi does not need a dll (windows + NV) 2016-01-13 21:12:19 +01:00
jsteube
e7e6c4da17 Do not use OpenCL CPU devices by default to avoid slow GPU synchronization, user needs to explicitly enable them using --opencl-device-type
If a platform like pocl is filtered by any of the filter mechanism do not request the user to use --force
2016-01-13 20:27:26 +01:00
Jens Steube
d3dc57896e Merge pull request #123 from philsmd/pr-tab-typo-fix
cosmetic: replace tab by spaces
2016-01-13 19:56:38 +01:00
philsmd
182819af11 cosmetic: replace tab by spaces 2016-01-13 19:05:28 +01:00
philsmd
7081e3cdf6 Makefile: remove kernels/ directory when running make clean 2016-01-13 18:16:56 +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
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
54ed58e28b Merge pull request #119 from philsmd/pr-fix-adl-mapping-CPU
HMS fix: only copy the ADL adapter info for GPU devices
2016-01-12 08:49:25 +01:00
philsmd
b47452e343 HMS fix: only copy the ADL adapter info for GPU devices, for CPU devices we leave it AS-IS (zeroed out) 2016-01-12 01:21:11 +01:00
philsmd
2e1e3318ec fixed % and C (degrees celcius) in status display 2016-01-12 01:02:23 +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
jsteube
93427c073c Prepare for some HSM updates related to device_type 2016-01-11 23:49:10 +01:00
Jens Steube
87dca98a51 Fix segfault if a weak hash is detected for some fast hashes 2016-01-10 21:37:45 +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
Jens Steube
6dab39e69c Merge pull request #64 from philsmd/master
added --opencl-platform check, reject numbers > number of OpenCL platforms
2016-01-07 20:09:50 +01:00
philsmd
82ac8cbcfe additional --opencl-platform value check 2016-01-07 17:15:28 +01:00
philsmd
6fcc3f2728 typo 2016-01-07 16:48:50 +01:00
philsmd
7b7caf3842 added additional --opencl-platform check (reject numbers > number of OpenCL platforms) 2016-01-07 16:35:45 +01:00
jsteube
36df3ef329 A CPU is not a GPU 2016-01-05 23:35:06 +01:00
Jens Steube
51a1868903 Shorten some helptext 2016-01-05 12:28:56 +01:00
philsmd
8bf3bdbf1b the parameter --opencl-platform takes a number, not a string 2016-01-05 10:29:05 +01:00
jsteube
16294fe94e Next release version will be v2.10 2016-01-05 08:30: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
8b50b60484 More fixes for general OpenCL platforms 2016-01-04 19:23:21 +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
philsmd
f2b8f008c0 pr #53 did not copy the example .hash and .dict files to the doc folder 2016-01-03 23:29:39 +01:00
philsmd
d8ac4c3bbc install also the example scripts, place them into the doc folder 2016-01-03 22:01:02 +01:00
jsteube
0428514f61 Extended support from 14 to 255 functions calls per rule on GPU 2016-01-03 19:49:47 +01:00
Jens Steube
0952a4dfd3 Fix CFLAGS_CROSS_LINUX in Makefile 2016-01-03 18:50:02 +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
11bf28745a Generate folders for cached kernels for the binary distribution in runtime, too 2016-01-03 13:49:07 +01:00
jsteube
79b1f96efe Fix logfile buffer size 2016-01-03 13:31:40 +01:00
Jens Steube
dc13c2fc71 Switched to Khronos OSS OpenCL reference implementation for building
For detailed information see: https://github.com/hashcat/oclHashcat/issues/40
2016-01-03 13:17:14 +01:00
jsteube
5703637721 Fix for windows, shared_dir was not set to install_dir 2016-01-03 02:28:52 +01:00
jsteube
61744662c0 Fix path to includes 2016-01-03 01:56:41 +01:00
jsteube
5f7c47b461 Fix path to includes 2016-01-03 01:48:05 +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
2be8f5f982 - Added Makefile target for native compilation
- Moved rules_optimize tool to hashcat-utils
2016-01-02 17:42:47 +01:00
philsmd
fc65b6fd44 issue #38: NVIDIA SDK is not needed anymore, the lib is dynamically loaded on NVidia systems 2016-01-01 17:41:03 +01:00
philsmd
d9f30011f5 fixed minor display problem in usage 2016-01-01 09:50:09 +01:00
jsteube
700ed7dba7 Fix the GPU Platform fix 2015-12-31 15:31:21 +01:00
jsteube
04e5ad2d54 Fix OpenCL platform selection 2015-12-31 15:25:34 +01:00
jsteube
06b1a1e2ae Update 9300 default tmto for NV 2015-12-31 09:32:10 +01:00
jsteube
31292946e2 Fix some scrypt default values 2015-12-30 23:06:45 +01:00
jsteube
7807eb6f2d Fix -m 7800 for NV 2015-12-30 00:29:39 +01:00
jsteube
77df413886 Add allocatable memory location per GPU 2015-12-28 11:29:07 +01:00
jsteube
a78173af7e prepare scrypt tmto value for manual tuning 2015-12-28 09:20:18 +01:00
philsmd
286bde422b limit the salt length of -m 22 = Juniper Netscreen/SSG (ScreenOS) to 10 2015-12-27 09:48:52 +01:00
jsteube
3dc8d526db Update timeout-patch url to wiki 2015-12-24 10:32:22 +01:00
jsteube
f1cdf15540 Added option --gpu-platform to select a single OpenCL platform in case multiple OpenCL platforms are present 2015-12-23 18:02:01 +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
19c77034a6 Updated algorithm used to automatically select an ideal --scrypt-tmto value for NV 2015-12-23 11:24:41 +01:00
philsmd
0d905317a6 fix OpenCL memory problem (exhaustion): -4 error should be gone 2015-12-22 19:03:35 +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
e2412c9b10 We do not depend on CUDA any longer, so get rid of it :) 2015-12-21 12:20:08 +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
c8f7b7b5d3 Workaround missing clEnqueueFillBuffer() support in NVidia's OpenCL runtime 2015-12-21 10:17:54 +01:00
jsteube
1d4bece384 Revert "Fix bsdicrypt for NV"
This reverts commit 284990e4d3.

Accidentially changed oclHashcat.c
2015-12-20 22:08:59 +01:00
jsteube
284990e4d3 Fix bsdicrypt for NV 2015-12-20 22:07:44 +01:00
jsteube
52c416ba72 Fixed empty line problem 2015-12-16 17:01:14 +01:00
jsteube
80f86c52a1 Cleanup makefile
Remove unused CUDA library defs
2015-12-15 19:18:45 +01:00
jsteube
4a0c47ca08 It's safe now to use AMD's OpenCL includes, tested on NV 2015-12-15 18:58:02 +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
jsteube
2283d5c843 Fix more append_* functions in kernels 2015-12-15 16:50:21 +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
Jens Steube
c460b554d0 - Fixed a bug related to --restore if the User
- Updated readme, we actually need catalyst 15.7 (for the binary package) because of OpenCL 2.0
2015-12-11 19:27:07 +01:00
philsmd
c15f0d6146 issue #16: use just "deps" instead of "hashcat-deps" as directory name 2015-12-09 15:55:06 +01:00
philsmd
29547c4f9b issue #14: move /opt/hashcat-deps/ to [git_clone_dir]/hascat-deps/ 2015-12-09 13:33:21 +01:00
philsmd
feeb44882b allow both enabling and disabling of restore point update (implemented with issue #10) 2015-12-07 23:51:51 +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
ffcf763b13 typo fixed in Makefile 2015-12-06 18:48:20 +01:00
philsmd
3f79ac5964 Merge remote-tracking branch 'upstream/master' 2015-12-06 16:12:25 +01:00
Jens Steube
ab66fa1772 Revert "Remove NPROCS from Makefile, make is able to automatically detect the optimal number of parallel threads"
Problem here is; This process requires alot of memory. If host memory is too small it will segfault somewhere inside AMD's OpenCL runtime library. Therefore it's better to stick to NPROCS as part of a workaround.

This reverts commit e5adccbf38.
2015-12-06 13:09:17 +01:00
philsmd
ef548d3088 fixes issue #5: formatting problem with tabs vs spaces 2015-12-06 11:29:29 +01:00
Jens Steube
e5adccbf38 Remove NPROCS from Makefile, make is able to automatically detect the optimal number of parallel threads 2015-12-05 14:30:09 +01:00
Jens Steube
490ff03fe1 It's important to release a fixed version of v2.00 because of the issue #1 even if AMD is not affected 2015-12-05 13:42:02 +01:00
philsmd
9684d8793a fixes issue #1: cuMemsetD8() 1 error (nvidia only, problem did not affect mask attacks) 2015-12-05 08:48:00 +01:00
Jens Steube
5065474b4e Initial commit 2015-12-04 15:47:52 +01:00