arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 08:08:10 +00:00
Code Issues Releases Wiki Activity

Add support for 12 byte IV in -m 31800

Browse Source
This commit is contained in:
jsteube 2023-04-07 06:00:54 +00:00
parent f3fe379571
commit 234e6cf49f
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenCL/m31800-pure.cl
View File

@ -33,9 +33,11 @@ typedef struct onepassword8
{ {
u32 hkdf_salt_buf[8]; u32 hkdf_salt_buf[8];
u32 hkdf_key_buf[8]; u32 hkdf_key_buf[8];
u32 iv_buf[4];
u32 tag_buf[4]; u32 tag_buf[4];
u32 iv_buf[4];
int iv_len;
u32 email_buf[64]; u32 email_buf[64];
int email_len; int email_len;
@ -393,7 +395,7 @@ KERNEL_FQ void m31800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, onepasswo
iv[2] = onepassword8->iv_buf[2]; iv[2] = onepassword8->iv_buf[2];
iv[3] = onepassword8->iv_buf[3]; iv[3] = onepassword8->iv_buf[3];
const u32 iv_len = 16; const u32 iv_len = onepassword8->iv_len;
u32 J0[4] = { 0 }; u32 J0[4] = { 0 };

39
src/modules/module_31800.c
View File

@ -58,9 +58,11 @@ typedef struct onepassword8
{ {
u32 hkdf_salt_buf[8]; u32 hkdf_salt_buf[8];
u32 hkdf_key_buf[8]; u32 hkdf_key_buf[8];
u32 iv_buf[4];
u32 tag_buf[4]; u32 tag_buf[4];
u32 iv_buf[4];
int iv_len;
u32 email_buf[64]; u32 email_buf[64];
int email_len; int email_len;
@ -166,7 +168,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
| TOKEN_ATTR_VERIFY_DIGIT; | TOKEN_ATTR_VERIFY_DIGIT;
token.sep[5] = '$'; token.sep[5] = '$';
token.len_min[5] = 32; token.len_min[5] = 24;
token.len_max[5] = 32; token.len_max[5] = 32;
token.attr[5] = TOKEN_ATTR_VERIFY_LENGTH token.attr[5] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX; | TOKEN_ATTR_VERIFY_HEX;
@ -254,18 +256,12 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
// iv // iv
//const int iv_len = token.len[5]; const int iv_len = token.len[5];
const u8 *iv_pos = token.buf[5]; const u8 *iv_pos = token.buf[5];
onepassword8->iv_buf[0] = hex_to_u32 (iv_pos + 0); onepassword8->iv_len = hex_decode (iv_pos, iv_len, (u8 *) onepassword8->iv_buf);
onepassword8->iv_buf[1] = hex_to_u32 (iv_pos + 8);
onepassword8->iv_buf[2] = hex_to_u32 (iv_pos + 16);
onepassword8->iv_buf[3] = hex_to_u32 (iv_pos + 24);
onepassword8->iv_buf[0] = byte_swap_32 (onepassword8->iv_buf[0]); for (int i = 0; i < 4; i++) onepassword8->iv_buf[i] = byte_swap_32 (onepassword8->iv_buf[i]);
onepassword8->iv_buf[1] = byte_swap_32 (onepassword8->iv_buf[1]);
onepassword8->iv_buf[2] = byte_swap_32 (onepassword8->iv_buf[2]);
onepassword8->iv_buf[3] = byte_swap_32 (onepassword8->iv_buf[3]);
// ct // ct
@ -320,13 +316,25 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
onepassword8_t *onepassword8 = (onepassword8_t *) esalt_buf; onepassword8_t *onepassword8 = (onepassword8_t *) esalt_buf;
// iv
u32 iv_buf[4];
for (int i = 0; i < 4; i++) iv_buf[i] = byte_swap_32 (onepassword8->iv_buf[i]);
u8 iv_buf8[(4 * 2 * 4) + 1];
const int iv_len = hex_encode ((const u8 *) iv_buf, onepassword8->iv_len, iv_buf8);
iv_buf8[iv_len] = 0;
// ct // ct
u32 ct_buf[1024]; u32 ct_buf[1024];
for (int i = 0; i < 1024; i++) ct_buf[i] = byte_swap_32 (onepassword8->ct_buf[i]); for (int i = 0; i < 1024; i++) ct_buf[i] = byte_swap_32 (onepassword8->ct_buf[i]);
u8 ct_buf8[1024 * 4]; u8 ct_buf8[(1024 * 2 * 4) + 1];
const int ct_len = hex_encode ((const u8 *) ct_buf, onepassword8->ct_len, ct_buf8); const int ct_len = hex_encode ((const u8 *) ct_buf, onepassword8->ct_len, ct_buf8);
@ -334,7 +342,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
// final // final
int out_len = snprintf ((char *) line_buf, line_size, "%s%s$%08x%08x%08x%08x%08x%08x%08x%08x$%08x%08x%08x%08x%08x%08x%08x%08x$%u$%08x%08x%08x%08x$%s$%08x%08x%08x%08x", int out_len = snprintf ((char *) line_buf, line_size, "%s%s$%08x%08x%08x%08x%08x%08x%08x%08x$%08x%08x%08x%08x%08x%08x%08x%08x$%u$%s$%s$%08x%08x%08x%08x",
SIGNATURE_1PASSWORD8, SIGNATURE_1PASSWORD8,
(char *) onepassword8->email_buf, (char *) onepassword8->email_buf,
onepassword8->hkdf_salt_buf[0], onepassword8->hkdf_salt_buf[0],
@ -354,10 +362,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
onepassword8->hkdf_key_buf[6], onepassword8->hkdf_key_buf[6],
onepassword8->hkdf_key_buf[7], onepassword8->hkdf_key_buf[7],
salt->salt_iter + 1, salt->salt_iter + 1,
onepassword8->iv_buf[0], (char *) iv_buf8,
onepassword8->iv_buf[1],
onepassword8->iv_buf[2],
onepassword8->iv_buf[3],
(char *) ct_buf8, (char *) ct_buf8,
onepassword8->tag_buf[0], onepassword8->tag_buf[0],
onepassword8->tag_buf[1], onepassword8->tag_buf[1],

2
tools/test_modules/m31800.pm
View File

@ -21,7 +21,7 @@ sub module_generate_hash
my $hkdf_salt = shift; my $hkdf_salt = shift;
my $hkdf_key = shift // random_hex_string (64); my $hkdf_key = shift // random_hex_string (64);
my $iterations = shift // 100000; my $iterations = shift // 100000;
my $iv = shift // random_hex_string (32); my $iv = shift // (random_number (0,1) ? random_hex_string (32) : random_hex_string (24));
my $ct = shift; my $ct = shift;
my $tag = shift; my $tag = shift;
my $email = shift // "31800\@hashcat.net"; my $email = shift // "31800\@hashcat.net";