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

5401 Commits

Author SHA1 Message Date
Jens Steube
1493bc01cf
Merge pull request #1829 from Naufragous/office-bug
Allow cracking non-unique salts for Office 2013
2018-12-18 14:39:08 +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
jsteube
e04cd244ab Fix benchmark initializations 2018-12-17 18:55:20 +01:00
jsteube
3c37daf94b Get rid of hash_mode in autotune.c 2018-12-17 18:49:07 +01:00
jsteube
f367b7ed91 Move code to migrate into separate files 2018-12-17 14:50:56 +01:00
jsteube
e2899aa83c Move code to migrate into separate files 2018-12-17 14:47:34 +01:00
jsteube
074947c6db Get rid of hashconfig_get_kernel_threads() and hashconfig_get_kernel_loops() 2018-12-17 13:03:32 +01:00
jsteube
af22a9d1d9 Remove hashconfig_forced_kernel_threads() 2018-12-17 12:42:07 +01:00
jsteube
6e794841e3 Add default_benchmark_esalt(), default_benchmark_hook_salt(), default_benchmark_salt() 2018-12-17 11:16:53 +01:00
jsteube
3cce072f40 Get rid of strhashtype() 2018-12-17 10:33:21 +01:00
jsteube
0364dd359e Simplify use of default functions 2018-12-16 19:13:41 +01:00
jsteube
e79fa9c22f Simplify use of default functions 2018-12-16 19:01:05 +01:00
jsteube
ca169a890c Add more global default value functions 2018-12-15 19:46:55 +01:00
jsteube
1d8c31a7e2 Add more global default value functions 2018-12-15 19:04:05 +01:00
jsteube
a4fb31e8f7 Add more global default value functions 2018-12-15 16:24:37 +01:00
jsteube
3848c73f80 Add decoder_apply_optimizer ()
Add encoder_apply_optimizer ()
Add decoder_apply_options ()
Add encoder_apply_options ()
2018-12-15 15:22:40 +01:00
Jens Steube
bd37903131 Add hook_size, tmp_size, hook_salt_size 2018-12-14 17:18:17 +01:00
Jens Steube
9cf5d9cd6b
Merge pull request #1823 from hashcat/master
Backports from master
2018-12-14 15:33:53 +01:00
Jens Steube
dbbba1fbdf
Merge pull request #1822 from Naufragous/odf-cracking
Add support for Open Document Format 1.1
2018-12-14 15:31:38 +01:00
Jens Steube
3aecd150f9 Call module_hash_encode() in ascii_digest() 2018-12-14 15:29:57 +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
Jens Steube
d6c04c2daf
Merge pull request #1821 from Naufragous/odf-fix
Fix selftest for hash-mode 18400
2018-12-14 13:15:23 +01:00
R. Yushaev
875d6eb516 Fix selftest for hash-mode 18400 2018-12-14 13:09:54 +01:00
Jens Steube
222d76f01e Replace parse_func() with module_hash_decode() 2018-12-14 12:22:13 +01:00
Jens Steube
ec3f3cd7b6 Switch from size_t to int 2018-12-14 12:21:14 +01:00
Jens Steube
42c3ab0485
Merge pull request #1820 from hashcat/master
backports from master
2018-12-13 14:22:28 +01:00
Jens Steube
478fd2c8cf
Merge pull request #1815 from s3inlc/test-compatibility
Changed cat -A to cat -vet in test.sh
2018-12-13 14:21:31 +01:00
Jens Steube
376baa2b10
Merge pull request #1814 from s3inlc/algorithm/1652
Added hash mode 18500 sha1(md5(md5($pass)))
2018-12-13 14:21:22 +01:00
Jens Steube
7e0c551dc9
Merge pull request #1813 from philsmd/master
fixed validation of the --brain-client-features value
2018-12-13 14:21:01 +01:00
Jens Steube
9d22f77754
Merge pull request #1810 from gituser/master
Create ru.hckmap for Russian Language
2018-12-13 14:20:50 +01:00
Sein Coray
af5d512b6f
Added new hash mode 18500 in usage 2018-12-10 17:02:22 +01:00
Sein Coray
e0c2e4404e
Added new hash mode 18500 to readme 2018-12-10 16:50:58 +01:00
Sein Coray
997a6cce87
Changed cat -A to cat -vet in test.sh 2018-12-10 16:33:56 +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
philsmd
7646509234
fixed validation of the --brain-client-features value 2018-12-10 13:16:41 +01:00
gituser
d59d06e2d7
Create ru.hckmap for Russian Language 2018-12-10 00:04:41 +03:00
Jens Steube
c6dcb1b8ae
Merge pull request #1809 from hashcat/master
Backports from master
2018-12-09 20:41:00 +01:00
Jens Steube
050b54b8cf
Merge pull request #1808 from Naufragous/fix-snprintf
Correct buffer size parameter in snprintf calls
2018-12-09 20:38:57 +01:00
R. Yushaev
074fad9fef Correct buffer size parameter in snprintf calls
There are approx. 240 snprintf calls that set the target buffer size to
out_len - 1 or similar. This "mind the null character" subtraction is
unnecessary since snprintf already includes the string termination into
the given buffer size.
2018-12-07 10:37:56 +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
e2ac101526 Update interface.c to remove non-existant Salt-Type 3 support. 2018-12-06 08:33:42 -08:00
Jens Steube
0db69138a7
Merge pull request #1807 from s3inlc/ikepsk
Added changes for fixed output of IKE PSK hashes
2018-12-06 16:25:55 +01:00
Sein Coray
9a872a6775
Added changes for fixed output of IKE PSK hashes 2018-12-06 14:42:17 +01:00
Jens Steube
55add7c60e The goal of this branch to develop a plugin like interface for hashcat kernels.
The modification of existing core source files to add new hashcat kernels conflicts with the idea of having private hashcat kernel repositories especially when backporting latest hashcat core changes and new features.
The final outcome of this should be a plugin format that does not require modifications on the core soruce files.
Also convert all existing hash-modes to hashcat modules.
We'll start with dynamic loading the modules at runtime rather than linking them at compile time.
This will require some extra code for different OS types but should beneficial on a long term.
This commit add some first ideas of how such modules could look like, however there's no dynamic loading interface yet.
Next steps will be removing all hash-mode depending special code from source files and move them to the modules.
Finally merge with master.
2018-12-06 14:02:10 +01:00
Jens Steube
09ec2a9c3c
Merge pull request #1803 from s3inlc/ikepsk
Extended IKE PSK md5/sha1 (-m 5300/5400) to print hashes correctly
2018-12-05 20:28:12 +01:00
Jens Steube
473b08560b
Merge pull request #1802 from s3inlc/master
Added swiss keyboard layout
2018-12-05 20:25:49 +01:00
Matt Covalt
71d9369a70 Correct Electrum Wallet Salt-Type support 2018-12-05 10:53:14 -08:00
Matt Covalt
bb9328f48b Add salt type 2 support for optimized functions 2018-12-05 10:42:23 -08:00