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

2193 Commits

Author SHA1 Message Date
Jens Steube
e141742944
Merge branch 'master' into m23100_apple_keychain 2020-07-01 13:01:16 +02:00
Jens Steube
ab4a1783df
Merge branch 'master' into master 2020-07-01 12:50:44 +02:00
Jens Steube
19d210cb8a
Merge pull request #2469 from philsmd/m20900_del_whitespace
remove extra spaces in -m 20900
2020-07-01 09:30:22 +02:00
Jens Steube
9ce625464e Fixed uninitialized value in bitsliced DES kernel (BF mode only) leading to false negatives 2020-06-30 13:28:23 +02:00
philsmd
bb4ce6d458
keychain: remove useless comment in kernel 2020-06-25 17:48:36 +02:00
philsmd
630bb5b811
fixes #2457: added -m 23100 = Apple Keychain 2020-06-25 17:36:43 +02:00
philsmd
2f34ad7943
remove extra newline in blake2b include file 2020-06-25 17:05:32 +02:00
philsmd
71a9eb2276
remove extra spaces in -m 20900 2020-06-24 23:57:00 +02:00
philsmd
bd9304724c
fixes #1298: add pure kernels for -m 600 = BLAKE2b-512 2020-06-24 23:41:58 +02:00
philsmd
b05703aeb7
fix some further kernel declarations 2020-06-15 14:58:34 +02:00
Jens Steube
9dffc69089
Merge pull request #2448 from philsmd/refactor_cosmetic_fix
cosmetic: minor code style fixes
2020-06-15 10:01:31 +02:00
Jens Steube
5c3a3137b0
Merge pull request #2447 from philsmd/master
rule engine: add zero-length check for rule 'z'
2020-06-15 10:01:20 +02:00
Jens Steube
78d72bbcfe Fix kernel declarations in optimized -m 2000 kernels 2020-06-13 19:39:54 +02:00
philsmd
e59f61e8cf
cosmetic: minor code style fixes 2020-06-13 11:19:00 +02:00
philsmd
1e2bc78fd0
rule engine: add zero-length check for rule 'z' 2020-06-13 11:06:05 +02:00
Jens Steube
e00f3e9636 Add optimized fake kernels for -m 2000 to enable hashcat to respect user decision to use pure or optimized password candidate generators in --stdout mode 2020-06-12 08:57:59 +02:00
Jens Steube
27df7429ce Fix current password length check in y/Y rules in pure kernel mode 2020-06-12 08:56:03 +02:00
Jens Steube
9ea8b3424d
Merge branch 'master' into pkcs1 2020-06-10 10:51:43 +02:00
Jens Steube
c0753f361c Removed branches in replace_dot_by_len() function of optimized -m 8300 kernels 2020-06-09 10:47:18 +02:00
Jens Steube
69bdd5012c
Merge pull request #2420 from philsmd/dnssecDotReplaceByLen
fixes #2365: NSEC3 dot replace and empty salt/domain fix
2020-06-09 10:45:02 +02:00
Matt Palmer
70441138ed Renumber PEM module to 22900
Also took the liberty of removing old PKCS1 naming everywhere,
so as to prevent future confusion.
2020-06-08 13:36:39 +10:00
philsmd
df5564eee2
cosmetic: make pure kernel of rar3-hp easier to read 2020-06-05 08:59:20 +02:00
Jens Steube
3a9929bd3d
Merge pull request #2419 from philsmd/rarHpPureFix
fixes #2390: RAR3-hp cracking w/ pass > 28 (pure kernel) + tests added
2020-06-04 10:06:29 +02:00
Jens Steube
f6322dccd5
Merge branch 'master' into pkcs1 2020-06-04 09:44:01 +02:00
Jens Steube
8ed1ae63db
Merge pull request #2406 from philsmd/patch-1
-m 21000 = BitShares fix for different vector width
2020-06-02 12:37:56 +02:00
philsmd
5df743cb85
fixes #2410: added -m 2300x = SecureZIP 2020-05-31 10:36:41 +02:00
philsmd
ea6eab29f8
added OpenCL kernel code for AES-192 2020-05-31 10:30:19 +02:00
philsmd
f382d24dcf
fixes #2365: NSEC3 dot replace and empty salt/domain fix 2020-05-25 11:30:45 +02:00
philsmd
edfe21b902
fixes #2390: RAR3-hp cracking w/ pass > 28 (pure kernel) + tests added 2020-05-25 11:08:33 +02:00
Matt Palmer
2d83149a54 Module to decrypt PEM-encoded encrypted private keys (#74)
Supports a variety of common PKCS#1 ciphers, with fast kernels in all
available colours, shapes, and sizes.
2020-05-19 23:58:09 +10:00
Matt Palmer
f2c69ecfe5 Add md5_update_vector_from_scalar
This is similar in concept to *_init_v_f_s, except that all
contexts in the vector are updated from the same scalar
array of data.
2020-05-19 23:52:16 +10:00
Matt Palmer
86906e28b7 SIMD: add VECTOR_ELEMENT macro
Useful in cirumstances where you want to work with individual elements
of a vector, typically after you've done some vector-compatible operations
(mass-hashing, for example) but now need to do some non-vector-friendly
work (like executing most decryption algorithms).
2020-05-19 14:32:01 +10:00
philsmd
5190441dfd
-m 21000 = BitShares fix for different vector width 2020-05-18 10:37:58 +02:00
Jens Steube
d34381680d
Merge pull request #2389 from philsmd/multibit_22500_fix
fixes possible off-by-one verification problem with -m 22500 = MultiBit Classic
2020-05-08 11:41:54 +02:00
philsmd
e15e0e7b71
fixes possible off-by-one verification problem with -m 22500 = MultiBit Classic 2020-05-08 11:11:47 +02:00
philsmd
b7e5216cf1
fixes #2383: added -m 22700 = MultiBit HD (scrypt) 2020-05-08 10:57:32 +02:00
philsmd
688d904aa0
Added -m 22600 = Telegram Desktop App Passcode (PBKDF2-HMAC-SHA1) 2020-04-08 14:31:47 +02:00
Jens Steube
3c1ddc8149 Revert "Precompute some constants to improve performance of -m 780x SAP kernels"
This reverts commit b1bb47c1ae.
2020-04-02 14:55:04 +02:00
Jens Steube
b89bb84e1d Revert "Fix -m 7800 and -m 7801 on CPU"
This reverts commit 9f9ed78ca7.
2020-04-02 14:54:35 +02:00
philsmd
53d2e45795
fixes #2341: electrum 4/5 mod_512 () infinite loop fix 2020-03-31 11:01:47 +02:00
Jens Steube
ddb641b843 Add option to force disable real SHM access to be used from within the module 2020-03-20 16:20:22 +01:00
Jens Steube
9421b99a6f
Merge pull request #2332 from philsmd/master
fixes #2067: 40-bit oldoffice false positive problem
2020-03-20 08:30:38 +01:00
Jens Steube
24094793da Workaround for -m 22100 on NVIDIA 2020-03-18 16:13:57 +01:00
philsmd
2bc126ac96
fixes #2067: 40-bit oldoffice false positive problem 2020-03-16 16:30:35 +01:00
Jens Steube
b1d5f92c2d Do not use __local keyword in -m 5500 for devices without real shared memory 2020-03-06 15:48:01 +01:00
Jens Steube
fd06e407cf Remove #undef _unroll because _unroll is no longer the default 2020-03-06 13:44:07 +01:00
Jens Steube
fa4b521d48 Add unpack_v8x_from_v32 for vector datatypes, update -m 200 2020-03-06 13:31:32 +01:00
Jens Steube
9f9ed78ca7 Fix -m 7800 and -m 7801 on CPU 2020-03-04 15:19:55 +01:00
Jens Steube
b6feddd81f Unroll some of the code in the candidate generators 2020-03-04 13:30:09 +01:00
Jens Steube
e5889c21fb Fix invalid call to check_header_1536() in -m 13722 2020-03-04 11:18:52 +01:00
Jens Steube
61fe90bacb Use oldschool SHA1 kernel for CPU it's slightly faster 2020-03-03 12:36:55 +01:00
Jens Steube
b4bac70bd6 Remove inline keyword in DECLSPEC for CPU 2020-03-03 08:52:26 +01:00
Jens Steube
e53bff0fb0 Reenable bitselect() and rotate() on Intel SDK 2020-03-02 16:07:13 +01:00
Jens Steube
c258aa4111 Reenable SIMD mode for -m 13600 2020-03-02 15:00:52 +01:00
Jens Steube
717f3e7825 Unroll BLAKE2B_ROUND in -m 600 2020-03-01 09:42:55 +01:00
Jens Steube
ed893e86fb Move esalt buffer in -m 7300 to shared memory to slightly improve performance 2020-02-23 16:30:29 +01:00
Jens Steube
4c2ef5993a Set -m 7000 to OPTS_TYPE_PT_GENERATE_BE mode to slightly improve performance 2020-02-23 15:21:34 +01:00
Jens Steube
fdde629d42 Backport -m 8700 optimization to -m 8600 2020-02-22 22:53:16 +01:00
Jens Steube
48fd7d039f Optimize access to s_lotus_magic_table[] in -m 8700 2020-02-22 20:40:47 +01:00
Jens Steube
caa34924bf More optimizations in -m 15300 and -m 15900 2020-02-22 10:18:09 +01:00
Jens Steube
09b8a30da2 Small optimizations in -m 15300 and -m 15900 2020-02-22 09:11:04 +01:00
Jens Steube
669619c1a7 Fixed out-of-boundary write to decrypted[] in DPAPI masterkey file v1 kernel 2020-02-22 08:42:36 +01:00
Jens Steube
f96e35649d Change bitsliced kernels from 3d to 2d invocation mode for slightly better performance 2020-02-22 07:59:58 +01:00
Jens Steube
6b8f0da8e9 Fix VECT_SIZE > 1 in OpenCL/m14100_a3-pure.cl 2020-02-21 15:23:16 +01:00
Jens Steube
cd20e43667 Precompute some steps in 3des to improve cracking performance 2020-02-21 15:10:27 +01:00
Jens Steube
398e06878d Fix streebog512_g() in vector datatype mode 2020-02-20 16:42:12 +01:00
Jens Steube
ee4168d8fc Fix missing s_sbob_sl64[] initialization in -m 1377x kernels 2020-02-20 16:23:48 +01:00
Jens Steube
5512deef2e Remove old code in m13721_loop() 2020-02-20 16:11:40 +01:00
Jens Steube
d9473358ef Add support for OPTS_TYPE_LOOP_EXTENDED kernel for special cases like VeraCrypt 2020-02-20 16:00:21 +01:00
Jens Steube
b1bb47c1ae Precompute some constants to improve performance of -m 780x SAP kernels 2020-02-20 13:52:12 +01:00
Jens Steube
1449e239c2 Optimize some -m 780x code in kernels 2020-02-20 11:01:56 +01:00
Jens Steube
c90d83c3eb Prepare for UNROLL whitelisting 2020-02-15 12:44:12 +01:00
Jens Steube
c9fdb34698 Do not use V_BFE_U32 with latest rocm version 2020-02-13 13:24:20 +01:00
Jens Steube
5f57ab35b6 Rewrite MT[X][256] constants to MTX[256] constants in whirlpool hash 2020-02-12 16:51:19 +01:00
Jens Steube
193b4a38c7 Replace arrays in inc_hash_whirlpool.cl with scalar variables 2020-02-12 15:58:57 +01:00
Jens Steube
1de08570b3 Unroll whirlpool transform and get rid of shared memory access to s_RC[] 2020-02-11 16:32:51 +01:00
Jens Steube
7aed6fdb54 mini optimization for -m 740x optimized kernel 2020-02-11 14:22:38 +01:00
Jens Steube
f5527bb937 Fix mangle_dupeword_times() in OpenCL/inc_rp.cl 2020-02-11 12:23:51 +01:00
Jens Steube
a74cbe3461 Fixed out-of-boundary read in pure kernel rule engine rule 'p' if parameter is set to 2 or higher 2020-02-10 16:32:34 +01:00
Jens Steube
9607b8c734 Fix -m 7400 optimized kernel for passwords length > 12 if salt length > 16 2020-02-10 14:40:51 +01:00
Jens Steube
d76965348d Small optimization for sha256crypt and add support for salt length up to 20 2020-02-10 11:10:57 +01:00
philsmd
b51273fb0b
Fixes #1538: Added -m 22500 = MultiBit Classic .key (MD5) 2020-02-06 20:25:14 +01:00
Jens Steube
dbfd8d949e Small code optimization -m 6500 2020-02-05 09:54:05 +01:00
Jens Steube
59677cd4b8 Small optimization in -m 16600 2020-02-04 21:54:09 +01:00
Jens Steube
050f6b0e30 Remove some useless code in -m 12400 2020-02-04 15:38:01 +01:00
Jens Steube
95f3230bcf Small speedup for -m 12500 (RAR3-hp) in optimized mode 2020-02-04 15:19:53 +01:00
Jens Steube
6c96a5d9f7 Small speedup for -m 7900 (Drupal) 2020-02-04 14:35:59 +01:00
Jens Steube
d325158e65 Fix functions used in m12500-pure.cl 2020-02-04 12:55:02 +01:00
Jens Steube
045348ac73 Merge branch 'master' of https://github.com/hashcat/hashcat 2020-02-04 12:45:16 +01:00
Jens Steube
02466bf404 Add pure kernel for rar3-hp to support passwords with more than 20 characters 2020-02-04 12:44:54 +01:00
Jens Steube
525f8af200 Add v8x_from_v64_x to inc_common.cl 2020-02-03 15:51:08 +01:00
Jens Steube
633327d8b7 Rewrite Whirlpool hash with 64 bit instructions 2020-02-03 15:24:38 +01:00
Jens Steube
146ca73ff9 Workaround NVIDIA cubin error 'misaligned address' in -m 6100 2020-02-03 12:49:05 +01:00
Jens Steube
fb7bb04587 Do not use dynamic shared memory if dynamic_local_mem_size is a multiple of local_mem_size 2020-02-02 11:15:37 +01:00
Jens Steube
aef53f7e10 OpenCL Runtime: Allow the kernel to access post-48k shared memory region on CUDA. Requires both module and kernel preparation 2020-02-01 14:27:42 +01:00
Jens Steube
1fc37c25f9 OpenCL Kernels: Moved "gpu_decompress", "gpu_memset" and "gpu_atinit" into new OpenCL/shared.cl in order to reduce compile time 2020-02-01 09:00:48 +01:00
Jens Steube
7d9461f8b9 Add -m 11600 optimized kernel 2020-01-26 18:38:47 +01:00
Jens Steube
3561e7b8d7 Add special ROCM detection in OpenCL/inc_vendor.h 2020-01-25 12:09:39 +01:00
Jens Steube
3a5544a554 Help some compiler with 64 bit constants 2020-01-21 22:09:56 +01:00
Jens Steube
cf4cee2f2f Update selection of API to make use of bitselect and rotate 2020-01-20 09:20:12 +01:00
Jens Steube
4b16631710 Do REAL_SHM check in -m 9100 2020-01-16 19:20:57 +01:00
Jens Steube
c58a889aa6 Small performance boost in -m 22400 2020-01-16 15:00:19 +01:00
philsmd
4887cc47b8
Fixes #2267: added support for -m 22400 = AES Crypt (SHA256) 2020-01-16 12:15:17 +01:00
Jens Steube
da7a13afcb Fix some formating 2020-01-15 20:33:26 +01:00
Jens Steube
ce9b9ef015 Fix compiler warnings in -m 18700 pure mode 2020-01-15 10:22:28 +01:00
philsmd
3353a6fb5d
Added -m 22300 = sha256($salt.$pass.$salt) 2020-01-15 09:16:05 +01:00
Jens Steube
53105abeb4 Added hash-mode: Citrix NetScaler (SHA512) 2020-01-14 17:15:34 +01:00
Jens Steube
9824e6e91b Update unstable warnings for Intel GPU on macOSX 10.15 2020-01-14 13:29:02 +01:00
Jens Steube
cef13008dc Fix some bugs in -m 10800, -m 15400 and -m 18700 in --backend-vector-width mode > 1 2020-01-14 09:57:07 +01:00
Jens Steube
89f9ef45b6 Whitelist some OpenCL specific functions 2020-01-12 13:32:02 +01:00
Jens Steube
0378a01422 Fix more rocm compiler warning 2020-01-12 11:22:26 +01:00
Jens Steube
cc2bd2b554 Fix rocm compiler warning 2020-01-12 08:52:15 +01:00
Jens Steube
74c1bf8195 Decrypt another 16 byte in -m 12700 and -m 15200 to reduce false positives 2020-01-06 23:08:59 +01:00
philsmd
2b9715944f
fixes #2123: -m 10700 pure kernel false negative fixed 2020-01-05 16:12:20 +01:00
Jens Steube
c201d15ab8 Fix JiT compiler warning on intel for -m 22100 2020-01-03 09:54:03 +01:00
Jens Steube
09c0cfcc04 Set -u for -m 22100 to 4k with the idea to force -n value to go down to 1 2020-01-02 12:51:25 +01:00
Jens Steube
1cbd02b1b5 Fix s_wb_ke_pc initialization in -m 22100 kernel 2020-01-02 12:37:08 +01:00
Jens Steube
931e29d333 Another Bitlocker boost, reduce shared mem consumption to give some of them to the compiler for more efficient calculating of memory pointer addresses 2020-01-02 12:34:19 +01:00
Jens Steube
349b3c4673 Fix Bitlocker in OpenCL mode on NV 2020-01-02 11:59:37 +01:00
Jens Steube
311d363054 Store precomputed KE for -m 22100 in shared memory and lock the loops per kernel invocation to a fixed value 2020-01-01 20:48:55 +01:00
Jens Steube
db5decb750 Fix vector datatype in -m 22100 2020-01-01 13:39:17 +01:00
Jens Steube
e31e7690ed Add BitCracker optimization to precompute KE of second sha256_transform since input data is static 2020-01-01 10:49:04 +01:00
Jens Steube
c9c09418b4 Small Bitlocker speed boost 2019-12-31 21:27:34 +01:00
philsmd
1c1ed72c65
fixes #1117: added -m 22100 = BitLocker 2019-12-31 18:42:13 +01:00
philsmd
4338f100e9
remove condition which is always true 2019-12-27 11:50:02 +01:00
philsmd
7ef92379d8
Electrum 4/5: speedup by using w-NAF (Non-Adjacent Form) 2019-12-27 09:12:22 +01:00
Jens Steube
4c85c0e54f Revert a671d501aa 2019-12-23 15:00:15 +01:00
Jens Steube
2cc4244e14 Initial -m 22001 support 2019-12-19 22:14:42 +01:00
Jens Steube
f2aedd3741 Add support to load hashes for hash-mode 2500 and 16800 format from hash-mode 22000 2019-12-16 19:35:00 +01:00
Jens Steube
784eeb257b Make use of message_pair and set default for nonce_error_corrections in -m 22000 2019-12-16 12:47:48 +01:00
Jens Steube
2a04354401 New mode 22000 WPA-PBKDF2-PMKID+EAPOL to replace -m 2500 and -m 16800. NOTE: missing support for message_pair and nonce_error_corrections handling 2019-12-15 21:09:04 +01:00
Jens Steube
40a5835927 In -m 12700 and -m 15200 decrypt 48 byte of data instead of just 16 byte 2019-12-13 13:19:58 +01:00
Jens Steube
3a610efec6
Merge pull request #2249 from philsmd/patch-2
Blockchain Wallet (V1 and V2): improved verification code to allow all patterns
2019-12-13 11:18:26 +01:00
philsmd
547d8ff7eb
Blockchain hashes: replace pattern matching with ASCII charset verification 2019-12-13 10:37:16 +01:00
philsmd
b4c29562f4
electrum 5: use parenthesis (avoid Intel compiler warning) 2019-12-12 03:54:49 +01:00
philsmd
2672afb612
electrum5: simplify zlib rejection check 2019-12-12 03:50:35 +01:00
philsmd
d0a59db595
allow 04 and 05 in zlib header check 2019-12-11 15:44:32 +01:00
Jens Steube
75b4164498 Use a different code for mod_512() to help some NV GPU to not hang 2019-12-07 11:29:39 +01:00
Jens Steube
53254b45aa Backport inc_ecc_secp256k1 inline assembly code for AMD ISA 2019-12-05 15:43:01 +01:00
Jens Steube
cb24236067 Inline assembly optimization for 256 bit ADD and SUB in inc_ecc_secp256k1.cl 2019-12-05 14:49:51 +01:00
philsmd
f6ddb4ffba
get rid of compiler warning about incompatible types in secp256k1 kernel include 2019-12-05 14:37:00 +01:00
philsmd
6d822e04a1
fix minor typos in inc_ecc_secp256k1.cl 2019-12-05 12:23:54 +01:00
philsmd
d07f002337 electrum 4/5: improve speed (rm hook) 2019-12-05 10:43:42 +01:00
Paul
6d02983f8b Small optimization for sha1_transform, sha1,transform_vector. 2019-11-29 08:10:26 +01:00
Jens Steube
86d3f9e9c7 Fix -m 21600 default hash length 2019-11-27 09:03:17 +01:00
Jens Steube
a63aa679d3 Few changes to -m 21600 and move -m 124 and -m 10000 to pure Framework category 2019-11-26 17:16:18 +01:00
Jens Steube
9a28f53887
Merge pull request #2239 from blacktraffic/master
new PR for mode 21600, as discussed on previous thread for 12101
2019-11-26 13:10:22 +01:00
Jens Steube
d9a92afecc Change out-of-boundary fix in order to re-enable password length 256 with rules in pure kernel mode 2019-11-26 11:26:56 +01:00
Jamie R
ce17418b27 add web2py pbkdf2-hmac-sha512 variant 2019-11-24 14:49:13 +00:00
Jens Steube
a6c18f48ba Remove some double code 2019-11-22 23:12:57 +01:00