From a30a9f5b45b8728446f1a8e6bd020681e99b7561 Mon Sep 17 00:00:00 2001 From: jsteube Date: Tue, 21 Mar 2017 14:07:16 +0100 Subject: [PATCH] Fixed a hash validation error when trying to load Android FDE < 4.3 hashes --- deps/OpenCL-Headers/CL | 2 +- docs/changes.txt | 1 + src/interface.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/deps/OpenCL-Headers/CL b/deps/OpenCL-Headers/CL index 42e7afe06..bf0f43b76 160000 --- a/deps/OpenCL-Headers/CL +++ b/deps/OpenCL-Headers/CL @@ -1 +1 @@ -Subproject commit 42e7afe066a67107c2236b86c9864a472f8eead8 +Subproject commit bf0f43b76f4556c3d5717f8ba8a01216b27f4af7 diff --git a/docs/changes.txt b/docs/changes.txt index b5e4c5e7a..e44379a37 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -24,6 +24,7 @@ - Fixed a problem with parsing and displaying -m 7000 = Fortigate (FortiOS) hashes - Fixed --remove was not applied in case all hashes have been cracked by potfile or weak-hash check - Fixed a race condition when a session finishes the input-base was freed but accessed afterwards +- Fixed a hash validation error when trying to load Android FDE < 4.3 hashes ## ## Technical diff --git a/src/interface.c b/src/interface.c index 2fc13d614..bc76bcc74 100644 --- a/src/interface.c +++ b/src/interface.c @@ -7930,7 +7930,7 @@ int androidfde_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE digest[2] = byte_swap_32 (digest[2]); digest[3] = byte_swap_32 (digest[3]); - if (is_valid_hex_string (saltbuf_pos, 64) == false) return (PARSER_HASH_ENCODING); + if (is_valid_hex_string (saltbuf_pos, 32) == false) return (PARSER_HASH_ENCODING); salt->salt_buf[0] = hex_to_u32 ((const u8 *) &saltbuf_pos[ 0]); salt->salt_buf[1] = hex_to_u32 ((const u8 *) &saltbuf_pos[ 8]);