arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2025-01-11 00:01:16 +00:00
Code Issues Releases Wiki Activity

SecureZIP: use hex_encode () / hex_decode ()

Browse Source
This commit is contained in:
philsmd 2020-06-02 11:21:25 +02:00
parent 5df743cb85
commit 416bdd8e47
No known key found for this signature in database
GPG Key ID: 4F25D016D9D6A8AF
3 changed files with 21 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/modules/module_23001.c
View File

@ -172,34 +172,19 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 *iv = (u8 *) securezip->iv; u8 *iv = (u8 *) securezip->iv;
memset (iv, 0, 16); securezip->iv_len = hex_decode (iv_pos, token.len[5], iv);
for (int i = 0, j = 0; i < token.len[5]; i += 2, j += 1)
{
iv[j] = hex_to_u8 (iv_pos + i);
}
securezip->iv_len = (u32) (token.len[5] / 2);
// data: // data:
u32 *data = securezip->data; u32 *data = securezip->data;
for (int i = 0, j = 0; i < token.len[6]; i += 8, j += 1) hex_decode (data_pos, token.len[6], (u8 *) data);
{
data[j] = hex_to_u32 (data_pos + i);
}
// file: // file:
u8 *file = (u8 *) securezip->file; u8 *file = (u8 *) securezip->file;
memset (file, 0, 64); memcpy (file, file_pos, token.len[10]);
for (int i = 0; i < token.len[10]; i++)
{
file[i] = file_pos[i]; // or just memcpy ()
}
file[63] = 0; file[63] = 0;
@ -228,23 +213,15 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
// IV: // IV:
const u8 *iv_ptr = (const u8 *) securezip->iv; u8 iv[33] = { 0 };
char iv[33] = { 0 }; hex_encode ((u8 *) securezip->iv, securezip->iv_len, iv);
for (u32 i = 0, j = 0; i < securezip->iv_len; i += 1, j += 2)
{
snprintf (iv + j, 33 - j, "%02x", iv_ptr[i]);
}
// data: // data:
char data[289] = { 0 }; u8 data[289] = { 0 };
for (u32 i = 0, j = 0; i < 36; i += 1, j += 8) hex_encode ((u8 *) securezip->data, 144, data);
{
snprintf (data + j, 289 - j, "%08x", byte_swap_32 (securezip->data[i]));
}
// file: // file:

37
src/modules/module_23002.c
View File

@ -172,34 +172,19 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 *iv = (u8 *) securezip->iv; u8 *iv = (u8 *) securezip->iv;
memset (iv, 0, 16); securezip->iv_len = hex_decode (iv_pos, token.len[5], iv);
for (int i = 0, j = 0; i < token.len[5]; i += 2, j += 1)
{
iv[j] = hex_to_u8 (iv_pos + i);
}
securezip->iv_len = (u32) (token.len[5] / 2);
// data: // data:
u32 *data = securezip->data; u32 *data = securezip->data;
for (int i = 0, j = 0; i < token.len[6]; i += 8, j += 1) hex_decode (data_pos, token.len[6], (u8 *) data);
{
data[j] = hex_to_u32 (data_pos + i);
}
// file: // file:
u8 *file = (u8 *) securezip->file; u8 *file = (u8 *) securezip->file;
memset (file, 0, 64); memcpy (file, file_pos, token.len[10]);
for (int i = 0; i < token.len[10]; i++)
{
file[i] = file_pos[i]; // or just memcpy ()
}
file[63] = 0; file[63] = 0;
@ -228,23 +213,15 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
// IV: // IV:
const u8 *iv_ptr = (const u8 *) securezip->iv; u8 iv[33] = { 0 };
char iv[33] = { 0 }; hex_encode ((u8 *) securezip->iv, securezip->iv_len, iv);
for (u32 i = 0, j = 0; i < securezip->iv_len; i += 1, j += 2)
{
snprintf (iv + j, 33 - j, "%02x", iv_ptr[i]);
}
// data: // data:
char data[289] = { 0 }; u8 data[289] = { 0 };
for (u32 i = 0, j = 0; i < 36; i += 1, j += 8) hex_encode ((u8 *) securezip->data, 144, data);
{
snprintf (data + j, 289 - j, "%08x", byte_swap_32 (securezip->data[i]));
}
// file: // file:

37
src/modules/module_23003.c
View File

@ -172,34 +172,19 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
u8 *iv = (u8 *) securezip->iv; u8 *iv = (u8 *) securezip->iv;
memset (iv, 0, 16); securezip->iv_len = hex_decode (iv_pos, token.len[5], iv);
for (int i = 0, j = 0; i < token.len[5]; i += 2, j += 1)
{
iv[j] = hex_to_u8 (iv_pos + i);
}
securezip->iv_len = (u32) (token.len[5] / 2);
// data: // data:
u32 *data = securezip->data; u32 *data = securezip->data;
for (int i = 0, j = 0; i < token.len[6]; i += 8, j += 1) hex_decode (data_pos, token.len[6], (u8 *) data);
{
data[j] = hex_to_u32 (data_pos + i);
}
// file: // file:
u8 *file = (u8 *) securezip->file; u8 *file = (u8 *) securezip->file;
memset (file, 0, 64); memcpy (file, file_pos, token.len[10]);
for (int i = 0; i < token.len[10]; i++)
{
file[i] = file_pos[i]; // or just memcpy ()
}
file[63] = 0; file[63] = 0;
@ -228,23 +213,15 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
// IV: // IV:
const u8 *iv_ptr = (const u8 *) securezip->iv; u8 iv[33] = { 0 };
char iv[33] = { 0 }; hex_encode ((u8 *) securezip->iv, securezip->iv_len, iv);
for (u32 i = 0, j = 0; i < securezip->iv_len; i += 1, j += 2)
{
snprintf (iv + j, 33 - j, "%02x", iv_ptr[i]);
}
// data: // data:
char data[289] = { 0 }; u8 data[289] = { 0 };
for (u32 i = 0, j = 0; i < 36; i += 1, j += 8) hex_encode ((u8 *) securezip->data, 144, data);
{
snprintf (data + j, 289 - j, "%08x", byte_swap_32 (securezip->data[i]));
}
// file: // file: