1
0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-27 02:18:21 +00:00
Commit Graph

5101 Commits

Author SHA1 Message Date
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
Jens Steube
5f193f8646
Merge pull request #1783 from Naufragous/kernel-func-macroization
Replace kernel parameter lists with macros
2018-11-16 12:30:17 +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
400be920ba Add missing non-boot volumes support 2018-11-15 15:05:30 +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
9afed4b88d Pidfile: Treat a corrupted pidfile like a not existing pidfile 2018-11-14 09:32:06 +01:00
Jens Steube
cbd1361a2b
Merge pull request #1781 from roycewilliams/master
changes.txt wording/fixes
2018-11-13 08:10:05 +01:00
Royce Williams
3bf663bee1 clarify xxHash change; add 'APFS' to Apple File System refs 2018-11-12 11:31:01 -09:00
Royce Williams
55f319b572 changes.txt wording/fixes 2018-11-12 11:03:24 -09:00
Jens Steube
06b39dc3d5 Startup: Show OpenCL runtime initialization message (per device) 2018-11-12 20:45:05 +01:00
Jens Steube
a5e8818805 Start client index from 1 instead of 0 2018-11-12 20:19:59 +01:00
Jens Steube
fde9b86962 Fix invalid initialization for client_idx not present in 5.0.0 2018-11-12 17:10:54 +01:00
Jens Steube
566b1c67b5 Small improvement in --speed-only and --progress-only accuracy 2018-11-12 14:59:42 +01:00
Jens Steube
bb758d66e8 Revert "Simplify some code"
This reverts commit 2d15fa07e7.
2018-11-12 14:34:44 +01:00
Jens Steube
2d15fa07e7 Simplify some code 2018-11-12 14:27:30 +01:00
Jens Steube
a402822646 Fixed output of --speed-only and --progress-only in case a fast hash is used in combination with --slow-candidates 2018-11-12 14:20:42 +01:00
Jens Steube
fb030e24ab
Merge pull request #1780 from Naufragous/cleanup-test-suite
Clean up test suite scripts
2018-11-12 14:18:10 +01:00
R. Yushaev
0134f5f018 Clean up test suite scripts
The test scripts have grown to be quite big (over 15000 lines) and
are hard to navigate. There are multiple if branches with over
40 conditional checks chained together. This commit solves some of
those issues.

 - Unite big repetetive if conditions into clean array lookups
 - Move 'install help' commands to a separate shell script
 - Adjust array lookup in test.sh to behave more intuitive
 - Add comments at key points to simplify navigation
 - Code formatting
2018-11-12 13:49:12 +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
Jens Steube
a5818facf2 Brain: Set --brain-client-features default from 3 to 2 2018-11-11 10:13:38 +01:00
Jens Steube
5ad07a6f64
Merge pull request #1777 from RAN1/master
Update code generator function names
2018-11-11 10:13:04 +01:00
RAN1
4e558e0fd8 Update code generator function names 2018-11-10 17:55:11 -05:00
Jens Steube
2aff01b20e Hardware Monitor: Renamed --gpu-temp-abort to --hwmon-temp-abort
Hardware Monitor: Renamed --gpu-temp-disable to --hwmon-disable
Fixed invalid warnings about throttling in case --hwmon-disable was used
Fixes https://github.com/hashcat/hashcat/issues/1757
2018-11-09 12:48:27 +01:00
Jens Steube
a96db32e96
Merge pull request #1775 from Naufragous/veracrypt-ripemd-testcase
Add RIPEMD-160 test containers for VeraCrypt modes
2018-11-09 12:04:07 +01:00
R. Yushaev
34aa899a05 Add RIPEMD-160 test containers for VeraCrypt modes
- Tests: Add hash-mode 13711 (VeraCrypt PBKDF2-HMAC-RIPEMD160 + XTS 512 bit)
 - Tests: Add hash-mode 13712 (VeraCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1024 bit)
 - Tests: Add hash-mode 13713 (VeraCrypt PBKDF2-HMAC-RIPEMD160 + XTS 1536 bit)
2018-11-09 11:35:23 +01:00
Jens Steube
ce432aba63
Merge pull request #1774 from Naufragous/veracrypt-test-cases
Add test containers for VeraCrypt modes
2018-11-09 10:02:49 +01:00
R. Yushaev
5eaee33094 Add test containers for VeraCrypt modes
There were testing containers for TrueCrypt hash modes (62XY),
but none for the VeraCrypt ones (137XY). This commit adds test
cases for all currently attackable hash/cipher combinations,
except RIPEMD-160 and those with boot-mode.

RIPEMD-160 is considered deprecated in VeraCrypt since 2015.

 - Tests: Add hash-mode 13721 (VeraCrypt PBKDF2-HMAC-SHA512 + XTS 512 bit)
 - Tests: Add hash-mode 13722 (VeraCrypt PBKDF2-HMAC-SHA512 + XTS 1024 bit)
 - Tests: Add hash-mode 13723 (VeraCrypt PBKDF2-HMAC-SHA512 + XTS 1536 bit)
 - Tests: Add hash-mode 13731 (VeraCrypt PBKDF2-HMAC-Whirlpool + XTS 512 bit)
 - Tests: Add hash-mode 13732 (VeraCrypt PBKDF2-HMAC-Whirlpool + XTS 1024 bit)
 - Tests: Add hash-mode 13733 (VeraCrypt PBKDF2-HMAC-Whirlpool + XTS 1536 bit)
 - Tests: Add hash-mode 13751 (VeraCrypt PBKDF2-HMAC-SHA256 + XTS 512 bit)
 - Tests: Add hash-mode 13752 (VeraCrypt PBKDF2-HMAC-SHA256 + XTS 1024 bit)
 - Tests: Add hash-mode 13753 (VeraCrypt PBKDF2-HMAC-SHA256 + XTS 1536 bit)
 - Tests: Add hash-mode 13771 (VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 512 bit)
 - Tests: Add hash-mode 13772 (VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 1024 bit)
 - Tests: Add hash-mode 13773 (VeraCrypt PBKDF2-HMAC-Streebog-512 + XTS 1536 bit)
2018-11-08 17:14:58 +01:00
Jens Steube
a3b8bba074 Added some missing changes in changes.txt 2018-11-08 13:41:16 +01:00
Jens Steube
9edc45e5d8 Fix copy/paste error 2018-11-08 13:23:36 +01:00
Jens Steube
6befe6225c
Merge pull request #1771 from Naufragous/veracrypt-streebog
Add VeraCrypt Streebog support
2018-11-08 13:02:06 +01:00
Jens Steube
4177e1ee28 Replace gitmodules with files and add support for system-wide libraries 2018-11-08 12:52:06 +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
Jens Steube
e09822ef3e Removed submodules 2018-11-08 11:02:41 +01:00
Jens Steube
e1011c51a3
Merge pull request #1770 from s3inlc/master
Fixed separator parsing for additional algorithms
2018-11-08 09:20:49 +01:00
Sein Coray
de5f0ceb5e Fixed separator parsing for additional algorithms 2018-11-08 09:08:36 +01:00
Jens Steube
b1a460ade2 Fixed status output of progress value in case -S and -l used in combination 2018-11-07 14:20:40 +01:00
Jens Steube
5bb7b5c750
Merge pull request #1766 from roycewilliams/master
--kernel-threads naming consistency
2018-11-06 16:23:14 +01:00
Royce Williams
2cbe036cda --kernel-threads naming consistency 2018-11-06 06:09:30 -09:00
Jens Steube
2a366741a5 Added new option --kernel-threads to manually override the automatically calculated number of threads 2018-11-06 16:06:06 +01:00
Jens Steube
3eab677bdf Move the system include where it belongs to 2018-11-04 14:26:19 +01:00
Jens Steube
9baf728fe7 Fixed token configuration for:
- descrypt_parse_hash
- keccak_*_parse_hash
- sha256crypt_parse_hash
- drupal7_parse_hash
2018-11-04 12:49:56 +01:00
Jens Steube
82cdd585f0 Fixed token configuration for -m 6700 2018-11-04 10:11:29 +01:00
Jens Steube
344ea5b36d Memory: Reduced default maximum bitmap size from 24 to 18 and give a notice to use --bitmap-max to restore 2018-11-04 10:07:45 +01:00
Jens Steube
399bd2562a Fixed checking the length of the last token in a hash if it was given the attribute TOKEN_ATTR_FIXED_LENGTH
Fixes https://github.com/hashcat/hashcat/issues/1755
2018-11-04 09:41:07 +01:00
Jens Steube
c804d79eb8
Merge pull request #1753 from roycewilliams/master
consistent forum singular (thx unix-ninja); trailing whitespace
2018-11-04 09:09:12 +01:00