arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-15 20:39:17 +00:00
Code Issues Releases Wiki Activity

Vectorized Android FDE (Samsung DEK) and added support for long passwords

Browse Source
This commit is contained in:
jsteube 2017-07-08 21:56:36 +02:00
parent edf904f309
commit 933fa47d21
2 changed files with 173 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

515
OpenCL/m12900.cl
View File

@ -3,184 +3,20 @@
* License.....: MIT * License.....: MIT
*/ */
#define NEW_SIMD_CODE
#include "inc_vendor.cl" #include "inc_vendor.cl"
#include "inc_hash_constants.h" #include "inc_hash_constants.h"
#include "inc_hash_functions.cl" #include "inc_hash_functions.cl"
#include "inc_types.cl" #include "inc_types.cl"
#include "inc_common.cl" #include "inc_common.cl"
#include "inc_simd.cl"
#include "inc_hash_sha256.cl"
#define COMPARE_S "inc_comp_single.cl" #define COMPARE_S "inc_comp_single.cl"
#define COMPARE_M "inc_comp_multi.cl" #define COMPARE_M "inc_comp_multi.cl"
__constant u32a k_sha256[64] = void hmac_sha256_run_V (u32x w0[4], u32x w1[4], u32x w2[4], u32x w3[4], u32x ipad[8], u32x opad[8], u32x digest[8])
{
SHA256C00, SHA256C01, SHA256C02, SHA256C03,
SHA256C04, SHA256C05, SHA256C06, SHA256C07,
SHA256C08, SHA256C09, SHA256C0a, SHA256C0b,
SHA256C0c, SHA256C0d, SHA256C0e, SHA256C0f,
SHA256C10, SHA256C11, SHA256C12, SHA256C13,
SHA256C14, SHA256C15, SHA256C16, SHA256C17,
SHA256C18, SHA256C19, SHA256C1a, SHA256C1b,
SHA256C1c, SHA256C1d, SHA256C1e, SHA256C1f,
SHA256C20, SHA256C21, SHA256C22, SHA256C23,
SHA256C24, SHA256C25, SHA256C26, SHA256C27,
SHA256C28, SHA256C29, SHA256C2a, SHA256C2b,
SHA256C2c, SHA256C2d, SHA256C2e, SHA256C2f,
SHA256C30, SHA256C31, SHA256C32, SHA256C33,
SHA256C34, SHA256C35, SHA256C36, SHA256C37,
SHA256C38, SHA256C39, SHA256C3a, SHA256C3b,
SHA256C3c, SHA256C3d, SHA256C3e, SHA256C3f,
};
void sha256_transform (const u32 w0[4], const u32 w1[4], const u32 w2[4], const u32 w3[4], u32 digest[8])
{
u32 a = digest[0];
u32 b = digest[1];
u32 c = digest[2];
u32 d = digest[3];
u32 e = digest[4];
u32 f = digest[5];
u32 g = digest[6];
u32 h = digest[7];
u32 w0_t = w0[0];
u32 w1_t = w0[1];
u32 w2_t = w0[2];
u32 w3_t = w0[3];
u32 w4_t = w1[0];
u32 w5_t = w1[1];
u32 w6_t = w1[2];
u32 w7_t = w1[3];
u32 w8_t = w2[0];
u32 w9_t = w2[1];
u32 wa_t = w2[2];
u32 wb_t = w2[3];
u32 wc_t = w3[0];
u32 wd_t = w3[1];
u32 we_t = w3[2];
u32 wf_t = w3[3];
#define ROUND_EXPAND() \
{ \
w0_t = SHA256_EXPAND (we_t, w9_t, w1_t, w0_t); \
w1_t = SHA256_EXPAND (wf_t, wa_t, w2_t, w1_t); \
w2_t = SHA256_EXPAND (w0_t, wb_t, w3_t, w2_t); \
w3_t = SHA256_EXPAND (w1_t, wc_t, w4_t, w3_t); \
w4_t = SHA256_EXPAND (w2_t, wd_t, w5_t, w4_t); \
w5_t = SHA256_EXPAND (w3_t, we_t, w6_t, w5_t); \
w6_t = SHA256_EXPAND (w4_t, wf_t, w7_t, w6_t); \
w7_t = SHA256_EXPAND (w5_t, w0_t, w8_t, w7_t); \
w8_t = SHA256_EXPAND (w6_t, w1_t, w9_t, w8_t); \
w9_t = SHA256_EXPAND (w7_t, w2_t, wa_t, w9_t); \
wa_t = SHA256_EXPAND (w8_t, w3_t, wb_t, wa_t); \
wb_t = SHA256_EXPAND (w9_t, w4_t, wc_t, wb_t); \
wc_t = SHA256_EXPAND (wa_t, w5_t, wd_t, wc_t); \
wd_t = SHA256_EXPAND (wb_t, w6_t, we_t, wd_t); \
we_t = SHA256_EXPAND (wc_t, w7_t, wf_t, we_t); \
wf_t = SHA256_EXPAND (wd_t, w8_t, w0_t, wf_t); \
}
#define ROUND_STEP(i) \
{ \
SHA256_STEP (SHA256_F0o, SHA256_F1o, a, b, c, d, e, f, g, h, w0_t, k_sha256[i + 0]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, h, a, b, c, d, e, f, g, w1_t, k_sha256[i + 1]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, g, h, a, b, c, d, e, f, w2_t, k_sha256[i + 2]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, f, g, h, a, b, c, d, e, w3_t, k_sha256[i + 3]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, e, f, g, h, a, b, c, d, w4_t, k_sha256[i + 4]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, d, e, f, g, h, a, b, c, w5_t, k_sha256[i + 5]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, c, d, e, f, g, h, a, b, w6_t, k_sha256[i + 6]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, b, c, d, e, f, g, h, a, w7_t, k_sha256[i + 7]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, a, b, c, d, e, f, g, h, w8_t, k_sha256[i + 8]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, h, a, b, c, d, e, f, g, w9_t, k_sha256[i + 9]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, g, h, a, b, c, d, e, f, wa_t, k_sha256[i + 10]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, f, g, h, a, b, c, d, e, wb_t, k_sha256[i + 11]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, e, f, g, h, a, b, c, d, wc_t, k_sha256[i + 12]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, d, e, f, g, h, a, b, c, wd_t, k_sha256[i + 13]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, c, d, e, f, g, h, a, b, we_t, k_sha256[i + 14]); \
SHA256_STEP (SHA256_F0o, SHA256_F1o, b, c, d, e, f, g, h, a, wf_t, k_sha256[i + 15]); \
}
ROUND_STEP (0);
#ifdef _unroll
#pragma unroll
#endif
for (int i = 16; i < 64; i += 16)
{
ROUND_EXPAND (); ROUND_STEP (i);
}
digest[0] += a;
digest[1] += b;
digest[2] += c;
digest[3] += d;
digest[4] += e;
digest[5] += f;
digest[6] += g;
digest[7] += h;
}
void hmac_sha256_pad (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u32 opad[8])
{
w0[0] = w0[0] ^ 0x36363636;
w0[1] = w0[1] ^ 0x36363636;
w0[2] = w0[2] ^ 0x36363636;
w0[3] = w0[3] ^ 0x36363636;
w1[0] = w1[0] ^ 0x36363636;
w1[1] = w1[1] ^ 0x36363636;
w1[2] = w1[2] ^ 0x36363636;
w1[3] = w1[3] ^ 0x36363636;
w2[0] = w2[0] ^ 0x36363636;
w2[1] = w2[1] ^ 0x36363636;
w2[2] = w2[2] ^ 0x36363636;
w2[3] = w2[3] ^ 0x36363636;
w3[0] = w3[0] ^ 0x36363636;
w3[1] = w3[1] ^ 0x36363636;
w3[2] = w3[2] ^ 0x36363636;
w3[3] = w3[3] ^ 0x36363636;
ipad[0] = SHA256M_A;
ipad[1] = SHA256M_B;
ipad[2] = SHA256M_C;
ipad[3] = SHA256M_D;
ipad[4] = SHA256M_E;
ipad[5] = SHA256M_F;
ipad[6] = SHA256M_G;
ipad[7] = SHA256M_H;
sha256_transform (w0, w1, w2, w3, ipad);
w0[0] = w0[0] ^ 0x6a6a6a6a;
w0[1] = w0[1] ^ 0x6a6a6a6a;
w0[2] = w0[2] ^ 0x6a6a6a6a;
w0[3] = w0[3] ^ 0x6a6a6a6a;
w1[0] = w1[0] ^ 0x6a6a6a6a;
w1[1] = w1[1] ^ 0x6a6a6a6a;
w1[2] = w1[2] ^ 0x6a6a6a6a;
w1[3] = w1[3] ^ 0x6a6a6a6a;
w2[0] = w2[0] ^ 0x6a6a6a6a;
w2[1] = w2[1] ^ 0x6a6a6a6a;
w2[2] = w2[2] ^ 0x6a6a6a6a;
w2[3] = w2[3] ^ 0x6a6a6a6a;
w3[0] = w3[0] ^ 0x6a6a6a6a;
w3[1] = w3[1] ^ 0x6a6a6a6a;
w3[2] = w3[2] ^ 0x6a6a6a6a;
w3[3] = w3[3] ^ 0x6a6a6a6a;
opad[0] = SHA256M_A;
opad[1] = SHA256M_B;
opad[2] = SHA256M_C;
opad[3] = SHA256M_D;
opad[4] = SHA256M_E;
opad[5] = SHA256M_F;
opad[6] = SHA256M_G;
opad[7] = SHA256M_H;
sha256_transform (w0, w1, w2, w3, opad);
}
void hmac_sha256_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u32 opad[8], u32 digest[8])
{ {
digest[0] = ipad[0]; digest[0] = ipad[0];
digest[1] = ipad[1]; digest[1] = ipad[1];
@ -191,7 +27,7 @@ void hmac_sha256_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u
digest[6] = ipad[6]; digest[6] = ipad[6];
digest[7] = ipad[7]; digest[7] = ipad[7];
sha256_transform (w0, w1, w2, w3, digest); sha256_transform_vector (w0, w1, w2, w3, digest);
w0[0] = digest[0]; w0[0] = digest[0];
w0[1] = digest[1]; w0[1] = digest[1];
@ -219,212 +55,200 @@ void hmac_sha256_run (u32 w0[4], u32 w1[4], u32 w2[4], u32 w3[4], u32 ipad[8], u
digest[6] = opad[6]; digest[6] = opad[6];
digest[7] = opad[7]; digest[7] = opad[7];
sha256_transform (w0, w1, w2, w3, digest); sha256_transform_vector (w0, w1, w2, w3, digest);
} }
__kernel void m12900_init (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_sha256_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pbkdf2_sha256_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) __kernel void m12900_init (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_sha256_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const pbkdf2_sha256_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{ {
/** /**
* base * base
*/ */
const u32 gid = get_global_id (0); const u32 gid = get_global_id (0);
//const u32 lid = get_local_id (0);
if (gid >= gid_max) return; if (gid >= gid_max) return;
/**
* base
*/
u32 w0[4]; u32 w0[4];
u32 w1[4];
u32 w2[4];
u32 w3[4];
w0[0] = pws[gid].i[ 0]; w0[0] = pws[gid].i[ 0];
w0[1] = pws[gid].i[ 1]; w0[1] = pws[gid].i[ 1];
w0[2] = pws[gid].i[ 2]; w0[2] = pws[gid].i[ 2];
w0[3] = pws[gid].i[ 3]; w0[3] = pws[gid].i[ 3];
u32 w1[4];
w1[0] = pws[gid].i[ 4]; w1[0] = pws[gid].i[ 4];
w1[1] = pws[gid].i[ 5]; w1[1] = pws[gid].i[ 5];
w1[2] = pws[gid].i[ 6]; w1[2] = pws[gid].i[ 6];
w1[3] = pws[gid].i[ 7]; w1[3] = pws[gid].i[ 7];
u32 w2[4];
w2[0] = pws[gid].i[ 8]; w2[0] = pws[gid].i[ 8];
w2[1] = pws[gid].i[ 9]; w2[1] = pws[gid].i[ 9];
w2[2] = pws[gid].i[10]; w2[2] = pws[gid].i[10];
w2[3] = pws[gid].i[11]; w2[3] = pws[gid].i[11];
u32 w3[4];
w3[0] = pws[gid].i[12]; w3[0] = pws[gid].i[12];
w3[1] = pws[gid].i[13]; w3[1] = pws[gid].i[13];
w3[2] = pws[gid].i[14]; w3[2] = pws[gid].i[14];
w3[3] = pws[gid].i[15]; w3[3] = pws[gid].i[15];
//const u32 pw_len = pws[gid].pw_len; w0[0] = swap32_S (w0[0]);
w0[1] = swap32_S (w0[1]);
w0[2] = swap32_S (w0[2]);
w0[3] = swap32_S (w0[3]);
w1[0] = swap32_S (w1[0]);
w1[1] = swap32_S (w1[1]);
w1[2] = swap32_S (w1[2]);
w1[3] = swap32_S (w1[3]);
w2[0] = swap32_S (w2[0]);
w2[1] = swap32_S (w2[1]);
w2[2] = swap32_S (w2[2]);
w2[3] = swap32_S (w2[3]);
w3[0] = swap32_S (w3[0]);
w3[1] = swap32_S (w3[1]);
w3[2] = swap32_S (w3[2]);
w3[3] = swap32_S (w3[3]);
w0[0] = swap32 (w0[0]); sha256_hmac_ctx_t sha256_hmac_ctx;
w0[1] = swap32 (w0[1]);
w0[2] = swap32 (w0[2]);
w0[3] = swap32 (w0[3]);
w1[0] = swap32 (w1[0]);
w1[1] = swap32 (w1[1]);
w1[2] = swap32 (w1[2]);
w1[3] = swap32 (w1[3]);
w2[0] = swap32 (w2[0]);
w2[1] = swap32 (w2[1]);
w2[2] = swap32 (w2[2]);
w2[3] = swap32 (w2[3]);
w3[0] = swap32 (w3[0]);
w3[1] = swap32 (w3[1]);
w3[2] = swap32 (w3[2]);
w3[3] = swap32 (w3[3]);
/** sha256_hmac_init (&sha256_hmac_ctx, w0, w1, w2, w3);
* salt
*/
u32 salt_len = 16; tmps[gid].ipad[0] = sha256_hmac_ctx.ipad.h[0];
tmps[gid].ipad[1] = sha256_hmac_ctx.ipad.h[1];
tmps[gid].ipad[2] = sha256_hmac_ctx.ipad.h[2];
tmps[gid].ipad[3] = sha256_hmac_ctx.ipad.h[3];
tmps[gid].ipad[4] = sha256_hmac_ctx.ipad.h[4];
tmps[gid].ipad[5] = sha256_hmac_ctx.ipad.h[5];
tmps[gid].ipad[6] = sha256_hmac_ctx.ipad.h[6];
tmps[gid].ipad[7] = sha256_hmac_ctx.ipad.h[7];
u32 salt_buf0[4]; tmps[gid].opad[0] = sha256_hmac_ctx.opad.h[0];
tmps[gid].opad[1] = sha256_hmac_ctx.opad.h[1];
tmps[gid].opad[2] = sha256_hmac_ctx.opad.h[2];
tmps[gid].opad[3] = sha256_hmac_ctx.opad.h[3];
tmps[gid].opad[4] = sha256_hmac_ctx.opad.h[4];
tmps[gid].opad[5] = sha256_hmac_ctx.opad.h[5];
tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6];
tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7];
salt_buf0[0] = salt_bufs[salt_pos].salt_buf[0]; w0[0] = salt_bufs[salt_pos].salt_buf[0];
salt_buf0[1] = salt_bufs[salt_pos].salt_buf[1]; w0[1] = salt_bufs[salt_pos].salt_buf[1];
salt_buf0[2] = salt_bufs[salt_pos].salt_buf[2]; w0[2] = salt_bufs[salt_pos].salt_buf[2];
salt_buf0[3] = salt_bufs[salt_pos].salt_buf[3]; w0[3] = salt_bufs[salt_pos].salt_buf[3];
w1[0] = 0;
w1[1] = 0;
w1[2] = 0;
w1[3] = 0;
w2[0] = 0;
w2[1] = 0;
w2[2] = 0;
w2[3] = 0;
w3[0] = 0;
w3[1] = 0;
w3[2] = 0;
w3[3] = 0;
u32 salt_buf1[4]; sha256_hmac_update_64 (&sha256_hmac_ctx, w0, w1, w2, w3, 16);
salt_buf1[0] = 0x00000001;
salt_buf1[1] = 0x80000000;
salt_buf1[2] = 0;
salt_buf1[3] = 0;
u32 salt_buf2[4];
salt_buf2[0] = 0;
salt_buf2[1] = 0;
salt_buf2[2] = 0;
salt_buf2[3] = 0;
u32 salt_buf3[4];
salt_buf3[0] = 0;
salt_buf3[1] = 0;
salt_buf3[2] = 0;
salt_buf3[3] = (64 + salt_len + 4) * 8;
u32 ipad[8];
u32 opad[8];
hmac_sha256_pad (w0, w1, w2, w3, ipad, opad);
tmps[gid].ipad[0] = ipad[0];
tmps[gid].ipad[1] = ipad[1];
tmps[gid].ipad[2] = ipad[2];
tmps[gid].ipad[3] = ipad[3];
tmps[gid].ipad[4] = ipad[4];
tmps[gid].ipad[5] = ipad[5];
tmps[gid].ipad[6] = ipad[6];
tmps[gid].ipad[7] = ipad[7];
tmps[gid].opad[0] = opad[0];
tmps[gid].opad[1] = opad[1];
tmps[gid].opad[2] = opad[2];
tmps[gid].opad[3] = opad[3];
tmps[gid].opad[4] = opad[4];
tmps[gid].opad[5] = opad[5];
tmps[gid].opad[6] = opad[6];
tmps[gid].opad[7] = opad[7];
for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) for (u32 i = 0, j = 1; i < 8; i += 8, j += 1)
{ {
u32 dgst[8]; sha256_hmac_ctx_t sha256_hmac_ctx2 = sha256_hmac_ctx;
hmac_sha256_run (salt_buf0, salt_buf1, salt_buf2, salt_buf3, ipad, opad, dgst); w0[0] = j;
w0[1] = 0;
w0[2] = 0;
w0[3] = 0;
w1[0] = 0;
w1[1] = 0;
w1[2] = 0;
w1[3] = 0;
w2[0] = 0;
w2[1] = 0;
w2[2] = 0;
w2[3] = 0;
w3[0] = 0;
w3[1] = 0;
w3[2] = 0;
w3[3] = 0;
tmps[gid].dgst[i + 0] = dgst[0]; sha256_hmac_update_64 (&sha256_hmac_ctx2, w0, w1, w2, w3, 4);
tmps[gid].dgst[i + 1] = dgst[1];
tmps[gid].dgst[i + 2] = dgst[2];
tmps[gid].dgst[i + 3] = dgst[3];
tmps[gid].dgst[i + 4] = dgst[4];
tmps[gid].dgst[i + 5] = dgst[5];
tmps[gid].dgst[i + 6] = dgst[6];
tmps[gid].dgst[i + 7] = dgst[7];
tmps[gid].out[i + 0] = dgst[0]; sha256_hmac_final (&sha256_hmac_ctx2);
tmps[gid].out[i + 1] = dgst[1];
tmps[gid].out[i + 2] = dgst[2]; tmps[gid].dgst[i + 0] = sha256_hmac_ctx2.opad.h[0];
tmps[gid].out[i + 3] = dgst[3]; tmps[gid].dgst[i + 1] = sha256_hmac_ctx2.opad.h[1];
tmps[gid].out[i + 4] = dgst[4]; tmps[gid].dgst[i + 2] = sha256_hmac_ctx2.opad.h[2];
tmps[gid].out[i + 5] = dgst[5]; tmps[gid].dgst[i + 3] = sha256_hmac_ctx2.opad.h[3];
tmps[gid].out[i + 6] = dgst[6]; tmps[gid].dgst[i + 4] = sha256_hmac_ctx2.opad.h[4];
tmps[gid].out[i + 7] = dgst[7]; tmps[gid].dgst[i + 5] = sha256_hmac_ctx2.opad.h[5];
tmps[gid].dgst[i + 6] = sha256_hmac_ctx2.opad.h[6];
tmps[gid].dgst[i + 7] = sha256_hmac_ctx2.opad.h[7];
tmps[gid].out[i + 0] = tmps[gid].dgst[i + 0];
tmps[gid].out[i + 1] = tmps[gid].dgst[i + 1];
tmps[gid].out[i + 2] = tmps[gid].dgst[i + 2];
tmps[gid].out[i + 3] = tmps[gid].dgst[i + 3];
tmps[gid].out[i + 4] = tmps[gid].dgst[i + 4];
tmps[gid].out[i + 5] = tmps[gid].dgst[i + 5];
tmps[gid].out[i + 6] = tmps[gid].dgst[i + 6];
tmps[gid].out[i + 7] = tmps[gid].dgst[i + 7];
} }
} }
__kernel void m12900_loop (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_sha256_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pbkdf2_sha256_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) __kernel void m12900_loop (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_sha256_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const pbkdf2_sha256_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{ {
const u32 gid = get_global_id (0); const u32 gid = get_global_id (0);
if (gid >= gid_max) return; if ((gid * VECT_SIZE) >= gid_max) return;
u32 ipad[8]; u32x ipad[8];
u32x opad[8];
ipad[0] = tmps[gid].ipad[0]; ipad[0] = packv (tmps, ipad, gid, 0);
ipad[1] = tmps[gid].ipad[1]; ipad[1] = packv (tmps, ipad, gid, 1);
ipad[2] = tmps[gid].ipad[2]; ipad[2] = packv (tmps, ipad, gid, 2);
ipad[3] = tmps[gid].ipad[3]; ipad[3] = packv (tmps, ipad, gid, 3);
ipad[4] = tmps[gid].ipad[4]; ipad[4] = packv (tmps, ipad, gid, 4);
ipad[5] = tmps[gid].ipad[5]; ipad[5] = packv (tmps, ipad, gid, 5);
ipad[6] = tmps[gid].ipad[6]; ipad[6] = packv (tmps, ipad, gid, 6);
ipad[7] = tmps[gid].ipad[7]; ipad[7] = packv (tmps, ipad, gid, 7);
u32 opad[8]; opad[0] = packv (tmps, opad, gid, 0);
opad[1] = packv (tmps, opad, gid, 1);
opad[0] = tmps[gid].opad[0]; opad[2] = packv (tmps, opad, gid, 2);
opad[1] = tmps[gid].opad[1]; opad[3] = packv (tmps, opad, gid, 3);
opad[2] = tmps[gid].opad[2]; opad[4] = packv (tmps, opad, gid, 4);
opad[3] = tmps[gid].opad[3]; opad[5] = packv (tmps, opad, gid, 5);
opad[4] = tmps[gid].opad[4]; opad[6] = packv (tmps, opad, gid, 6);
opad[5] = tmps[gid].opad[5]; opad[7] = packv (tmps, opad, gid, 7);
opad[6] = tmps[gid].opad[6];
opad[7] = tmps[gid].opad[7];
for (u32 i = 0; i < 8; i += 8) for (u32 i = 0; i < 8; i += 8)
{ {
u32 dgst[8]; u32x dgst[8];
u32x out[8];
dgst[0] = tmps[gid].dgst[i + 0]; dgst[0] = packv (tmps, dgst, gid, i + 0);
dgst[1] = tmps[gid].dgst[i + 1]; dgst[1] = packv (tmps, dgst, gid, i + 1);
dgst[2] = tmps[gid].dgst[i + 2]; dgst[2] = packv (tmps, dgst, gid, i + 2);
dgst[3] = tmps[gid].dgst[i + 3]; dgst[3] = packv (tmps, dgst, gid, i + 3);
dgst[4] = tmps[gid].dgst[i + 4]; dgst[4] = packv (tmps, dgst, gid, i + 4);
dgst[5] = tmps[gid].dgst[i + 5]; dgst[5] = packv (tmps, dgst, gid, i + 5);
dgst[6] = tmps[gid].dgst[i + 6]; dgst[6] = packv (tmps, dgst, gid, i + 6);
dgst[7] = tmps[gid].dgst[i + 7]; dgst[7] = packv (tmps, dgst, gid, i + 7);
u32 out[8]; out[0] = packv (tmps, out, gid, i + 0);
out[1] = packv (tmps, out, gid, i + 1);
out[0] = tmps[gid].out[i + 0]; out[2] = packv (tmps, out, gid, i + 2);
out[1] = tmps[gid].out[i + 1]; out[3] = packv (tmps, out, gid, i + 3);
out[2] = tmps[gid].out[i + 2]; out[4] = packv (tmps, out, gid, i + 4);
out[3] = tmps[gid].out[i + 3]; out[5] = packv (tmps, out, gid, i + 5);
out[4] = tmps[gid].out[i + 4]; out[6] = packv (tmps, out, gid, i + 6);
out[5] = tmps[gid].out[i + 5]; out[7] = packv (tmps, out, gid, i + 7);
out[6] = tmps[gid].out[i + 6];
out[7] = tmps[gid].out[i + 7];
for (u32 j = 0; j < loop_cnt; j++) for (u32 j = 0; j < loop_cnt; j++)
{ {
u32 w0[4]; u32x w0[4];
u32 w1[4]; u32x w1[4];
u32 w2[4]; u32x w2[4];
u32 w3[4]; u32x w3[4];
w0[0] = dgst[0]; w0[0] = dgst[0];
w0[1] = dgst[1]; w0[1] = dgst[1];
@ -443,7 +267,7 @@ __kernel void m12900_loop (__global pw_t *pws, __global const kernel_rule_t *rul
w3[2] = 0; w3[2] = 0;
w3[3] = (64 + 32) * 8; w3[3] = (64 + 32) * 8;
hmac_sha256_run (w0, w1, w2, w3, ipad, opad, dgst); hmac_sha256_run_V (w0, w1, w2, w3, ipad, opad, dgst);
out[0] ^= dgst[0]; out[0] ^= dgst[0];
out[1] ^= dgst[1]; out[1] ^= dgst[1];
@ -455,27 +279,27 @@ __kernel void m12900_loop (__global pw_t *pws, __global const kernel_rule_t *rul
out[7] ^= dgst[7]; out[7] ^= dgst[7];
} }
tmps[gid].dgst[i + 0] = dgst[0]; unpackv (tmps, dgst, gid, i + 0, dgst[0]);
tmps[gid].dgst[i + 1] = dgst[1]; unpackv (tmps, dgst, gid, i + 1, dgst[1]);
tmps[gid].dgst[i + 2] = dgst[2]; unpackv (tmps, dgst, gid, i + 2, dgst[2]);
tmps[gid].dgst[i + 3] = dgst[3]; unpackv (tmps, dgst, gid, i + 3, dgst[3]);
tmps[gid].dgst[i + 4] = dgst[4]; unpackv (tmps, dgst, gid, i + 4, dgst[4]);
tmps[gid].dgst[i + 5] = dgst[5]; unpackv (tmps, dgst, gid, i + 5, dgst[5]);
tmps[gid].dgst[i + 6] = dgst[6]; unpackv (tmps, dgst, gid, i + 6, dgst[6]);
tmps[gid].dgst[i + 7] = dgst[7]; unpackv (tmps, dgst, gid, i + 7, dgst[7]);
tmps[gid].out[i + 0] = out[0]; unpackv (tmps, out, gid, i + 0, out[0]);
tmps[gid].out[i + 1] = out[1]; unpackv (tmps, out, gid, i + 1, out[1]);
tmps[gid].out[i + 2] = out[2]; unpackv (tmps, out, gid, i + 2, out[2]);
tmps[gid].out[i + 3] = out[3]; unpackv (tmps, out, gid, i + 3, out[3]);
tmps[gid].out[i + 4] = out[4]; unpackv (tmps, out, gid, i + 4, out[4]);
tmps[gid].out[i + 5] = out[5]; unpackv (tmps, out, gid, i + 5, out[5]);
tmps[gid].out[i + 6] = out[6]; unpackv (tmps, out, gid, i + 6, out[6]);
tmps[gid].out[i + 7] = out[7]; unpackv (tmps, out, gid, i + 7, out[7]);
} }
} }
__kernel void m12900_comp (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_sha256_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global pbkdf2_sha256_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max) __kernel void m12900_comp (__global pw_t *pws, __global const kernel_rule_t *rules_buf, __global const pw_t *combs_buf, __global const bf_t *bfs_buf, __global pbkdf2_sha256_tmp_t *tmps, __global void *hooks, __global const u32 *bitmaps_buf_s1_a, __global const u32 *bitmaps_buf_s1_b, __global const u32 *bitmaps_buf_s1_c, __global const u32 *bitmaps_buf_s1_d, __global const u32 *bitmaps_buf_s2_a, __global const u32 *bitmaps_buf_s2_b, __global const u32 *bitmaps_buf_s2_c, __global const u32 *bitmaps_buf_s2_d, __global plain_t *plains_buf, __global const digest_t *digests_buf, __global u32 *hashes_shown, __global const salt_t *salt_bufs, __global const pbkdf2_sha256_t *esalt_bufs, __global u32 *d_return_buf, __global u32 *d_scryptV0_buf, __global u32 *d_scryptV1_buf, __global u32 *d_scryptV2_buf, __global u32 *d_scryptV3_buf, const u32 bitmap_mask, const u32 bitmap_shift1, const u32 bitmap_shift2, const u32 salt_pos, const u32 loop_pos, const u32 loop_cnt, const u32 il_cnt, const u32 digests_cnt, const u32 digests_offset, const u32 combs_mode, const u32 gid_max)
{ {
/** /**
* base * base
@ -509,10 +333,9 @@ __kernel void m12900_comp (__global pw_t *pws, __global const kernel_rule_t *rul
w3[2] = 0; w3[2] = 0;
w3[3] = 0; w3[3] = 0;
u32 ipad[8]; sha256_hmac_ctx_t ctx;
u32 opad[8];
hmac_sha256_pad (w0, w1, w2, w3, ipad, opad); sha256_hmac_init (&ctx, w0, w1, w2, w3);
w0[0] = salt_bufs[salt_pos].salt_buf[ 4]; w0[0] = salt_bufs[salt_pos].salt_buf[ 4];
w0[1] = salt_bufs[salt_pos].salt_buf[ 5]; w0[1] = salt_bufs[salt_pos].salt_buf[ 5];
@ -522,23 +345,23 @@ __kernel void m12900_comp (__global pw_t *pws, __global const kernel_rule_t *rul
w1[1] = salt_bufs[salt_pos].salt_buf[ 9]; w1[1] = salt_bufs[salt_pos].salt_buf[ 9];
w1[2] = salt_bufs[salt_pos].salt_buf[10]; w1[2] = salt_bufs[salt_pos].salt_buf[10];
w1[3] = salt_bufs[salt_pos].salt_buf[11]; w1[3] = salt_bufs[salt_pos].salt_buf[11];
w2[0] = 0x80000000; w2[0] = 0;
w2[1] = 0; w2[1] = 0;
w2[2] = 0; w2[2] = 0;
w2[3] = 0; w2[3] = 0;
w3[0] = 0; w3[0] = 0;
w3[1] = 0; w3[1] = 0;
w3[2] = 0; w3[2] = 0;
w3[3] = (64 + 32) * 8; w3[3] = 0;
u32 digest[8]; sha256_hmac_update_64 (&ctx, w0, w1, w2, w3, 32);
hmac_sha256_run (w0, w1, w2, w3, ipad, opad, digest); sha256_hmac_final (&ctx);
const u32 r0 = digest[0]; const u32 r0 = ctx.opad.h[0];
const u32 r1 = digest[1]; const u32 r1 = ctx.opad.h[1];
const u32 r2 = digest[2]; const u32 r2 = ctx.opad.h[2];
const u32 r3 = digest[3]; const u32 r3 = ctx.opad.h[3];
#define il_pos 0 #define il_pos 0

5
src/interface.c
View File

@ -23512,7 +23512,8 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
hashconfig->kern_type = KERN_TYPE_ANDROIDFDE_SAMSUNG; hashconfig->kern_type = KERN_TYPE_ANDROIDFDE_SAMSUNG;
hashconfig->dgst_size = DGST_SIZE_4_8; hashconfig->dgst_size = DGST_SIZE_4_8;
hashconfig->parse_func = androidfde_samsung_parse_hash; hashconfig->parse_func = androidfde_samsung_parse_hash;
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE; hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
hashconfig->dgst_pos0 = 0; hashconfig->dgst_pos0 = 0;
hashconfig->dgst_pos1 = 1; hashconfig->dgst_pos1 = 1;
hashconfig->dgst_pos2 = 2; hashconfig->dgst_pos2 = 2;
@ -24757,6 +24758,8 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
break; break;
case 12700: hashconfig->pw_max = 64; // PBKDF2-HMAC-SHA1 max case 12700: hashconfig->pw_max = 64; // PBKDF2-HMAC-SHA1 max
break; break;
case 12900: hashconfig->pw_max = 64; // PBKDF2-HMAC-SHA256 max
break;
case 13711: hashconfig->pw_max = 64; // PBKDF2-HMAC-RipeMD160 max case 13711: hashconfig->pw_max = 64; // PBKDF2-HMAC-RipeMD160 max
break; break;
case 13712: hashconfig->pw_max = 64; // PBKDF2-HMAC-RipeMD160 max case 13712: hashconfig->pw_max = 64; // PBKDF2-HMAC-RipeMD160 max