jsteube
d706d19b4f
Fix some uninitialized variables
2019-04-05 22:25:28 +02:00
jsteube
ace765bf96
Fix 'E' rule in optimized mode if password is longer than 16 characters
2019-04-05 12:24:53 +02:00
jsteube
3274220d7f
Fix l32_from_64_S(), h32_from_64_S(), hl32_to_64_S() and h32_from_64() in inc_common.cl
2019-04-04 22:05:45 +02:00
jsteube
875718fb8e
Backport -m 500 pure kernel code to -m 6300 enables using it on AMDGPU driver
2019-04-04 21:05:07 +02:00
jsteube
cd88410781
Backport -m 500 pure kernel code to -m 1600 enables using it on AMDGPU driver
2019-04-04 21:02:26 +02:00
jsteube
d7d716f3ab
Make it easier to include OpenCL kernels into modules
2019-04-04 20:01:37 +02:00
jsteube
9ced13cc94
Get rid of CONSTSPEC macro in OpenCL kernels
2019-04-04 10:15:34 +02:00
jsteube
13edc32fb4
Fix some unused variable warnings
2019-04-03 21:53:34 +02:00
jsteube
b8d609ba16
WPA/WPA2 cracking: In the potfile, replace password with PMK in order to detect already cracked networks across all WPA modes
2019-04-02 11:24:22 +02:00
Jens Steube
4115e6b825
Update some unstable_warning on Intel CPU
2019-04-01 11:22:51 +02:00
jsteube
319bf80178
Fix hash_encode() salt position
2019-03-31 20:17:17 +02:00
jsteube
76bf5173ba
Do not use MAYBE_UNUSED in inc_common.cl
2019-03-31 19:45:15 +02:00
jsteube
1c45de4b63
Remove more old GCC diagnostic options
2019-03-31 19:41:28 +02:00
jsteube
d80603648e
Replace plain_t with void in module_build_plain_postprocess() enables some options
2019-03-30 16:32:11 +01:00
jsteube
9574862a19
Inline hc_byte_perm in hc_bytealign
2019-03-28 13:37:28 +01:00
jsteube
ffd8ec9001
Fixed output password of 'e' rule in pure and cpu rule engine if separator character is also the first letter
2019-03-28 13:07:39 +01:00
jsteube
5a1d929628
Fix some missing code changes after hc_bytealign() was changed
2019-03-28 12:26:24 +01:00
jsteube
ea7d9c50b6
Fix missing const keyword in some includes
2019-03-27 11:38:49 +01:00
jsteube
2f972c0d36
Use apply_rules_vect_optimized() instead of apply_rules_vect() in -m 15400
2019-03-27 11:17:30 +01:00
jsteube
19a77c59f9
Removed some unused includes from ChaCha20 combinator attack kernel
2019-03-27 11:17:13 +01:00
jsteube
4fe1a4b258
Use apply_rules_vect_optimized() instead of apply_rules_vect() in -m 600
2019-03-27 11:12:22 +01:00
jsteube
1a44581524
Removed some unused includes from Blake2 combinator attack kernel
2019-03-27 11:10:26 +01:00
Jens Steube
0fb3b3c83e
Declare internal functions in OpenCL kernels as static
2019-03-26 11:03:25 +01:00
jsteube
0a8c7fab1c
Do not use ulong. It causes the 32 bit compilation to fail
2019-03-25 21:04:21 +01:00
jsteube
ecbd4a51c8
Add remaining emu_inc_* sources to Makefile
2019-03-25 16:15:58 +01:00
jsteube
5b667d2c01
Get rid of src/cpu_aes.c, src/cpu_des.c, src/cpu_md5.c and src/cpu_sha256.c
2019-03-25 15:54:58 +01:00
jsteube
fb8a9d7c40
Get rid of cpu_sha1.c
2019-03-25 14:08:59 +01:00
Sein Coray
21a214e26a
Merge branch 'master' of https://github.com/hashcat/hashcat
2019-03-25 12:27:33 +01:00
jsteube
66d94b06e4
Get rid of src/rp_kernel_on_cpu.c and src/rp_kernel_on_cpu_optimized.c and use OpenCL emulated kernel version
2019-03-25 12:24:04 +01:00
Sein Coray
798f026e3a
adjusted kernels to newest refactoring
2019-03-25 10:57:18 +01:00
Sein Coray
959852a1aa
Merge branch 'master' of https://github.com/hashcat/hashcat
2019-03-25 10:47:00 +01:00
jsteube
13097fefc7
reorder functions for better overview
2019-03-24 15:23:11 +01:00
jsteube
194fd7e6d1
Fix some invalid code sections caused from conversion
2019-03-24 13:46:06 +01:00
jsteube
977199698f
Move some macros from .h to .cl sources
2019-03-24 00:26:10 +01:00
jsteube
e80b1838e8
Rename some functions in inc_common.cl to avoid conflicts with bitops.c
2019-03-23 22:15:38 +01:00
jsteube
adeeaee84a
Replace __kernel, __constant, __global and __local qualifiers with macro for better control
2019-03-22 22:27:58 +01:00
jsteube
340d2ae7d3
Add headers for OpenCL include files
2019-03-22 22:00:07 +01:00
Sein Coray
67994fc177
removed unecessary parts causing build on some Intel OpenCLs to fail
2019-03-22 21:09:38 +01:00
jsteube
0413314ae4
Fix missing include in amp_a0
2019-03-22 15:44:21 +01:00
jsteube
c9d60c079f
Prepare OpenCL kernels for non-static compilation
2019-03-22 15:16:25 +01:00
jsteube
5f5468be6f
Add missing DECLSPEC in OpenCL rule functions
2019-03-22 13:14:25 +01:00
jsteube
c1d5d2ff45
Improve grouping of include calls as a preparation
2019-03-22 12:58:56 +01:00
jsteube
305a044ec6
Remove some old function headers
2019-03-22 09:52:54 +01:00
jsteube
7d4bea41a0
Get rid of OpenCL/inc_hash_constants.h and OpenCL/inc_hash_functions.cl
2019-03-21 23:00:38 +01:00
Sein Coray
c768073f60
fixed static limit for uncompress output to length defined
2019-03-21 21:37:24 +01:00
Sein Coray
97249ba1ca
added pkzip kernels 17200, 17210, 17220 and 17230
2019-03-21 20:18:39 +01:00
jsteube
59ecdbd319
Add volatile to inline assembly instructions, it has no influence on cracking performance but compile time reduces
2019-03-20 11:05:34 +01:00
Jens Steube
af129d32da
Merge pull request #1941 from s3inlc/master
...
Added hash mode 19500
2019-03-19 10:44:06 +01:00
Sein Coray
836c91c8c2
Merge branch 'master' of https://github.com/s3inlc/hashcat
2019-03-18 17:47:42 +01:00
Sein Coray
17083b8f56
applied requested final changes
2019-03-18 17:47:35 +01:00
jsteube
e0f875463f
Fix HAS_VBFE use on AMDGPU driver
2019-03-18 12:48:59 +01:00
jsteube
5ef67a8ab7
Apply previous blowfish optimization for -m 3200 also on -m 9000 and -m 18600
2019-03-18 12:42:47 +01:00
Sein Coray
1143cef606
Merge branch 'master' into master
2019-03-18 09:48:09 +01:00
Sein Coray
7321b03102
Updated mode 19500 based on comments
2019-03-18 09:45:04 +01:00
jsteube
5ecbcde945
Cracking bcrypt: Use a feedback from the OpenCL runtime to dynamically find out optimal thread count
2019-03-17 14:17:35 +01:00
jsteube
9a70655f34
No more need for rcon[] in AES
2019-03-16 21:15:05 +01:00
jsteube
7cb510f1ce
More manually unrolled cipher code
2019-03-16 21:11:02 +01:00
jsteube
a063e9ef62
Remove automatic unrolling on some ciphers and replace with manually unrolled code
2019-03-16 19:00:36 +01:00
jsteube
70d1343d57
Fix variables s_Ch and s_Cl in whirlpool hashes in non REAL_SHM mode
2019-03-16 16:51:54 +01:00
jsteube
970e5f3518
Fix -m 6100 in optimized mode for use with REAL_SHM
2019-03-15 23:27:44 +01:00
jsteube
218322f630
Support for inline VeraCrypt PIM Brute-Force
2019-03-15 21:48:49 +01:00
Fist0urs
afb010870a
Add hash modes 19600 (krb5tgs enctype 17) and 19700 (krb5tgs enctype 18)
2019-03-13 17:20:04 +01:00
jsteube
26d7602bbd
No longer need reqd_work_group_size() in OpenCL kernels since modules taken care of this using threads_min and threads_max
2019-03-10 12:13:14 +01:00
jsteube
85452e12be
Fix inc_cipher_des.cl for vector use
2019-03-10 11:07:52 +01:00
jsteube
84d6b8ecc1
Add function prototypes in OpenCL kernels to make some compilers happy
2019-03-09 09:05:44 +01:00
jsteube
ce32d57f9b
Make use of inc_cipher_des.cl in -m 3100
2019-03-09 08:43:07 +01:00
jsteube
27610008cb
Testwise disable aligned constants
2019-03-09 08:11:29 +01:00
jsteube
aeb570ca8b
Add inc_cipher_des.cl and make use of SHM_TYPE
2019-03-09 08:07:50 +01:00
jsteube
8c47a947a1
Fix some includes in -m 14600
2019-03-08 15:39:32 +01:00
Jens Steube
bc8ffadccc
Remove more occurances of netntlm_t in Whirlpool kernel
2019-03-08 15:26:50 +01:00
Jens Steube
07b8cafcad
Fix datatypes in -m 14600
2019-03-08 13:53:34 +01:00
Jens Steube
d64529ed47
Fix kernel header in -m 14900
2019-03-08 13:41:20 +01:00
Jens Steube
fda04609cd
Fix datatypes in -m 14600
2019-03-08 13:37:13 +01:00
Jens Steube
898000b7aa
Fix datatypes in -m 12400
2019-03-08 13:17:07 +01:00
Jens Steube
09b8bfc3a5
Fix datatypes in -m 10700
2019-03-08 13:13:01 +01:00
Jens Steube
7932d8c91f
Fix datatypes in -m 64xx and -m 137xx
2019-03-08 13:10:58 +01:00
Jens Steube
34850df1c0
Fix datatypes in -m 2501 and -m 16801
2019-03-08 13:05:23 +01:00
Jens Steube
74abff44d9
Move remaining module specific typedefs and structures from inc_types.cl to kernels
2019-03-08 12:50:31 +01:00
Jens Steube
30681e5151
Move remaining module specific typedefs and structures from inc_types.cl to kernels
2019-03-08 11:14:33 +01:00
Jens Steube
4bce25dd9d
Move remaining module specific typedefs and structures from inc_types.cl to kernels
2019-03-08 10:18:20 +01:00
Jens Steube
cace799187
Move more no unrolling exceptions from inc_vendor.cl to specific modules
2019-03-07 18:57:04 +00:00
Sein Coray
ee97d18af9
Added hash mode 19500
2019-03-06 21:15:09 +01:00
Sein Coray
deacf3a2b9
fix constant name for sha224
2019-03-06 00:13:10 +01:00
jsteube
eb07d2108c
Fixed cracking of NetNTLMv1 passwords in mask-attack mode if mask > length 16 (optimized kernels only)
2019-03-05 05:14:34 +01:00
jsteube
8d6a69b2a9
Fix salt array for -m 19300 in -a 3 mode if SIMD is used
2019-03-04 13:31:49 +01:00
jsteube
a9bafb7edb
Add more valid plaintext pattern for -m 12700/15200
2019-03-04 09:28:57 +01:00
jsteube
dc9279c95c
New Strategy: Instead of using volatile, mark the mode as unstable. Remove all volatiles
2019-03-03 19:18:56 +01:00
jsteube
7c1120b784
Migrate unroll handling for -m 15900 from OpenCL/inc_vendor.cl to module_jit_build_options()
2019-03-03 13:44:25 +01:00
jsteube
ed7765d8fd
Manually unroll aes128_InvertKey and aes256_InvertKey to workaround some JiT compiler errors
2019-03-03 13:39:52 +01:00
jsteube
0fce6b663b
Testwise remove all hardcoded volatiles from cipher includes
2019-03-03 12:12:01 +01:00
jsteube
1714382daa
Migrate unroll handling for -m 14100 from OpenCL/inc_vendor.cl to module_jit_build_options()
2019-03-03 11:55:42 +01:00
jsteube
b0a83b28d1
Migrate unroll handling for -m 12300 from OpenCL/inc_vendor.cl to module_jit_build_options()
2019-03-03 11:47:33 +01:00
jsteube
1937b67595
Migrate unroll handling for -m 8200 from OpenCL/inc_vendor.cl to module_jit_build_options()
2019-03-03 11:43:47 +01:00
jsteube
fee37ac4c3
Migrate unroll handling for -m 8000 from OpenCL/inc_vendor.cl to module_jit_build_options()
2019-03-03 11:39:18 +01:00
jsteube
f92ebc6586
Fix -m 15200 and -m 12700 search string in kernel
2019-03-03 08:47:58 +01:00
jsteube
0b1169e523
My Wallet: Added additional plaintext pattern used in newer versions
2019-03-02 21:58:50 +01:00
jsteube
93760dab34
Fix -m 8100 in pure kernel mode for password length 256
2019-03-02 17:33:22 +01:00
jsteube
88a051629c
Support module specific JiT compiler build options
2019-03-02 11:12:13 +01:00
jsteube
a5743c5572
Fix invalid kernel declaration in optimized Whirlpool kernel
2019-03-01 21:45:25 +01:00
jsteube
4359418918
OpenCL Runtime: Not using amd_bytealign (amd_bitalign is fine) on AMDGPU driver drastically reduces JiT segfaults
2019-03-01 15:34:49 +01:00
jsteube
e1fe3e755b
Optimize some switch_buffer_* functions for generic OpenCL devices (CPU, various OSX, ...)
2019-03-01 14:49:00 +01:00
jsteube
23917455ef
Added hash-mode 19300 sha1(..)
2019-02-28 20:00:52 +01:00
jsteube
87c24200da
Added QNX /etc/shadow hash cracking support
...
- Added hash-mode 19000 QNX /etc/shadow (MD5)
- Added hash-mode 19100 QNX /etc/shadow (SHA256)
- Added hash-mode 19200 QNX /etc/shadow (SHA512)
Implements #35
2019-02-27 17:53:00 +01:00
jsteube
5da1e4b872
Fixed maximum password length limit which was announced as 256 but actually was 255
2019-02-26 21:20:07 +01:00
jsteube
b1a056f1b0
Add hc_lop_0x96 as template for eventual later use
2019-02-24 17:20:09 +01:00
jsteube
540b405e3a
Replace IS_ROCM with HAS_VPERM and HAS_VADD3
2019-02-24 10:12:48 +01:00
jsteube
2c0c82c8af
OpenCL Runtime: Workaround JiT compiler error on AMDGPU driver compiling WPA-EAPOL-PBKDF2 OpenCL kernel
2019-02-24 09:10:37 +01:00
jsteube
69c3ea2d27
Fixed invalid transfer from __constant to __local memory in -m 9100
2019-02-24 08:26:10 +01:00
jsteube
be365acef8
Remove some optimization in -m 18700 which ROCM doesn't like
2019-02-24 08:02:13 +01:00
jsteube
d0d4ce9f8c
Added hash-mode 18800 Blockchain, My Wallet, Second Password (SHA256)
2019-02-23 17:45:02 +01:00
jsteube
684256022e
Small fix for -m 18900
2019-02-22 16:00:08 +01:00
jsteube
29fedf2c41
Added hash-mode 18900 Android Backup
2019-02-22 15:49:47 +01:00
jsteube
3dd0a7140d
Respect combs_mode in -a 1/6/7 attack in -m 18700
2019-02-22 12:43:22 +01:00
jsteube
a0fba5fb11
Improve -m 18700 cracking speed
2019-02-22 12:33:16 +01:00
jsteube
b4d52e412b
Rename -m 18700 to Java Object hashCode()
2019-02-22 09:30:56 +01:00
jsteube
51eb9ebff7
Added hash-mode 18700 DJB 32
2019-02-21 13:52:01 +01:00
jsteube
9fc193ce47
Bitcoin Wallet: Be more user friendly by allowing a larger data range for ckey and public_key
2019-02-20 16:20:28 +01:00
jsteube
63fac132e3
Fix cracking streebog 256/512 hmac cracking with password length > 64
2019-02-19 17:17:01 +01:00
jsteube
f4e43da456
Fix whirlpool final() handling
2019-02-17 08:57:51 +01:00
jsteube
158b93832c
Fixed cracking of Cisco-PIX and Cisco-ASA MD5 passwords in mask-attack mode if mask > length 16
2019-02-15 15:50:58 +01:00
jsteube
dd293f7a93
Fixed -m 600 in -a 3 mode for passwords > 16
2019-02-13 13:48:31 +01:00
jsteube
e571b890e9
Fixed length check for raw PBKDF2 modules
2019-02-13 10:03:07 +01:00
jsteube
c16a3feabc
Add -m 16500 module
2019-02-11 13:11:51 +01:00
jsteube
57da64533c
Add missing kernel in -m 1100 -a 3 -O mode
2019-02-10 10:26:35 +01:00
jsteube
3d203af066
Add module for -m 5700 and -m 5800
2019-02-09 10:03:58 +01:00
jsteube
0bd244c051
Undef some macros to avoid collisions
2019-02-07 16:59:10 +01:00
jsteube
c88a837196
Rename d_scryptVX_buf to d_extraX_buf
2019-01-04 11:21:42 +01:00
R. Yushaev
393916c0bf
Allow cracking non-unique salts for Office 2013
...
With hash-mode 9600 (MS Office 2013) there can be multiple hashes with
the same salt but with different encryption verifiers in esalt_bufs.
This commit adds the functionality to execute _comp kernels for
different hashes after deriving their common key once.
Fixes #1826
2018-12-18 14:32:56 +01:00
R. Yushaev
b5a7e967c1
Add support for Open Document Format 1.1
...
Contains a kernel for the ODF 1.1 encryption implemented in OpenOffice.
The algorithm uses a SHA-1 checksum, a PBKDF2-HMAC-SHA1 key derivation
with 1024 iterations and Blowfish-CFB encryption.
Valid hashes can be extracted with the libreoffice2john.py script,
available from the John the Ripper Jumbo repository at
https://github.com/magnumripper/JohnTheRipper/blob/bleeding-jumbo/run/libreoffice2john.py
You have to remove the filename suffix at the end of the hash before
passing it to hashcat. Also see 'hashcat -m18600 --example-hashes'.
You can leave the filename prefix if you use the --username option to
process those hashes.
- Add hash-mode 18600 (Open Document Format (ODF) 1.1 (SHA-1, Blowfish))
- Tests: add hash-mode 18600 (Open Document Format (ODF) 1.1 (SHA-1, Blowfish))
2018-12-14 13:23:52 +01:00
Sein Coray
a70a0513bf
Added hash mode 18500 sha1(md5(md5($pass)))
...
closes hashcat/hashcat#1652
2018-12-10 16:11:11 +01:00
Jens Steube
15ece0902f
Merge pull request #1804 from Naufragous/odf-cracking
...
Add support for Open Document Format 1.2
2018-12-07 09:36:31 +01:00
Jens Steube
9d213147e8
Merge pull request #1805 from mcovalt/electrum_salt_type_2
...
Electrum Salt-Type 2
2018-12-07 09:33:13 +01:00
R. Yushaev
6a5b0c821e
Add support for Open Document Format 1.2
...
Contains a kernel for the latest ODF 1.2 encryption implemented in
LibreOffice. The algorithm uses a SHA-256 checksum, a PBKDF2-HMAC-SHA1
key derivation with 100000 iterations and key stretching and AES-CBC
encryption.
Valid hashes can be extracted with the libreoffice2john.py script,
available from the John the Ripper Jumbo repository at
https://github.com/magnumripper/JohnTheRipper/blob/bleeding-jumbo/run/libreoffice2john.py
You have to remove the filename suffix at the end of the hash before
passing it to hashcat. Also see 'hashcat -m18400 --example-hashes'.
You can leave the filename prefix if you use the --username option to
process those hashes.
- Add hash-mode 18400 (Open Document Format (ODF) 1.2 (SHA-256, AES))
- Tests: add hash-mode 18400 (Open Document Format (ODF) 1.2 (SHA-256, AES))
2018-12-06 18:00:09 +01:00
Matt Covalt
bb9328f48b
Add salt type 2 support for optimized functions
2018-12-05 10:42:23 -08:00
Matt Covalt
a913db6390
Add salt type 2 support for pure functions
2018-12-05 10:37:40 -08:00
Matt Covalt
36bdcf844a
Add function to check if vector represents a Base58 string
2018-12-05 10:20:41 -08:00
Sein Coray
c941e55a35
Extended IKE PSK md5/sha1 (-m 5300/5400) to print hashes correctly
2018-12-05 12:57:54 +01:00
R. Yushaev
5efebb7b48
Cleanup VeraCrypt related code
...
Remove unnecessary constant variables by hardcoring values instead of
looking up. Precalculate swaps that are known at compile time. Hardcode
hashes_shown offset as zero for all TC / VC kernels.
2018-11-29 12:49:03 +01:00
R. Yushaev
baf47d409e
Add Camellia support for VeraCrypt kernels
...
Adds suport for the Japanese cipher Camellia with 256-bit keys as used
by VeraCrypt.
- Add Camellia header decryption checks to all VeraCrypt kernels
- Add test containers for remaining cipher combinations
2018-11-28 14:21:14 +01:00
Jens Steube
65abccc93e
Migrate inc_truecrypt_keyboard.cl into inc_common.cl
2018-11-25 18:34:57 +01:00
Jens Steube
fca4f7e8a6
Prepare to use --keyboard-layout-mapping for algorithms other than TC/VC
2018-11-25 18:21:07 +01:00
Jens Steube
ee2854ec2a
Support multi-byte characters for TC/VC keyboard layout mapping tables
2018-11-25 13:31:37 +01:00
R. Yushaev
8b04be0e93
Add Kuznyechik support for VeraCrypt kernels
...
Adds support for the Russian cipher specified in GOST R 34.12-2015, also
known as Kuznyechik (Grasshopper).
- Add Kuznyechik header decryption checks to all VeraCrypt kernels
- Add test containers for available Kuznyechik cipher combinations
2018-11-22 16:07:45 +01:00
Jens Steube
c15f741dca
Fixed out-of-boundary read in DPAPI masterkey file v2 OpenCL kernel
2018-11-21 14:55:22 +01:00
Jens Steube
e117e750fc
Add restrict keyword to kernel declarations to help the compiler with caching optimizations
2018-11-21 13:00:30 +01:00
Jens Steube
64dfd40113
Give the compiler a hint for automatic optimizations based on password length
2018-11-20 15:44:24 +01:00
Jens Steube
53c8600089
Give the compiler a hint for automatic optimizations based on password length
2018-11-20 15:34:43 +01:00
Jens Steube
0e428b3c40
Give the compiler a hint for automatic optimizations based on password length
2018-11-20 15:32:41 +01:00
Jens Steube
c9da60c73a
Fixed thread count maximum for pure kernels in straight attack mode
2018-11-20 15:29:24 +01:00
Jens Steube
2a6444c05a
Give the compiler a hint for automatic optimizations based on password length
2018-11-20 15:26:46 +01:00
Jens Steube
ae577410d0
OpenCL Device: Do a real query on OpenCL local memory type instead of just assuming it
2018-11-20 10:06:34 +01:00
jsteube
240f6298be
Fix some leftovers from switching kernel parameters to macros
2018-11-17 23:14:12 +01:00
jsteube
eec1fba4c3
Fix some leftovers from switching kernel parameters to macros
2018-11-17 17:57:15 +01:00
jsteube
a930c5c24e
Do not use KERN_ATTR_VECTOR() if there is no SIMD
2018-11-16 23:35:58 +01:00
jsteube
c672182b44
Fix some leftovers from switching kernel parameters to macros
2018-11-16 23:04:20 +01:00
R. Yushaev
fbbe5f6282
Use macros in remaining kernel functions
...
The 7zip, scrypt and stdout kernels differ from the others in their
function declarations somewhat. Unify them and substitute with macros.
Also remove a few superfluous (bogus) consts which were introduced in
the previous PR.
2018-11-16 14:30:45 +01:00
Jens Steube
6d39fb1feb
Make all kernel parameter macro helper a function
2018-11-16 14:17:01 +01:00
R. Yushaev
5de004103a
Replace kernel parameter lists with macros
...
Substitute long parameter lists in ~2900 kernel function declarations
with macros. This cleans up the code, reduces probability of copy-paste
errors and highlights the differences between kernel functions. Also
reduces the size of the OpenCL folder by ~3 MB.
2018-11-16 11:44:33 +01:00
R. Yushaev
31dc7a3453
Add macros for kernel function declarations
...
Most of the kernel functions use nearly identical parameter lists.
Essentially, there are four parameters that vary, except for a dozen odd
kernel functions (e.g. stdout, zip, scrypt). This means that the function
declarations can be hidden behind a few simple macros with up to two
parameters.
2018-11-16 11:44:26 +01:00
R. Yushaev
b80ada1d65
Unify esalt_bufs parameter declarations
...
In preparation for the abstraction of long repetitive kernel function
declarations, rename the salt buffer pointers to *esalt_bufs. Also
declare them const where they are not.
2018-11-16 10:28:54 +01:00
R. Yushaev
3f0a3ef3f7
Unify kernel function parameter names
...
In preparation for the abstraction of long repetitive kernel function
declarations, adjust parameter names in a few deviating kernels.
2018-11-16 10:28:54 +01:00
Jens Steube
49fc7d45b7
- Keymaps: Added hashcat keyboard mapping us.hckmap (can be used as template)
...
- Keymaps: Added hashcat keyboard mapping de.hckmap
2018-11-15 22:29:03 +01:00
Jens Steube
5d5ac1c935
Prepare for on-the-fly keyboard layout substituations required to crack booting TrueCrypt/VeraCrypt volumes
2018-11-15 14:35:51 +01:00
Jens Steube
a4200ba167
Added hash-mode 18300 (Apple File System)
...
Fixes https://github.com/hashcat/hashcat/issues/1686
2018-11-12 11:37:01 +01:00
R. Yushaev
47bd838e25
Add VeraCrypt Streebog support
...
VeraCrypt added the possibility to use Streebog-512 as hashing algorithm
for the key derivation. This commit adds the necessary VeraCrypt kernels
as well as additional HMAC-Streebog kernels.
- Add hash-mode 13771: VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 512 bit
- Add hash-mode 13772: VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 1024 bit
- Add hash-mode 13773: VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 1536 bit
- Add hash-mode 11750: HMAC-Streebog-256 (key = $pass), big-endian
- Add hash-mode 11760: HMAC-Streebog-256 (key = $salt), big-endian
- Add hash-mode 11860: HMAC-Streebog-512 (key = $salt), big-endian
- Add test suite for hash-modes 11750, 11760 and 11860
- Improve pure Streebog kernels
2018-11-08 11:46:31 +01:00
Royce Williams
6053f473eb
trailing whitespace
2018-11-01 11:17:02 -08:00
R. Yushaev
a8eb611b1c
Add HMAC-Streebog-512 (pure kernels)
...
Implement HMAC based on GOST 34.11-2012 Streebog-512 as well as a test
case for it. Both the PyGOST + hmac python module and the VeraCrypt HMAC
for Streebog-512 were used as references. The kernels expect the digests
to be in big-endian order according to the RFC examples for Streebog.
Fix two bugs from commit 224315dd62
.
- Add hash-mode 11850: HMAC-Streebog-512 (key = $pass), big-endian
- Add test case for hash-mode 11850
- Bugfix for a3-pure Streebog kernels (modes 11700 and 11800)
- Rename a few Streebog constants in interface.h
2018-10-31 14:42:02 +01:00
Arseniy Sharoglazov
ee873da300
Added hash-modes 18200 (Kerberos 5 AS-REP etype 23)
2018-10-30 19:05:44 +03:00
R. Yushaev
224315dd62
Add pure kernels and tests for Streebog hashes
...
Complete Streebog support with pure kernels that allow for passwords
longer than 64 characters. Provide generic inc_hash_streebog files
for future Streebog-based hash modes (HMAC, PBKDF2, VeraCrypt).
Include streebog support in the test suite. For this, python module
PyGOST is needed. Also add clarification to hash mode description
stating that Streebog hashes are expected in big-endian byte order.
There are several implementations, including PyGOST, which default
to little-endian byte order, while the RFC examples are big-endian.
- Add pure kernels for hash-mode 11700 (Streebog-256)
- Add pure kernels for hash-mode 11800 (Streebog-512)
- Tests: Add hash-modes 11700 (Streebog-256) and 11800 (Streebog-512)
2018-10-29 10:33:30 +01:00
Jens Steube
5eca3f5316
Fix kernel names in -a 1 kernels of -m 7701 and 7801
2018-10-25 11:12:26 +02:00
Jens Steube
48cf3f722b
Merge pull request #1725 from unix-ninja/master
...
Cleanup unused register definitions
2018-10-23 09:43:06 +02:00
unix-ninja
6196e23069
Cleanup unused register definitions
2018-10-22 15:23:41 -04:00
Jens Steube
e2a9409413
Merge pull request #1710 from unix-ninja/master
...
Add support for TOTP (RFC 6238)
2018-10-22 20:49:31 +02:00
unix-ninja
8c5c225d8f
Optimize performance on NVIDIA GTX
2018-10-22 13:27:35 -04:00
Jens Steube
b0077860c7
Workaround some padding issues with host compiler and OpenCL JiT on 32 and 64 bit systems
2018-10-20 12:41:41 +02:00
Jens Steube
a4ac370496
Test fix for plain_t in 32 bit mode
2018-10-20 09:46:24 +02:00
Jens Steube
6d03da369b
Fix gid datatype in mark_hash()
2018-10-20 02:19:39 +02:00
unix-ninja
fddfd835d2
Support 64 bit timestamps properly
2018-10-19 15:35:52 -04:00
unix-ninja
7904b9ae05
Fix kernel types to align with style guide
2018-10-19 07:56:51 -04:00
Jens Steube
0a74f058ac
Synchronize salt_t datatypes in types.h and inc_types.cl
2018-10-19 10:20:13 +02:00
unix-ninja
0e5704c77e
Disable NEW_SIMD_CODE for 18100 (it's not compatible)
2018-10-18 15:58:21 -04:00
unix-ninja
b657c75583
Explicity cast otp_offset
2018-10-18 09:36:57 -04:00
unix-ninja
3869ce9246
More coding style fixes
2018-10-18 08:55:55 -04:00
unix-ninja
24ab7cae2a
Add a1 kernel for mode 18100
2018-10-17 16:47:58 -04:00
unix-ninja
db4ec8ed2c
Fix formatting to comply with hashcat coding guidelines
2018-10-17 16:34:34 -04:00
unix-ninja
1d43540fc4
Simplify alignment masks for mode 18100
2018-10-17 11:03:20 -04:00
unix-ninja
b29b7b8188
Convert arithmetic ops to logical ops in byte alignment
2018-10-17 08:54:52 -04:00
unix-ninja
3c3b05d1e5
Resolve conflicts
2018-10-16 15:48:20 -04:00
unix-ninja
6cda8f7077
Change TOTP index from 17300 to 18100
2018-10-16 15:33:09 -04:00
unix-ninja
73aae1a734
Add a0 kernel for TOTP
2018-10-16 15:07:41 -04:00
unix-ninja
2249ab4c13
Cleanup debug code
2018-10-16 15:05:21 -04:00
unix-ninja
977b560bb4
Add support for TOTP (RFC 6238)
2018-10-16 15:05:14 -04:00
R. Yushaev
5c87720acc
Add SHA3 and Keccak
...
The previous hash-mode 5000 covered Keccak-256 only. FIPS changed one
padding byte while adopting Keccak as the SHA3 standard, which gives us
different digests. Now we have separate kernels for SHA3 and Keccak.
- Added hash-mode 17300 = SHA3-224
- Added hash-mode 17400 = SHA3-256
- Added hash-mode 17500 = SHA3-384
- Added hash-mode 17600 = SHA3-512
- Added hash-mode 17700 = Keccak-224
- Added hash-mode 17800 = Keccak-256
- Added hash-mode 17900 = Keccak-384
- Added hash-mode 18000 = Keccak-512
- Removed hash-mode 5000 = SHA-3 (Keccak)
2018-10-15 16:06:31 +02:00
Michael Sprecher
1892b842d7
Increased the maximum size of edata2 in Kerberos 5 TGS-REP etype 23
2018-09-12 12:25:02 +02:00
jsteube
6e1aec0563
Fix kernel name in 16801 kernel source
2018-09-02 12:43:53 +02:00
Jens Steube
466ea8eaba
Fixed detection of unique ESSID in WPA-PMKID-* parser
2018-08-31 15:47:48 +02:00
Michael Sprecher
5536ab9917
Getting rid of OPTS_TYPE_HASH_COPY for Ansible Vault
2018-08-15 23:32:58 +02:00
jsteube
a5746548e8
Allow use of hash-mode 7900, 10700 and 13731 on AMD devices after workaround
2018-08-13 13:41:43 +02:00
jsteube
6469357c74
Remove SCR_TYPE macro from OpenCL code
...
Disable REAL_SHM access to AMD platform devices
2018-08-13 12:10:03 +02:00
jsteube
68bff94980
Workaround rocm OpenCL runtime bug when copy data from constant to local memory
2018-08-12 18:04:33 +02:00
jsteube
188a9568ce
Replace double MAYBE_VOLATILE
2018-08-09 19:44:54 +02:00
jsteube
dad05d9f69
Testing: Workaround some AMD OpenCL runtime segmentation faults
2018-08-09 13:03:22 +02:00
jsteube
103fdf04a1
Fixed a invalid scalar datatype return value in hc_bytealign() where it should be a vector datatype return value
2018-08-09 11:00:08 +02:00
Jens Steube
1c280e4a6e
Small performance boost for bcrypt on CPU
2018-08-02 14:20:04 +02:00
Michael Sprecher
3a321c8dce
Added hash-mode 16900 = Ansible Vault
2018-08-01 19:44:30 +02:00
jsteube
fbf434146d
Add set_mark_1x4() and set_mark_1x4_S()
2018-07-28 18:03:18 +02:00
Jens Steube
14c444fd47
Replace c_append_helper_mini[] table with on-the-fly calculation in order to workaround compiler bugs in AMD OpenCL runtime
2018-07-28 13:59:55 +02:00
jsteube
88ebca40b8
Added hash-mode 16800 = WPA-PMKID-PBKDF2
...
Added hash-mode 16801 = WPA-PMKID-PMK
Renamed lot's of existing WPA related variables to WPA-EAPOL in order to distinguish them with WPA-PMKID variables
Renamed WPA/WPA2 to WPA-EAPOL-PBKDF2
Renamed WPA/WPA2 PMK to WPA-EAPOL-PMK
2018-07-25 16:46:06 +02:00
philsmd
2e1845ec11
fixes #1624 : increase esalt/nonce buffer to 1024 for -m 11400 = SIP
2018-07-23 15:51:39 +02:00
Jens Steube
a43d3ad176
Rename some hashcat specific OpenCL functions to avoid conflicts with existing OpenCL functions from OpenCL runtime
2018-07-22 12:20:20 +02:00
Jens Steube
02a2495349
Switched array pointer types in function declarations in order to be compatible with OpenCL 2.0
2018-07-22 11:47:42 +02:00
Jens Steube
0ab7ab9cec
OpenCL kernels: Removed the use of 'volatile' in inline assembly instructions where it is not needed
2018-07-21 12:29:22 +02:00
jsteube
c1622d6593
Fixed detection of AMD_GCN version in case the rocm driver is used
2018-07-21 11:52:54 +02:00
jsteube
81a447b167
Fixed a function declaration attribute in -m 8900 kernel leading to unuseable -m 9300 which shares kernel code with -m 8900
2018-06-21 13:46:53 +02:00
jsteube
32d6b3e10e
OpenCL kernels: Add '-pure' prefix to kernel filenames to avoid problems caused by reusing existing hashcat installation folder
2018-06-20 14:18:17 +02:00
jsteube
547025ec47
HCCAPX management: Use advanced hints in message_pair stored by hcxtools about endian bitness of replay counter
...
Fixed missing code section in -m 2500 and -m 2501 to crack corrupted handshakes with a LE endian bitness base
2018-06-15 17:00:41 +02:00
Mathieu Geli
4dbc1f4a87
Implement 7701/7801 SAP CODVN half-hashes
2018-03-06 16:42:53 +03:00
jsteube
8079abffb0
Fixed a missing kernel in -m 5600 in combination with -a 3 and -O if mask is >= 16 characters
2018-02-28 11:25:52 +01:00
Jens Steube
a71c69983d
Make words_buf_r in DES bitsliced kernels __constant
2018-02-21 10:50:24 +01:00
jsteube
ca1115a1ee
No longer need to use 32 threads on second dimension for bitsliced algorithms
2018-02-20 01:01:50 +01:00
Jens Steube
ad50883080
Allow unroll for DES based algorithms but not bitsliced versions
2018-02-18 11:28:25 +01:00
Jens Steube
e79feb0b6f
Add more reqd_work_group_size attributes to kernels
2018-02-17 22:16:05 +01:00
Jens Steube
ea2f158cf8
Give JiT a hint about bcrypt running at 8 threads always
2018-02-17 21:33:11 +01:00
Jens Steube
81b229c08a
Make new c_append_helper a bit more AMD friendly
2018-02-17 15:18:19 +01:00
jsteube
3a23b275e5
Improved c_append_helper[] handling
2018-02-17 14:24:29 +01:00
jsteube
64eb9ca9ef
Fix md5crypt speed on GTX1080
2018-02-17 11:45:05 +01:00
Jens Steube
aa82d8d34d
Re-enable CPU optimizations and some CPU case in thread management
2018-02-16 18:56:21 +01:00
Jens Steube
483ae613ee
Copy/paste error in optimized -m 2500 AUX 3 kernel
2018-02-16 11:48:11 +01:00
Jens Steube
a15c165773
Revert the pos == 0 change due to some unexpected results on nvidia
2018-02-16 11:38:08 +01:00
jsteube
874635cc49
Do not use a vector function to write into a scalar variable even if vectorize support is disabled
2018-02-16 10:48:49 +01:00
jsteube
71adf1bd09
Do not use a vector function to write into a scalar variable even if vectorize support is disabled
2018-02-16 10:28:16 +01:00
jsteube
f596d076aa
Optimize some WPA comparison kernel
2018-02-16 00:30:47 +01:00
Jens Steube
e0e796bc2d
More optimized -m 500, -m 1600 and -m 6300 pure kernel
2018-02-15 15:35:22 +01:00
Jens Steube
97f569a8ca
More optimized -m 500, -m 1600 and -m 6300 pure kernel
2018-02-15 12:31:59 +01:00
Jens Steube
f6f16f56af
A bit optimized -m 500 pure kernel
2018-02-14 19:13:23 +01:00
jsteube
b626e7f61b
Optimize update functions in inc_hash_* helper files by testing for pos == 0
2018-02-14 17:31:41 +01:00
Jens Steube
ec63c2f017
switch_buffer_* function can return sooner if offset is zero
2018-02-14 11:35:00 +01:00
Jens Steube
2dddef839c
Fix sha1_update_64 debugging comment
2018-02-14 11:03:35 +01:00
Jens Steube
2a19f19904
Drop -m 6800 from no-unroll list in inc_vendor.cl
2018-02-13 17:08:29 +01:00
jsteube
dfb95024bc
Fix temporary datatype in wpapmk kernels
2018-02-13 16:34:00 +01:00
jsteube
fe4413797e
OpenCL Kernels: Use three separate comparison kernels (depending on keyver) for WPA instead of one
2018-02-13 09:13:35 +01:00
jsteube
00bd356ade
Synchronize m01000s with m00900s
2018-02-12 09:03:11 +01:00
jsteube
aa65ed28e5
Switch back c_append_helper to static
2018-02-12 09:02:37 +01:00
Jens Steube
d656e9c3a4
OpenCL Kernels: Use the kernel local buffer size as additional reference in order to limit the thread-count
2018-02-11 10:56:08 +01:00
jsteube
5951207365
Get rid of some old volatiles
2018-02-09 19:18:30 +01:00
jsteube
05a01d3843
fix some datatypes
2018-02-08 19:13:29 +01:00
jsteube
d5153539e2
Some syntax error
2018-02-08 09:49:59 +01:00
jsteube
786384664e
DECLSPEC for CPU
2018-02-08 09:42:59 +01:00
jsteube
4cbd0eb812
Fix missing compressor kernel in --stdout mode
2018-02-07 22:28:52 +01:00
jsteube
512fb5f6fb
No inline keyword for rules
2018-02-07 15:02:58 +01:00