mirror of
https://github.com/hashcat/hashcat.git
synced 2024-12-22 14:48:12 +00:00
Added hash-mode: MetaMask Mobile Wallet, updated extraction tool
This commit is contained in:
parent
9b96649672
commit
1d4d84d19c
451
OpenCL/m31900-pure.cl
Normal file
451
OpenCL/m31900-pure.cl
Normal file
@ -0,0 +1,451 @@
|
||||
/**
|
||||
* Author......: See docs/credits.txt
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#define NEW_SIMD_CODE
|
||||
|
||||
#ifdef KERNEL_STATIC
|
||||
#include M2S(INCLUDE_PATH/inc_vendor.h)
|
||||
#include M2S(INCLUDE_PATH/inc_types.h)
|
||||
#include M2S(INCLUDE_PATH/inc_platform.cl)
|
||||
#include M2S(INCLUDE_PATH/inc_common.cl)
|
||||
#include M2S(INCLUDE_PATH/inc_simd.cl)
|
||||
#include M2S(INCLUDE_PATH/inc_hash_sha512.cl)
|
||||
#include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
|
||||
#endif
|
||||
|
||||
#define COMPARE_S M2S(INCLUDE_PATH/inc_comp_single.cl)
|
||||
#define COMPARE_M M2S(INCLUDE_PATH/inc_comp_multi.cl)
|
||||
|
||||
typedef struct pbkdf2_sha512_tmp
|
||||
{
|
||||
u64 ipad[8];
|
||||
u64 opad[8];
|
||||
|
||||
u64 dgst[32];
|
||||
u64 out[32];
|
||||
|
||||
} pbkdf2_sha512_tmp_t;
|
||||
|
||||
typedef struct pbkdf2_sha512_aes_cbc
|
||||
{
|
||||
u32 salt_buf[64];
|
||||
u32 iv_buf[4];
|
||||
u32 iv_len;
|
||||
u32 ct_buf[4];
|
||||
u32 ct_len;
|
||||
|
||||
} pbkdf2_sha512_aes_cbc_t;
|
||||
|
||||
DECLSPEC void hmac_sha512_run_V (PRIVATE_AS u32x *w0, PRIVATE_AS u32x *w1, PRIVATE_AS u32x *w2, PRIVATE_AS u32x *w3, PRIVATE_AS u32x *w4, PRIVATE_AS u32x *w5, PRIVATE_AS u32x *w6, PRIVATE_AS u32x *w7, PRIVATE_AS u64x *ipad, PRIVATE_AS u64x *opad, PRIVATE_AS u64x *digest)
|
||||
{
|
||||
digest[0] = ipad[0];
|
||||
digest[1] = ipad[1];
|
||||
digest[2] = ipad[2];
|
||||
digest[3] = ipad[3];
|
||||
digest[4] = ipad[4];
|
||||
digest[5] = ipad[5];
|
||||
digest[6] = ipad[6];
|
||||
digest[7] = ipad[7];
|
||||
|
||||
sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest);
|
||||
|
||||
w0[0] = h32_from_64 (digest[0]);
|
||||
w0[1] = l32_from_64 (digest[0]);
|
||||
w0[2] = h32_from_64 (digest[1]);
|
||||
w0[3] = l32_from_64 (digest[1]);
|
||||
w1[0] = h32_from_64 (digest[2]);
|
||||
w1[1] = l32_from_64 (digest[2]);
|
||||
w1[2] = h32_from_64 (digest[3]);
|
||||
w1[3] = l32_from_64 (digest[3]);
|
||||
w2[0] = h32_from_64 (digest[4]);
|
||||
w2[1] = l32_from_64 (digest[4]);
|
||||
w2[2] = h32_from_64 (digest[5]);
|
||||
w2[3] = l32_from_64 (digest[5]);
|
||||
w3[0] = h32_from_64 (digest[6]);
|
||||
w3[1] = l32_from_64 (digest[6]);
|
||||
w3[2] = h32_from_64 (digest[7]);
|
||||
w3[3] = l32_from_64 (digest[7]);
|
||||
w4[0] = 0x80000000;
|
||||
w4[1] = 0;
|
||||
w4[2] = 0;
|
||||
w4[3] = 0;
|
||||
w5[0] = 0;
|
||||
w5[1] = 0;
|
||||
w5[2] = 0;
|
||||
w5[3] = 0;
|
||||
w6[0] = 0;
|
||||
w6[1] = 0;
|
||||
w6[2] = 0;
|
||||
w6[3] = 0;
|
||||
w7[0] = 0;
|
||||
w7[1] = 0;
|
||||
w7[2] = 0;
|
||||
w7[3] = (128 + 64) * 8;
|
||||
|
||||
digest[0] = opad[0];
|
||||
digest[1] = opad[1];
|
||||
digest[2] = opad[2];
|
||||
digest[3] = opad[3];
|
||||
digest[4] = opad[4];
|
||||
digest[5] = opad[5];
|
||||
digest[6] = opad[6];
|
||||
digest[7] = opad[7];
|
||||
|
||||
sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest);
|
||||
}
|
||||
|
||||
KERNEL_FQ void m31900_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_aes_cbc_t))
|
||||
{
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
|
||||
const u64 gid = get_global_id (0);
|
||||
|
||||
if (gid >= GID_CNT) return;
|
||||
|
||||
sha512_hmac_ctx_t sha512_hmac_ctx;
|
||||
|
||||
sha512_hmac_init_global_swap (&sha512_hmac_ctx, pws[gid].i, pws[gid].pw_len);
|
||||
|
||||
tmps[gid].ipad[0] = sha512_hmac_ctx.ipad.h[0];
|
||||
tmps[gid].ipad[1] = sha512_hmac_ctx.ipad.h[1];
|
||||
tmps[gid].ipad[2] = sha512_hmac_ctx.ipad.h[2];
|
||||
tmps[gid].ipad[3] = sha512_hmac_ctx.ipad.h[3];
|
||||
tmps[gid].ipad[4] = sha512_hmac_ctx.ipad.h[4];
|
||||
tmps[gid].ipad[5] = sha512_hmac_ctx.ipad.h[5];
|
||||
tmps[gid].ipad[6] = sha512_hmac_ctx.ipad.h[6];
|
||||
tmps[gid].ipad[7] = sha512_hmac_ctx.ipad.h[7];
|
||||
|
||||
tmps[gid].opad[0] = sha512_hmac_ctx.opad.h[0];
|
||||
tmps[gid].opad[1] = sha512_hmac_ctx.opad.h[1];
|
||||
tmps[gid].opad[2] = sha512_hmac_ctx.opad.h[2];
|
||||
tmps[gid].opad[3] = sha512_hmac_ctx.opad.h[3];
|
||||
tmps[gid].opad[4] = sha512_hmac_ctx.opad.h[4];
|
||||
tmps[gid].opad[5] = sha512_hmac_ctx.opad.h[5];
|
||||
tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6];
|
||||
tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7];
|
||||
|
||||
sha512_hmac_update_global_swap (&sha512_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt_buf, salt_bufs[SALT_POS_HOST].salt_len);
|
||||
|
||||
for (u32 i = 0, j = 1; i < 8; i += 8, j += 1)
|
||||
{
|
||||
sha512_hmac_ctx_t sha512_hmac_ctx2 = sha512_hmac_ctx;
|
||||
|
||||
u32 w0[4];
|
||||
u32 w1[4];
|
||||
u32 w2[4];
|
||||
u32 w3[4];
|
||||
u32 w4[4];
|
||||
u32 w5[4];
|
||||
u32 w6[4];
|
||||
u32 w7[4];
|
||||
|
||||
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;
|
||||
w4[0] = 0;
|
||||
w4[1] = 0;
|
||||
w4[2] = 0;
|
||||
w4[3] = 0;
|
||||
w5[0] = 0;
|
||||
w5[1] = 0;
|
||||
w5[2] = 0;
|
||||
w5[3] = 0;
|
||||
w6[0] = 0;
|
||||
w6[1] = 0;
|
||||
w6[2] = 0;
|
||||
w6[3] = 0;
|
||||
w7[0] = 0;
|
||||
w7[1] = 0;
|
||||
w7[2] = 0;
|
||||
w7[3] = 0;
|
||||
|
||||
sha512_hmac_update_128 (&sha512_hmac_ctx2, w0, w1, w2, w3, w4, w5, w6, w7, 4);
|
||||
|
||||
sha512_hmac_final (&sha512_hmac_ctx2);
|
||||
|
||||
tmps[gid].dgst[i + 0] = sha512_hmac_ctx2.opad.h[0];
|
||||
tmps[gid].dgst[i + 1] = sha512_hmac_ctx2.opad.h[1];
|
||||
tmps[gid].dgst[i + 2] = sha512_hmac_ctx2.opad.h[2];
|
||||
tmps[gid].dgst[i + 3] = sha512_hmac_ctx2.opad.h[3];
|
||||
tmps[gid].dgst[i + 4] = sha512_hmac_ctx2.opad.h[4];
|
||||
tmps[gid].dgst[i + 5] = sha512_hmac_ctx2.opad.h[5];
|
||||
tmps[gid].dgst[i + 6] = sha512_hmac_ctx2.opad.h[6];
|
||||
tmps[gid].dgst[i + 7] = sha512_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_FQ void m31900_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_aes_cbc_t))
|
||||
{
|
||||
const u64 gid = get_global_id (0);
|
||||
|
||||
if ((gid * VECT_SIZE) >= GID_CNT) return;
|
||||
|
||||
u64x ipad[8];
|
||||
u64x opad[8];
|
||||
|
||||
ipad[0] = pack64v (tmps, ipad, gid, 0);
|
||||
ipad[1] = pack64v (tmps, ipad, gid, 1);
|
||||
ipad[2] = pack64v (tmps, ipad, gid, 2);
|
||||
ipad[3] = pack64v (tmps, ipad, gid, 3);
|
||||
ipad[4] = pack64v (tmps, ipad, gid, 4);
|
||||
ipad[5] = pack64v (tmps, ipad, gid, 5);
|
||||
ipad[6] = pack64v (tmps, ipad, gid, 6);
|
||||
ipad[7] = pack64v (tmps, ipad, gid, 7);
|
||||
|
||||
opad[0] = pack64v (tmps, opad, gid, 0);
|
||||
opad[1] = pack64v (tmps, opad, gid, 1);
|
||||
opad[2] = pack64v (tmps, opad, gid, 2);
|
||||
opad[3] = pack64v (tmps, opad, gid, 3);
|
||||
opad[4] = pack64v (tmps, opad, gid, 4);
|
||||
opad[5] = pack64v (tmps, opad, gid, 5);
|
||||
opad[6] = pack64v (tmps, opad, gid, 6);
|
||||
opad[7] = pack64v (tmps, opad, gid, 7);
|
||||
|
||||
for (u32 i = 0; i < 8; i += 8)
|
||||
{
|
||||
u64x dgst[8];
|
||||
u64x out[8];
|
||||
|
||||
dgst[0] = pack64v (tmps, dgst, gid, i + 0);
|
||||
dgst[1] = pack64v (tmps, dgst, gid, i + 1);
|
||||
dgst[2] = pack64v (tmps, dgst, gid, i + 2);
|
||||
dgst[3] = pack64v (tmps, dgst, gid, i + 3);
|
||||
dgst[4] = pack64v (tmps, dgst, gid, i + 4);
|
||||
dgst[5] = pack64v (tmps, dgst, gid, i + 5);
|
||||
dgst[6] = pack64v (tmps, dgst, gid, i + 6);
|
||||
dgst[7] = pack64v (tmps, dgst, gid, i + 7);
|
||||
|
||||
out[0] = pack64v (tmps, out, gid, i + 0);
|
||||
out[1] = pack64v (tmps, out, gid, i + 1);
|
||||
out[2] = pack64v (tmps, out, gid, i + 2);
|
||||
out[3] = pack64v (tmps, out, gid, i + 3);
|
||||
out[4] = pack64v (tmps, out, gid, i + 4);
|
||||
out[5] = pack64v (tmps, out, gid, i + 5);
|
||||
out[6] = pack64v (tmps, out, gid, i + 6);
|
||||
out[7] = pack64v (tmps, out, gid, i + 7);
|
||||
|
||||
for (u32 j = 0; j < LOOP_CNT; j++)
|
||||
{
|
||||
u32x w0[4];
|
||||
u32x w1[4];
|
||||
u32x w2[4];
|
||||
u32x w3[4];
|
||||
u32x w4[4];
|
||||
u32x w5[4];
|
||||
u32x w6[4];
|
||||
u32x w7[4];
|
||||
|
||||
w0[0] = h32_from_64 (dgst[0]);
|
||||
w0[1] = l32_from_64 (dgst[0]);
|
||||
w0[2] = h32_from_64 (dgst[1]);
|
||||
w0[3] = l32_from_64 (dgst[1]);
|
||||
w1[0] = h32_from_64 (dgst[2]);
|
||||
w1[1] = l32_from_64 (dgst[2]);
|
||||
w1[2] = h32_from_64 (dgst[3]);
|
||||
w1[3] = l32_from_64 (dgst[3]);
|
||||
w2[0] = h32_from_64 (dgst[4]);
|
||||
w2[1] = l32_from_64 (dgst[4]);
|
||||
w2[2] = h32_from_64 (dgst[5]);
|
||||
w2[3] = l32_from_64 (dgst[5]);
|
||||
w3[0] = h32_from_64 (dgst[6]);
|
||||
w3[1] = l32_from_64 (dgst[6]);
|
||||
w3[2] = h32_from_64 (dgst[7]);
|
||||
w3[3] = l32_from_64 (dgst[7]);
|
||||
w4[0] = 0x80000000;
|
||||
w4[1] = 0;
|
||||
w4[2] = 0;
|
||||
w4[3] = 0;
|
||||
w5[0] = 0;
|
||||
w5[1] = 0;
|
||||
w5[2] = 0;
|
||||
w5[3] = 0;
|
||||
w6[0] = 0;
|
||||
w6[1] = 0;
|
||||
w6[2] = 0;
|
||||
w6[3] = 0;
|
||||
w7[0] = 0;
|
||||
w7[1] = 0;
|
||||
w7[2] = 0;
|
||||
w7[3] = (128 + 64) * 8;
|
||||
|
||||
hmac_sha512_run_V (w0, w1, w2, w3, w4, w5, w6, w7, ipad, opad, dgst);
|
||||
|
||||
out[0] ^= dgst[0];
|
||||
out[1] ^= dgst[1];
|
||||
out[2] ^= dgst[2];
|
||||
out[3] ^= dgst[3];
|
||||
out[4] ^= dgst[4];
|
||||
out[5] ^= dgst[5];
|
||||
out[6] ^= dgst[6];
|
||||
out[7] ^= dgst[7];
|
||||
}
|
||||
|
||||
unpack64v (tmps, dgst, gid, i + 0, dgst[0]);
|
||||
unpack64v (tmps, dgst, gid, i + 1, dgst[1]);
|
||||
unpack64v (tmps, dgst, gid, i + 2, dgst[2]);
|
||||
unpack64v (tmps, dgst, gid, i + 3, dgst[3]);
|
||||
unpack64v (tmps, dgst, gid, i + 4, dgst[4]);
|
||||
unpack64v (tmps, dgst, gid, i + 5, dgst[5]);
|
||||
unpack64v (tmps, dgst, gid, i + 6, dgst[6]);
|
||||
unpack64v (tmps, dgst, gid, i + 7, dgst[7]);
|
||||
|
||||
unpack64v (tmps, out, gid, i + 0, out[0]);
|
||||
unpack64v (tmps, out, gid, i + 1, out[1]);
|
||||
unpack64v (tmps, out, gid, i + 2, out[2]);
|
||||
unpack64v (tmps, out, gid, i + 3, out[3]);
|
||||
unpack64v (tmps, out, gid, i + 4, out[4]);
|
||||
unpack64v (tmps, out, gid, i + 5, out[5]);
|
||||
unpack64v (tmps, out, gid, i + 6, out[6]);
|
||||
unpack64v (tmps, out, gid, i + 7, out[7]);
|
||||
}
|
||||
}
|
||||
|
||||
KERNEL_FQ void m31900_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha512_tmp_t, pbkdf2_sha512_aes_cbc_t))
|
||||
{
|
||||
const u64 gid = get_global_id (0);
|
||||
const u64 lid = get_local_id (0);
|
||||
const u64 lsz = get_local_size (0);
|
||||
|
||||
/**
|
||||
* aes shared
|
||||
*/
|
||||
|
||||
#ifdef REAL_SHM
|
||||
|
||||
LOCAL_VK u32 s_td0[256];
|
||||
LOCAL_VK u32 s_td1[256];
|
||||
LOCAL_VK u32 s_td2[256];
|
||||
LOCAL_VK u32 s_td3[256];
|
||||
LOCAL_VK u32 s_td4[256];
|
||||
|
||||
LOCAL_VK u32 s_te0[256];
|
||||
LOCAL_VK u32 s_te1[256];
|
||||
LOCAL_VK u32 s_te2[256];
|
||||
LOCAL_VK u32 s_te3[256];
|
||||
LOCAL_VK u32 s_te4[256];
|
||||
|
||||
for (u32 i = lid; i < 256; i += lsz)
|
||||
{
|
||||
s_td0[i] = td0[i];
|
||||
s_td1[i] = td1[i];
|
||||
s_td2[i] = td2[i];
|
||||
s_td3[i] = td3[i];
|
||||
s_td4[i] = td4[i];
|
||||
|
||||
s_te0[i] = te0[i];
|
||||
s_te1[i] = te1[i];
|
||||
s_te2[i] = te2[i];
|
||||
s_te3[i] = te3[i];
|
||||
s_te4[i] = te4[i];
|
||||
}
|
||||
|
||||
SYNC_THREADS ();
|
||||
|
||||
#else
|
||||
|
||||
CONSTANT_AS u32a *s_td0 = td0;
|
||||
CONSTANT_AS u32a *s_td1 = td1;
|
||||
CONSTANT_AS u32a *s_td2 = td2;
|
||||
CONSTANT_AS u32a *s_td3 = td3;
|
||||
CONSTANT_AS u32a *s_td4 = td4;
|
||||
|
||||
CONSTANT_AS u32a *s_te0 = te0;
|
||||
CONSTANT_AS u32a *s_te1 = te1;
|
||||
CONSTANT_AS u32a *s_te2 = te2;
|
||||
CONSTANT_AS u32a *s_te3 = te3;
|
||||
CONSTANT_AS u32a *s_te4 = te4;
|
||||
|
||||
#endif
|
||||
|
||||
if (gid >= GID_CNT) return;
|
||||
|
||||
// keys
|
||||
|
||||
u32 ukey[8];
|
||||
|
||||
ukey[0] = h32_from_64_S (tmps[gid].out[0]);
|
||||
ukey[1] = l32_from_64_S (tmps[gid].out[0]);
|
||||
ukey[2] = h32_from_64_S (tmps[gid].out[1]);
|
||||
ukey[3] = l32_from_64_S (tmps[gid].out[1]);
|
||||
ukey[4] = h32_from_64_S (tmps[gid].out[2]);
|
||||
ukey[5] = l32_from_64_S (tmps[gid].out[2]);
|
||||
ukey[6] = h32_from_64_S (tmps[gid].out[3]);
|
||||
ukey[7] = l32_from_64_S (tmps[gid].out[3]);
|
||||
|
||||
u32 ks[60];
|
||||
|
||||
AES256_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3);
|
||||
|
||||
// iv
|
||||
|
||||
u32 iv_buf[4];
|
||||
|
||||
iv_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0];
|
||||
iv_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1];
|
||||
iv_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2];
|
||||
iv_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3];
|
||||
|
||||
// ct
|
||||
|
||||
u32 ct_buf[4];
|
||||
|
||||
ct_buf[0] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0];
|
||||
ct_buf[1] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1];
|
||||
ct_buf[2] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2];
|
||||
ct_buf[3] = esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3];
|
||||
|
||||
// decrypt first block
|
||||
|
||||
u32 pt_buf[4] = { 0 };
|
||||
|
||||
AES256_decrypt (ks, ct_buf, pt_buf, s_td0, s_td1, s_td2, s_td3, s_td4);
|
||||
|
||||
pt_buf[0] ^= iv_buf[0];
|
||||
pt_buf[1] ^= iv_buf[1];
|
||||
pt_buf[2] ^= iv_buf[2];
|
||||
pt_buf[3] ^= iv_buf[3];
|
||||
|
||||
const int correct = is_valid_printable_32 (pt_buf[0])
|
||||
+ is_valid_printable_32 (pt_buf[1])
|
||||
+ is_valid_printable_32 (pt_buf[2])
|
||||
+ is_valid_printable_32 (pt_buf[3]);
|
||||
|
||||
if (correct != 4) return;
|
||||
|
||||
const u32 r0 = ct_buf[0];
|
||||
const u32 r1 = ct_buf[1];
|
||||
const u32 r2 = ct_buf[2];
|
||||
const u32 r3 = ct_buf[3];
|
||||
|
||||
#define il_pos 0
|
||||
|
||||
#ifdef KERNEL_STATIC
|
||||
#include COMPARE_M
|
||||
#endif
|
||||
}
|
@ -20,6 +20,7 @@
|
||||
- Added hash-mode: GPG (AES-128/AES-256 (SHA-1($pass)))
|
||||
- Added hash-mode: GPG (AES-128/AES-256 (SHA-256($pass)))
|
||||
- Added hash-mode: GPG (AES-128/AES-256 (SHA-512($pass)))
|
||||
- Added hash-mode: MetaMask Mobile Wallet
|
||||
- Added hash-mode: MetaMask Wallet (short hash, plaintext check)
|
||||
- Added hash-mode: SecureCRT MasterPassphrase v2
|
||||
- Added hash-mode: Veeam VB
|
||||
@ -62,6 +63,7 @@
|
||||
- Scrypt: Increase buffer sizes in module for hash mode 8900 to allow longer scrypt digests
|
||||
- Unicode: Update UTF-8 to UTF-16 conversion to match RFC 3629
|
||||
- User Options: Added error message when mixing --username and --show to warn users of exponential delay
|
||||
- MetaMask: update extraction tool to support MetaMask Mobile wallets
|
||||
|
||||
* changes v6.2.5 -> v6.2.6
|
||||
|
||||
|
356
src/modules/module_31900.c
Normal file
356
src/modules/module_31900.c
Normal file
@ -0,0 +1,356 @@
|
||||
/**
|
||||
* Author......: See docs/credits.txt
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include "types.h"
|
||||
#include "modules.h"
|
||||
#include "bitops.h"
|
||||
#include "convert.h"
|
||||
#include "shared.h"
|
||||
#include "memory.h"
|
||||
|
||||
static const u32 ATTACK_EXEC = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||
static const u32 DGST_POS0 = 0;
|
||||
static const u32 DGST_POS1 = 1;
|
||||
static const u32 DGST_POS2 = 2;
|
||||
static const u32 DGST_POS3 = 3;
|
||||
static const u32 DGST_SIZE = DGST_SIZE_4_4;
|
||||
static const u32 HASH_CATEGORY = HASH_CATEGORY_CRYPTOCURRENCY_WALLET;
|
||||
static const char *HASH_NAME = "MetaMask Mobile Wallet";
|
||||
static const u64 KERN_TYPE = 31900;
|
||||
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
||||
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||
static const u64 OPTS_TYPE = OPTS_TYPE_STOCK_MODULE
|
||||
| OPTS_TYPE_PT_GENERATE_LE;
|
||||
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
||||
static const char *ST_PASS = "hashcat1";
|
||||
static const char *ST_HASH = "$metamaskMobile$MjU1NTA5MTU2ODY5MjY4OQ==$3cccb51c401e54abc82987fd9310a8d3$WQhIECN0blOaV31RC3lKfQ==";
|
||||
|
||||
u32 module_attack_exec (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ATTACK_EXEC; }
|
||||
u32 module_dgst_pos0 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS0; }
|
||||
u32 module_dgst_pos1 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS1; }
|
||||
u32 module_dgst_pos2 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS2; }
|
||||
u32 module_dgst_pos3 (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_POS3; }
|
||||
u32 module_dgst_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return DGST_SIZE; }
|
||||
u32 module_hash_category (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_CATEGORY; }
|
||||
const char *module_hash_name (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return HASH_NAME; }
|
||||
u64 module_kern_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return KERN_TYPE; }
|
||||
u32 module_opti_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTI_TYPE; }
|
||||
u64 module_opts_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return OPTS_TYPE; }
|
||||
u32 module_salt_type (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return SALT_TYPE; }
|
||||
const char *module_st_hash (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_HASH; }
|
||||
const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra) { return ST_PASS; }
|
||||
|
||||
typedef struct pbkdf2_sha512_tmp
|
||||
{
|
||||
u64 ipad[8];
|
||||
u64 opad[8];
|
||||
|
||||
u64 dgst[32];
|
||||
u64 out[32];
|
||||
|
||||
} pbkdf2_sha512_tmp_t;
|
||||
|
||||
typedef struct pbkdf2_sha512_aes_cbc
|
||||
{
|
||||
u32 salt_buf[64];
|
||||
u32 iv_buf[4];
|
||||
u32 iv_len;
|
||||
u32 ct_buf[4];
|
||||
u32 ct_len;
|
||||
|
||||
} pbkdf2_sha512_aes_cbc_t;
|
||||
|
||||
static const char *SIGNATURE_METAMASK_WALLET = "$metamaskMobile$";
|
||||
|
||||
char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra, MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED const hc_device_param_t *device_param)
|
||||
{
|
||||
char *jit_build_options = NULL;
|
||||
|
||||
// Extra treatment for Apple systems
|
||||
if (device_param->opencl_platform_vendor_id == VENDOR_ID_APPLE)
|
||||
{
|
||||
return jit_build_options;
|
||||
}
|
||||
|
||||
// HIP
|
||||
if (device_param->opencl_device_vendor_id == VENDOR_ID_AMD_USE_HIP)
|
||||
{
|
||||
hc_asprintf (&jit_build_options, "-D _unroll");
|
||||
}
|
||||
|
||||
// ROCM
|
||||
if ((device_param->opencl_device_vendor_id == VENDOR_ID_AMD) && (device_param->has_vperm == true))
|
||||
{
|
||||
hc_asprintf (&jit_build_options, "-D _unroll");
|
||||
}
|
||||
|
||||
return jit_build_options;
|
||||
}
|
||||
|
||||
u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
||||
{
|
||||
const u64 esalt_size = (const u64) sizeof (pbkdf2_sha512_aes_cbc_t);
|
||||
|
||||
return esalt_size;
|
||||
}
|
||||
|
||||
u64 module_tmp_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
||||
{
|
||||
const u64 tmp_size = (const u64) sizeof (pbkdf2_sha512_tmp_t);
|
||||
|
||||
return tmp_size;
|
||||
}
|
||||
|
||||
u32 module_pw_min (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
||||
{
|
||||
const u32 pw_min = 8;
|
||||
|
||||
return pw_min;
|
||||
}
|
||||
|
||||
u32 module_pw_max (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
||||
{
|
||||
// this overrides the reductions of PW_MAX in case optimized kernel is selected
|
||||
// IOW, even in optimized kernel mode it support length 256
|
||||
|
||||
const u32 pw_max = PW_MAX;
|
||||
|
||||
return pw_max;
|
||||
}
|
||||
|
||||
int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED void *digest_buf, MAYBE_UNUSED salt_t *salt, MAYBE_UNUSED void *esalt_buf, MAYBE_UNUSED void *hook_salt_buf, MAYBE_UNUSED hashinfo_t *hash_info, const char *line_buf, MAYBE_UNUSED const int line_len)
|
||||
{
|
||||
u32 *digest = (u32 *) digest_buf;
|
||||
|
||||
pbkdf2_sha512_aes_cbc_t *metamask = (pbkdf2_sha512_aes_cbc_t *) esalt_buf;
|
||||
|
||||
#define CT_MAX_LEN_BASE64 ((3136 * 8) / 6) + 3
|
||||
|
||||
hc_token_t token;
|
||||
|
||||
token.token_cnt = 4;
|
||||
|
||||
token.signatures_cnt = 1;
|
||||
token.signatures_buf[0] = SIGNATURE_METAMASK_WALLET;
|
||||
|
||||
token.len[0] = strlen (SIGNATURE_METAMASK_WALLET);
|
||||
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_SIGNATURE;
|
||||
|
||||
token.sep[1] = '$';
|
||||
token.len_min[1] = 24;
|
||||
token.len_max[1] = 24;
|
||||
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_BASE64A;
|
||||
|
||||
token.sep[2] = '$';
|
||||
token.len_min[2] = 32;
|
||||
token.len_max[2] = 32;
|
||||
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_HEX;
|
||||
|
||||
token.sep[3] = '$';
|
||||
token.len_min[3] = 24;
|
||||
token.len_max[3] = 24;
|
||||
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH
|
||||
| TOKEN_ATTR_VERIFY_BASE64A;
|
||||
|
||||
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
|
||||
|
||||
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
|
||||
|
||||
size_t tmp_len = 0;
|
||||
|
||||
// iter
|
||||
|
||||
salt->salt_iter = 5000 - 1;
|
||||
|
||||
// salt
|
||||
|
||||
const u8 *salt_pos = token.buf[1];
|
||||
const int salt_len = token.len[1];
|
||||
|
||||
memcpy ((u8 *) metamask->salt_buf, salt_pos, salt_len);
|
||||
|
||||
salt->salt_len = salt_len;
|
||||
|
||||
memcpy ((u8 *) salt->salt_buf, metamask->salt_buf, salt->salt_len);
|
||||
|
||||
// iv
|
||||
|
||||
const u8 *iv_pos = token.buf[2];
|
||||
const int iv_len = token.len[2] / 2;
|
||||
|
||||
metamask->iv_buf[0] = hex_to_u32 (iv_pos + 0);
|
||||
metamask->iv_buf[1] = hex_to_u32 (iv_pos + 8);
|
||||
metamask->iv_buf[2] = hex_to_u32 (iv_pos + 16);
|
||||
metamask->iv_buf[3] = hex_to_u32 (iv_pos + 24);
|
||||
|
||||
metamask->iv_buf[0] = byte_swap_32 (metamask->iv_buf[0]);
|
||||
metamask->iv_buf[1] = byte_swap_32 (metamask->iv_buf[1]);
|
||||
metamask->iv_buf[2] = byte_swap_32 (metamask->iv_buf[2]);
|
||||
metamask->iv_buf[3] = byte_swap_32 (metamask->iv_buf[3]);
|
||||
|
||||
metamask->iv_len = iv_len;
|
||||
|
||||
// ciphertext
|
||||
|
||||
const u8 *ct_pos = token.buf[3];
|
||||
const int ct_len = token.len[3];
|
||||
|
||||
u8 tmp_buf[24+1];
|
||||
|
||||
memset (tmp_buf, 0, sizeof (tmp_buf));
|
||||
|
||||
tmp_len = base64_decode (base64_to_int, ct_pos, ct_len, tmp_buf);
|
||||
|
||||
if (tmp_len != 16) return (PARSER_CT_LENGTH);
|
||||
|
||||
memcpy ((u8 *) metamask->ct_buf, tmp_buf, tmp_len);
|
||||
|
||||
metamask->ct_buf[0] = byte_swap_32 (metamask->ct_buf[0]);
|
||||
metamask->ct_buf[1] = byte_swap_32 (metamask->ct_buf[1]);
|
||||
metamask->ct_buf[2] = byte_swap_32 (metamask->ct_buf[2]);
|
||||
metamask->ct_buf[3] = byte_swap_32 (metamask->ct_buf[3]);
|
||||
|
||||
metamask->ct_len = tmp_len / 4;
|
||||
|
||||
// digest
|
||||
|
||||
digest[0] = metamask->ct_buf[0];
|
||||
digest[1] = metamask->ct_buf[1];
|
||||
digest[2] = metamask->ct_buf[2];
|
||||
digest[3] = metamask->ct_buf[3];
|
||||
|
||||
return (PARSER_OK);
|
||||
}
|
||||
|
||||
int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size)
|
||||
{
|
||||
const u32 *digest = (const u32 *) digest_buf;
|
||||
|
||||
pbkdf2_sha512_aes_cbc_t *metamask = (pbkdf2_sha512_aes_cbc_t *) esalt_buf;
|
||||
|
||||
// salt
|
||||
|
||||
u8 *salt_buf = (u8 *) salt->salt_buf;
|
||||
|
||||
// iv
|
||||
|
||||
u8 iv_buf[32+1];
|
||||
|
||||
memset (iv_buf, 0, sizeof (iv_buf));
|
||||
|
||||
u32_to_hex (byte_swap_32 (metamask->iv_buf[0]), iv_buf + 0);
|
||||
u32_to_hex (byte_swap_32 (metamask->iv_buf[1]), iv_buf + 8);
|
||||
u32_to_hex (byte_swap_32 (metamask->iv_buf[2]), iv_buf + 16);
|
||||
u32_to_hex (byte_swap_32 (metamask->iv_buf[3]), iv_buf + 24);
|
||||
|
||||
// ct
|
||||
|
||||
u32 tmp_buf[4];
|
||||
|
||||
tmp_buf[0] = byte_swap_32 (digest[0]);
|
||||
tmp_buf[1] = byte_swap_32 (digest[1]);
|
||||
tmp_buf[2] = byte_swap_32 (digest[2]);
|
||||
tmp_buf[3] = byte_swap_32 (digest[3]);
|
||||
|
||||
u8 ct_buf[24+1];
|
||||
|
||||
memset (ct_buf, 0, sizeof (ct_buf));
|
||||
|
||||
base64_encode (int_to_base64, (const u8 *) tmp_buf, (const int) metamask->ct_len * 4, ct_buf);
|
||||
|
||||
u8 *out_buf = (u8 *) line_buf;
|
||||
|
||||
int out_len = snprintf ((char *) out_buf, line_size, "%s%s$%s$%s",
|
||||
SIGNATURE_METAMASK_WALLET,
|
||||
salt_buf,
|
||||
iv_buf,
|
||||
ct_buf);
|
||||
|
||||
return out_len;
|
||||
}
|
||||
|
||||
void module_init (module_ctx_t *module_ctx)
|
||||
{
|
||||
module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
|
||||
module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
|
||||
|
||||
module_ctx->module_attack_exec = module_attack_exec;
|
||||
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
|
||||
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
|
||||
module_ctx->module_benchmark_mask = MODULE_DEFAULT;
|
||||
module_ctx->module_benchmark_charset = MODULE_DEFAULT;
|
||||
module_ctx->module_benchmark_salt = MODULE_DEFAULT;
|
||||
module_ctx->module_build_plain_postprocess = MODULE_DEFAULT;
|
||||
module_ctx->module_deep_comp_kernel = MODULE_DEFAULT;
|
||||
module_ctx->module_deprecated_notice = MODULE_DEFAULT;
|
||||
module_ctx->module_dgst_pos0 = module_dgst_pos0;
|
||||
module_ctx->module_dgst_pos1 = module_dgst_pos1;
|
||||
module_ctx->module_dgst_pos2 = module_dgst_pos2;
|
||||
module_ctx->module_dgst_pos3 = module_dgst_pos3;
|
||||
module_ctx->module_dgst_size = module_dgst_size;
|
||||
module_ctx->module_dictstat_disable = MODULE_DEFAULT;
|
||||
module_ctx->module_esalt_size = module_esalt_size;
|
||||
module_ctx->module_extra_buffer_size = MODULE_DEFAULT;
|
||||
module_ctx->module_extra_tmp_size = MODULE_DEFAULT;
|
||||
module_ctx->module_extra_tuningdb_block = MODULE_DEFAULT;
|
||||
module_ctx->module_forced_outfile_format = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_binary_count = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_binary_parse = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_binary_save = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_decode_postprocess = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_decode_potfile = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_decode_zero_hash = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_decode = module_hash_decode;
|
||||
module_ctx->module_hash_encode_status = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_encode_potfile = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_encode = module_hash_encode;
|
||||
module_ctx->module_hash_init_selftest = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_mode = MODULE_DEFAULT;
|
||||
module_ctx->module_hash_category = module_hash_category;
|
||||
module_ctx->module_hash_name = module_hash_name;
|
||||
module_ctx->module_hashes_count_min = MODULE_DEFAULT;
|
||||
module_ctx->module_hashes_count_max = MODULE_DEFAULT;
|
||||
module_ctx->module_hlfmt_disable = MODULE_DEFAULT;
|
||||
module_ctx->module_hook_extra_param_size = MODULE_DEFAULT;
|
||||
module_ctx->module_hook_extra_param_init = MODULE_DEFAULT;
|
||||
module_ctx->module_hook_extra_param_term = MODULE_DEFAULT;
|
||||
module_ctx->module_hook12 = MODULE_DEFAULT;
|
||||
module_ctx->module_hook23 = MODULE_DEFAULT;
|
||||
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
|
||||
module_ctx->module_hook_size = MODULE_DEFAULT;
|
||||
module_ctx->module_jit_build_options = module_jit_build_options;
|
||||
module_ctx->module_jit_cache_disable = MODULE_DEFAULT;
|
||||
module_ctx->module_kernel_accel_max = MODULE_DEFAULT;
|
||||
module_ctx->module_kernel_accel_min = MODULE_DEFAULT;
|
||||
module_ctx->module_kernel_loops_max = MODULE_DEFAULT;
|
||||
module_ctx->module_kernel_loops_min = MODULE_DEFAULT;
|
||||
module_ctx->module_kernel_threads_max = MODULE_DEFAULT;
|
||||
module_ctx->module_kernel_threads_min = MODULE_DEFAULT;
|
||||
module_ctx->module_kern_type = module_kern_type;
|
||||
module_ctx->module_kern_type_dynamic = MODULE_DEFAULT;
|
||||
module_ctx->module_opti_type = module_opti_type;
|
||||
module_ctx->module_opts_type = module_opts_type;
|
||||
module_ctx->module_outfile_check_disable = MODULE_DEFAULT;
|
||||
module_ctx->module_outfile_check_nocomp = MODULE_DEFAULT;
|
||||
module_ctx->module_potfile_custom_check = MODULE_DEFAULT;
|
||||
module_ctx->module_potfile_disable = MODULE_DEFAULT;
|
||||
module_ctx->module_potfile_keep_all_hashes = MODULE_DEFAULT;
|
||||
module_ctx->module_pwdump_column = MODULE_DEFAULT;
|
||||
module_ctx->module_pw_max = module_pw_max;
|
||||
module_ctx->module_pw_min = module_pw_min;
|
||||
module_ctx->module_salt_max = MODULE_DEFAULT;
|
||||
module_ctx->module_salt_min = MODULE_DEFAULT;
|
||||
module_ctx->module_salt_type = module_salt_type;
|
||||
module_ctx->module_separator = MODULE_DEFAULT;
|
||||
module_ctx->module_st_hash = module_st_hash;
|
||||
module_ctx->module_st_pass = module_st_pass;
|
||||
module_ctx->module_tmp_size = module_tmp_size;
|
||||
module_ctx->module_unstable_warning = MODULE_DEFAULT;
|
||||
module_ctx->module_warmup_disable = MODULE_DEFAULT;
|
||||
}
|
1
tools/2hashcat_tests/metamask2hashcat.android.json
Normal file
1
tools/2hashcat_tests/metamask2hashcat.android.json
Normal file
File diff suppressed because one or more lines are too long
1
tools/2hashcat_tests/metamask2hashcat.ios.json
Normal file
1
tools/2hashcat_tests/metamask2hashcat.ios.json
Normal file
File diff suppressed because one or more lines are too long
@ -2,12 +2,14 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Author: Gabriele 'matrix' Gristina
|
||||
# Version: 1.0
|
||||
# Version: 2.0
|
||||
# Date: Thu 12 Aug 2021 06:44:14 PM CEST
|
||||
# License: MIT
|
||||
|
||||
# Extract metamask vault from browser and save to file, then you can use this tool
|
||||
# reference: https://metamask.zendesk.com/hc/en-us/articles/360018766351-How-to-use-the-Vault-Decryptor-with-the-MetaMask-Vault-Data
|
||||
# From version 2.0 works also for Metamask Mobile
|
||||
# reference: https://github.com/3rdIteration/btcrecover/pull/346
|
||||
|
||||
import json
|
||||
import argparse
|
||||
@ -19,21 +21,58 @@ def metamask_parser(file, shortdata):
|
||||
|
||||
j = json.load(f)
|
||||
|
||||
if 'salt' not in j or 'iv' not in j or 'data' not in j:
|
||||
print("! Invalid vault format ...")
|
||||
parser.print_help()
|
||||
exit(1)
|
||||
isMobile = False
|
||||
|
||||
if((len(j['data']) > 3000) or shortdata):
|
||||
data_bin = base64.b64decode(j['data'])
|
||||
# TODO limit data to 16 bytes, we only check the first block of data, so we don't need more data.
|
||||
# The use of smaller buffers should speedup the attack.
|
||||
# Still the pbkdf 10k iter will be taking the most time by far probably.
|
||||
j['data'] = base64.b64encode(data_bin[0:64]).decode("ascii")
|
||||
|
||||
print('$metamask-short$' + j['salt'] + '$' + j['iv'] + '$' + j['data'])
|
||||
if 'engine' not in j:
|
||||
if 'salt' not in j or 'iv' not in j or 'data' not in j:
|
||||
print("! Invalid vault format ...")
|
||||
parser.print_help()
|
||||
exit(1)
|
||||
else:
|
||||
print('$metamask$' + j['salt'] + '$' + j['iv'] + '$' + j['data'])
|
||||
f.close()
|
||||
wallet_data = open(file, "rb").read().decode("utf-8","ignore").replace("\\","")
|
||||
|
||||
# taken from https://github.com/3rdIteration/btcrecover/blob/master/btcrecover/btcrpass.py#L3096-L3103
|
||||
walletStartText = "vault"
|
||||
wallet_data_start = wallet_data.lower().find(walletStartText)
|
||||
wallet_data_trimmed = wallet_data[wallet_data_start:]
|
||||
wallet_data_start = wallet_data_trimmed.find("cipher")
|
||||
wallet_data_trimmed = wallet_data_trimmed[wallet_data_start - 2:]
|
||||
wallet_data_end = wallet_data_trimmed.find("}")
|
||||
wallet_data = wallet_data_trimmed[:wallet_data_end + 1]
|
||||
wallet_json = json.loads(wallet_data)
|
||||
|
||||
j = json.loads(wallet_data)
|
||||
|
||||
if 'lib' in j and 'original' in j['lib']:
|
||||
isMobile = True
|
||||
else:
|
||||
print("! Invalid vault format ...")
|
||||
parser.print_help()
|
||||
exit(1)
|
||||
|
||||
if isMobile is False:
|
||||
|
||||
if((len(j['data']) > 3000) or shortdata):
|
||||
data_bin = base64.b64decode(j['data'])
|
||||
# TODO limit data to 16 bytes, we only check the first block of data, so we don't need more data.
|
||||
# The use of smaller buffers should speedup the attack.
|
||||
# Still the pbkdf 10k iter will be taking the most time by far probably.
|
||||
j['data'] = base64.b64encode(data_bin[0:64]).decode("ascii")
|
||||
|
||||
print('$metamask-short$' + j['salt'] + '$' + j['iv'] + '$' + j['data'])
|
||||
else:
|
||||
print('$metamask$' + j['salt'] + '$' + j['iv'] + '$' + j['data'])
|
||||
|
||||
else:
|
||||
|
||||
# extract only first 16 bytes of ciphertext
|
||||
|
||||
cipher_bin = base64.b64decode(j['cipher'])
|
||||
j['cipher'] = base64.b64encode(cipher_bin[:16]).decode("ascii")
|
||||
|
||||
print('$metamaskMobile$' + j['salt'] + '$' + j['iv'] + '$' + j['cipher'])
|
||||
|
||||
except ValueError as e:
|
||||
parser.print_help()
|
||||
exit(1)
|
||||
@ -52,4 +91,3 @@ if __name__ == "__main__":
|
||||
else:
|
||||
parser.print_help()
|
||||
exit(1)
|
||||
|
||||
|
91
tools/test_modules/m31900.pm
Normal file
91
tools/test_modules/m31900.pm
Normal file
@ -0,0 +1,91 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
##
|
||||
## Author......: See docs/credits.txt
|
||||
## License.....: MIT
|
||||
##
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use Crypt::PBKDF2;
|
||||
use Crypt::CBC;
|
||||
use MIME::Base64 qw (decode_base64 encode_base64);
|
||||
|
||||
sub module_constraints { [[8, 256], [16, 16], [-1, -1], [-1, -1], [-1, -1]] }
|
||||
|
||||
sub module_generate_hash
|
||||
{
|
||||
my $word = shift;
|
||||
my $salt = shift;
|
||||
my $iv = shift // random_hex_string (32);
|
||||
my $ct = shift;
|
||||
|
||||
my $kdf = Crypt::PBKDF2->new
|
||||
(
|
||||
hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 512),
|
||||
iterations => 5000,
|
||||
output_len => 32
|
||||
);
|
||||
|
||||
my $salt_b64 = encode_base64 ($salt, "");
|
||||
|
||||
my $key = $kdf->PBKDF2 ($salt_b64, $word);
|
||||
|
||||
my $iv_bin = pack ("H*", $iv);
|
||||
|
||||
my $cipher = Crypt::CBC->new ({
|
||||
key => $key,
|
||||
cipher => "Crypt::Rijndael",
|
||||
iv => $iv_bin,
|
||||
literal_key => 1,
|
||||
header => "none",
|
||||
keysize => 32,
|
||||
padding => "none"
|
||||
});
|
||||
|
||||
my $pt = "[{\"type\":\"HD Key Tree\",\"data\":{\"mnemonic\":\"ocean hidden kidney famous rich season gloom husband spring convince attitude boy\",\"numberOfAccounts\":1,\"hdPath\":\"m/44'/60'/0'/0\"}}]";
|
||||
|
||||
my $ct1 = substr ($cipher->encrypt ($pt), 0, 16);
|
||||
|
||||
my $hash = sprintf ('$metamaskMobile$%s$%s$%s', $salt_b64, $iv, encode_base64 ($ct1, ""));
|
||||
|
||||
return $hash;
|
||||
}
|
||||
|
||||
sub module_verify_hash
|
||||
{
|
||||
my $line = shift;
|
||||
|
||||
my $idx = index ($line, ':');
|
||||
|
||||
return unless $idx >= 0;
|
||||
|
||||
my $hash = substr ($line, 0, $idx);
|
||||
my $word = substr ($line, $idx + 1);
|
||||
|
||||
return unless substr ($hash, 0, 16) eq '$metamaskMobile$';
|
||||
|
||||
my (undef, $signature, $salt, $iv, $ct) = split '\$', $hash;
|
||||
|
||||
return unless defined $signature;
|
||||
return unless defined $salt;
|
||||
return unless defined $iv;
|
||||
return unless defined $ct;
|
||||
|
||||
my $salt_b64 = decode_base64 ($salt);
|
||||
my $iv_bin = pack ("H*", $iv);
|
||||
my $ct_bin = decode_base64 ($ct);
|
||||
|
||||
return unless length $salt_b64 == 16;
|
||||
return unless length $iv_bin == 16;
|
||||
return unless length $ct_bin == 16;
|
||||
|
||||
my $word_packed = pack_if_HEX_notation ($word);
|
||||
|
||||
my $new_hash = module_generate_hash ($word_packed, $salt_b64, $iv, unpack ("H*", $ct_bin));
|
||||
|
||||
return ($new_hash, $word);
|
||||
}
|
||||
|
||||
1;
|
Loading…
Reference in New Issue
Block a user