mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 08:08:10 +00:00
Merge pull request #3628 from thatux/m26600_short_data
Implement metamask 26610 short data
This commit is contained in:
Jens Steube
GitHub
commit
ce934be975
416
OpenCL/m26610-pure.cl
Normal file
416
OpenCL/m26610-pure.cl
Normal file
@ -0,0 +1,416 @@
|
|||||||
|
/**
|
||||||
|
* 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_sha256.cl)
|
||||||
|
#include M2S(INCLUDE_PATH/inc_cipher_aes.cl)
|
||||||
|
#include M2S(INCLUDE_PATH/inc_cipher_aes-gcm.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_sha256_tmp
|
||||||
|
{
|
||||||
|
u32 ipad[8];
|
||||||
|
u32 opad[8];
|
||||||
|
|
||||||
|
u32 dgst[32];
|
||||||
|
u32 out[32];
|
||||||
|
|
||||||
|
} pbkdf2_sha256_tmp_t;
|
||||||
|
|
||||||
|
typedef struct pbkdf2_sha256_aes_gcm
|
||||||
|
{
|
||||||
|
u32 salt_buf[64];
|
||||||
|
u32 iv_buf[4];
|
||||||
|
u32 iv_len;
|
||||||
|
u32 ct_buf[784]; // TODO this can be smaller and would speedup the attack, only 64 bytes of ciphertext are allowed
|
||||||
|
u32 ct_len;
|
||||||
|
|
||||||
|
} pbkdf2_sha256_aes_gcm_t;
|
||||||
|
|
||||||
|
DECLSPEC void hmac_sha256_run_V (PRIVATE_AS u32x *w0, PRIVATE_AS u32x *w1, PRIVATE_AS u32x *w2, PRIVATE_AS u32x *w3, PRIVATE_AS u32x *ipad, PRIVATE_AS u32x *opad, PRIVATE_AS u32x *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];
|
||||||
|
|
||||||
|
sha256_transform_vector (w0, w1, w2, w3, digest);
|
||||||
|
|
||||||
|
w0[0] = digest[0];
|
||||||
|
w0[1] = digest[1];
|
||||||
|
w0[2] = digest[2];
|
||||||
|
w0[3] = digest[3];
|
||||||
|
w1[0] = digest[4];
|
||||||
|
w1[1] = digest[5];
|
||||||
|
w1[2] = digest[6];
|
||||||
|
w1[3] = digest[7];
|
||||||
|
w2[0] = 0x80000000;
|
||||||
|
w2[1] = 0;
|
||||||
|
w2[2] = 0;
|
||||||
|
w2[3] = 0;
|
||||||
|
w3[0] = 0;
|
||||||
|
w3[1] = 0;
|
||||||
|
w3[2] = 0;
|
||||||
|
w3[3] = (64 + 32) * 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];
|
||||||
|
|
||||||
|
sha256_transform_vector (w0, w1, w2, w3, digest);
|
||||||
|
}
|
||||||
|
|
||||||
|
KERNEL_FQ void m26610_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_aes_gcm_t))
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* base
|
||||||
|
*/
|
||||||
|
|
||||||
|
const u64 gid = get_global_id (0);
|
||||||
|
|
||||||
|
if (gid >= GID_CNT) return;
|
||||||
|
|
||||||
|
sha256_hmac_ctx_t sha256_hmac_ctx;
|
||||||
|
|
||||||
|
sha256_hmac_init_global_swap (&sha256_hmac_ctx, pws[gid].i, pws[gid].pw_len);
|
||||||
|
|
||||||
|
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];
|
||||||
|
|
||||||
|
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];
|
||||||
|
|
||||||
|
sha256_hmac_update_global_swap (&sha256_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)
|
||||||
|
{
|
||||||
|
sha256_hmac_ctx_t sha256_hmac_ctx2 = sha256_hmac_ctx;
|
||||||
|
|
||||||
|
u32 w0[4];
|
||||||
|
u32 w1[4];
|
||||||
|
u32 w2[4];
|
||||||
|
u32 w3[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;
|
||||||
|
|
||||||
|
sha256_hmac_update_64 (&sha256_hmac_ctx2, w0, w1, w2, w3, 4);
|
||||||
|
|
||||||
|
sha256_hmac_final (&sha256_hmac_ctx2);
|
||||||
|
|
||||||
|
tmps[gid].dgst[i + 0] = sha256_hmac_ctx2.opad.h[0];
|
||||||
|
tmps[gid].dgst[i + 1] = sha256_hmac_ctx2.opad.h[1];
|
||||||
|
tmps[gid].dgst[i + 2] = sha256_hmac_ctx2.opad.h[2];
|
||||||
|
tmps[gid].dgst[i + 3] = sha256_hmac_ctx2.opad.h[3];
|
||||||
|
tmps[gid].dgst[i + 4] = sha256_hmac_ctx2.opad.h[4];
|
||||||
|
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_FQ void m26610_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_aes_gcm_t))
|
||||||
|
{
|
||||||
|
const u64 gid = get_global_id (0);
|
||||||
|
|
||||||
|
if ((gid * VECT_SIZE) >= GID_CNT) return;
|
||||||
|
|
||||||
|
u32x ipad[8];
|
||||||
|
u32x opad[8];
|
||||||
|
|
||||||
|
ipad[0] = packv (tmps, ipad, gid, 0);
|
||||||
|
ipad[1] = packv (tmps, ipad, gid, 1);
|
||||||
|
ipad[2] = packv (tmps, ipad, gid, 2);
|
||||||
|
ipad[3] = packv (tmps, ipad, gid, 3);
|
||||||
|
ipad[4] = packv (tmps, ipad, gid, 4);
|
||||||
|
ipad[5] = packv (tmps, ipad, gid, 5);
|
||||||
|
ipad[6] = packv (tmps, ipad, gid, 6);
|
||||||
|
ipad[7] = packv (tmps, ipad, gid, 7);
|
||||||
|
|
||||||
|
opad[0] = packv (tmps, opad, gid, 0);
|
||||||
|
opad[1] = packv (tmps, opad, gid, 1);
|
||||||
|
opad[2] = packv (tmps, opad, gid, 2);
|
||||||
|
opad[3] = packv (tmps, opad, gid, 3);
|
||||||
|
opad[4] = packv (tmps, opad, gid, 4);
|
||||||
|
opad[5] = packv (tmps, opad, gid, 5);
|
||||||
|
opad[6] = packv (tmps, opad, gid, 6);
|
||||||
|
opad[7] = packv (tmps, opad, gid, 7);
|
||||||
|
|
||||||
|
for (u32 i = 0; i < 8; i += 8)
|
||||||
|
{
|
||||||
|
u32x dgst[8];
|
||||||
|
u32x out[8];
|
||||||
|
|
||||||
|
dgst[0] = packv (tmps, dgst, gid, i + 0);
|
||||||
|
dgst[1] = packv (tmps, dgst, gid, i + 1);
|
||||||
|
dgst[2] = packv (tmps, dgst, gid, i + 2);
|
||||||
|
dgst[3] = packv (tmps, dgst, gid, i + 3);
|
||||||
|
dgst[4] = packv (tmps, dgst, gid, i + 4);
|
||||||
|
dgst[5] = packv (tmps, dgst, gid, i + 5);
|
||||||
|
dgst[6] = packv (tmps, dgst, gid, i + 6);
|
||||||
|
dgst[7] = packv (tmps, dgst, gid, i + 7);
|
||||||
|
|
||||||
|
out[0] = packv (tmps, out, gid, i + 0);
|
||||||
|
out[1] = packv (tmps, out, gid, i + 1);
|
||||||
|
out[2] = packv (tmps, out, gid, i + 2);
|
||||||
|
out[3] = packv (tmps, out, gid, i + 3);
|
||||||
|
out[4] = packv (tmps, out, gid, i + 4);
|
||||||
|
out[5] = packv (tmps, out, gid, i + 5);
|
||||||
|
out[6] = packv (tmps, out, gid, i + 6);
|
||||||
|
out[7] = packv (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];
|
||||||
|
|
||||||
|
w0[0] = dgst[0];
|
||||||
|
w0[1] = dgst[1];
|
||||||
|
w0[2] = dgst[2];
|
||||||
|
w0[3] = dgst[3];
|
||||||
|
w1[0] = dgst[4];
|
||||||
|
w1[1] = dgst[5];
|
||||||
|
w1[2] = dgst[6];
|
||||||
|
w1[3] = dgst[7];
|
||||||
|
w2[0] = 0x80000000;
|
||||||
|
w2[1] = 0;
|
||||||
|
w2[2] = 0;
|
||||||
|
w2[3] = 0;
|
||||||
|
w3[0] = 0;
|
||||||
|
w3[1] = 0;
|
||||||
|
w3[2] = 0;
|
||||||
|
w3[3] = (64 + 32) * 8;
|
||||||
|
|
||||||
|
hmac_sha256_run_V (w0, w1, w2, w3, 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];
|
||||||
|
}
|
||||||
|
|
||||||
|
unpackv (tmps, dgst, gid, i + 0, dgst[0]);
|
||||||
|
unpackv (tmps, dgst, gid, i + 1, dgst[1]);
|
||||||
|
unpackv (tmps, dgst, gid, i + 2, dgst[2]);
|
||||||
|
unpackv (tmps, dgst, gid, i + 3, dgst[3]);
|
||||||
|
unpackv (tmps, dgst, gid, i + 4, dgst[4]);
|
||||||
|
unpackv (tmps, dgst, gid, i + 5, dgst[5]);
|
||||||
|
unpackv (tmps, dgst, gid, i + 6, dgst[6]);
|
||||||
|
unpackv (tmps, dgst, gid, i + 7, dgst[7]);
|
||||||
|
|
||||||
|
unpackv (tmps, out, gid, i + 0, out[0]);
|
||||||
|
unpackv (tmps, out, gid, i + 1, out[1]);
|
||||||
|
unpackv (tmps, out, gid, i + 2, out[2]);
|
||||||
|
unpackv (tmps, out, gid, i + 3, out[3]);
|
||||||
|
unpackv (tmps, out, gid, i + 4, out[4]);
|
||||||
|
unpackv (tmps, out, gid, i + 5, out[5]);
|
||||||
|
unpackv (tmps, out, gid, i + 6, out[6]);
|
||||||
|
unpackv (tmps, out, gid, i + 7, out[7]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
KERNEL_FQ void m26610_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, pbkdf2_sha256_aes_gcm_t))
|
||||||
|
{
|
||||||
|
const u64 gid = get_global_id (0);
|
||||||
|
const u64 lid = get_local_id (0);
|
||||||
|
const u64 lsz = get_local_size (0);
|
||||||
|
#define il_pos 0
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* aes shared
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifdef REAL_SHM
|
||||||
|
|
||||||
|
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_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_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] = tmps[gid].out[0];
|
||||||
|
ukey[1] = tmps[gid].out[1];
|
||||||
|
ukey[2] = tmps[gid].out[2];
|
||||||
|
ukey[3] = tmps[gid].out[3];
|
||||||
|
ukey[4] = tmps[gid].out[4];
|
||||||
|
ukey[5] = tmps[gid].out[5];
|
||||||
|
ukey[6] = tmps[gid].out[6];
|
||||||
|
ukey[7] = tmps[gid].out[7];
|
||||||
|
|
||||||
|
u32 key_len = 32 * 8;
|
||||||
|
|
||||||
|
u32 key[60] = { 0 };
|
||||||
|
u32 subKey[4] = { 0 };
|
||||||
|
|
||||||
|
AES_GCM_Init (ukey, key_len, key, subKey, s_te0, s_te1, s_te2, s_te3, s_te4);
|
||||||
|
|
||||||
|
// iv
|
||||||
|
const u32 iv[4] = {
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[0],
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[1],
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[2],
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].iv_buf[3]
|
||||||
|
};
|
||||||
|
|
||||||
|
const u32 iv_len = esalt_bufs[DIGESTS_OFFSET_HOST].iv_len;
|
||||||
|
|
||||||
|
u32 J0[4] = { 0 };
|
||||||
|
|
||||||
|
AES_GCM_Prepare_J0 (iv, iv_len, subKey, J0);
|
||||||
|
|
||||||
|
//ct
|
||||||
|
u32 ct[4] = {
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0],
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1],
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2],
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3]
|
||||||
|
};
|
||||||
|
|
||||||
|
u32 pt[4] = { 0 };
|
||||||
|
|
||||||
|
// we try to decrypt the ciphertext
|
||||||
|
// TODO this can be moved to a separate decryption function in inc_cipher_aes-gcm.cl
|
||||||
|
AES_GCM_inc32(J0); // the first ctr is used to compute the tag, only the second is used for decryption: https://en.wikipedia.org/wiki/Galois/Counter_Mode#/media/File:GCM-Galois_Counter_Mode_with_IV.svg
|
||||||
|
AES_GCM_GCTR (key, J0, ct, 16, pt, s_te0, s_te1, s_te2, s_te3, s_te4); // decrypt the ciphertext
|
||||||
|
|
||||||
|
// if ((gid == 0) && (lid == 0)) printf ("pt[0]=%08x\n", pt[0]); // should be 5b7b2274 or [{"type"
|
||||||
|
|
||||||
|
// cast plaintext buffer to byte such that we can do a byte per byte comparison
|
||||||
|
PRIVATE_AS const u32 *u32OutBufPtr = (PRIVATE_AS u32 *) pt;
|
||||||
|
PRIVATE_AS const u8 *u8OutBufPtr = (PRIVATE_AS u8 *) u32OutBufPtr;
|
||||||
|
|
||||||
|
// the best comparison I can think of is checking each byte
|
||||||
|
// whether it's ASCII, if so we're good,
|
||||||
|
// if not, decryption was not successful
|
||||||
|
bool correct = true;
|
||||||
|
|
||||||
|
for(int i=0;i<16;i++)
|
||||||
|
{
|
||||||
|
if(u8OutBufPtr[i] >=20 && u8OutBufPtr[i] <= 0x7e) {
|
||||||
|
//if ((gid == 0) && (lid == 0)) printf("correct ASCII byte[%d]=0x%02x\n", i, u8OutBufPtr[i]);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
//if ((gid == 0) && (lid == 0)) printf("NOT correct! byte[%d]=0x%02x\n", i, u8OutBufPtr[i]);
|
||||||
|
correct = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const u32 digest[4] =
|
||||||
|
{
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[0],
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[1],
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[2],
|
||||||
|
esalt_bufs[DIGESTS_OFFSET_HOST].ct_buf[3],
|
||||||
|
};
|
||||||
|
|
||||||
|
//if ((gid == 0) && (lid == 0)) printf ("ct[0]=%08x\n", ct[0]);
|
||||||
|
//if ((gid == 0) && (lid == 0)) printf ("ct[1]=%08x\n", ct[1]);
|
||||||
|
//if ((gid == 0) && (lid == 0)) printf ("ct[2]=%08x\n", ct[2]);
|
||||||
|
//if ((gid == 0) && (lid == 0)) printf ("ct[3]=%08x\n", ct[3]);
|
||||||
|
|
||||||
|
if (correct)
|
||||||
|
{
|
||||||
|
int digest_pos = find_hash (digest, DIGESTS_CNT, &digests_buf[DIGESTS_OFFSET_HOST]);
|
||||||
|
|
||||||
|
if (digest_pos != -1)
|
||||||
|
{
|
||||||
|
const u32 final_hash_pos = DIGESTS_OFFSET_HOST + digest_pos;
|
||||||
|
|
||||||
|
if (hc_atomic_inc (&hashes_shown[final_hash_pos]) == 0)
|
||||||
|
{
|
||||||
|
mark_hash (plains_buf, d_return_buf, SALT_POS_HOST, DIGESTS_CNT, digest_pos, final_hash_pos, gid, il_pos, 0, 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -22,6 +22,7 @@
|
|||||||
- Added hash-mode: HMAC-RIPEMD160 (key = $salt)
|
- Added hash-mode: HMAC-RIPEMD160 (key = $salt)
|
||||||
- Added hash-mode: bcrypt(sha256($pass))
|
- Added hash-mode: bcrypt(sha256($pass))
|
||||||
- Added hash-mode: md5(md5($salt).md5(md5($pass)))
|
- Added hash-mode: md5(md5($salt).md5(md5($pass)))
|
||||||
|
- Added hash-mode: metamask (26610) with plaintext check instead of checking the AES-GCM tag of the data (26600). 26610 no longer needs all data in hash.
|
||||||
|
|
||||||
##
|
##
|
||||||
## Performance
|
## Performance
|
||||||
|
|||||||
@ -18,7 +18,7 @@ static const u32 DGST_POS2 = 2;
|
|||||||
static const u32 DGST_POS3 = 3;
|
static const u32 DGST_POS3 = 3;
|
||||||
static const u32 DGST_SIZE = DGST_SIZE_4_4;
|
static const u32 DGST_SIZE = DGST_SIZE_4_4;
|
||||||
static const u32 HASH_CATEGORY = HASH_CATEGORY_CRYPTOCURRENCY_WALLET;
|
static const u32 HASH_CATEGORY = HASH_CATEGORY_CRYPTOCURRENCY_WALLET;
|
||||||
static const char *HASH_NAME = "MetaMask Wallet";
|
static const char *HASH_NAME = "MetaMask Wallet (needs all data, checks AES-GCM tag)";
|
||||||
static const u64 KERN_TYPE = 26600;
|
static const u64 KERN_TYPE = 26600;
|
||||||
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
||||||
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||||
@ -26,7 +26,8 @@ static const u64 OPTS_TYPE = OPTS_TYPE_STOCK_MODULE
|
|||||||
| OPTS_TYPE_PT_GENERATE_LE;
|
| OPTS_TYPE_PT_GENERATE_LE;
|
||||||
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
||||||
static const char *ST_PASS = "hashcat1";
|
static const char *ST_PASS = "hashcat1";
|
||||||
static const char *ST_HASH = "$metamask$h0c2mQBGgnhlJ4EWMhdAAZhHlFeZNVlAEwOHQHaEBhY=$q9de9oljOBLWBQRtk9Ugog==$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";
|
// hash generated using with python3 tools/metamask2hashcat.py --vault tools/2hashcat_tests/metamask2hashcat.json
|
||||||
|
static const char *ST_HASH = "$metamask$jfGI3TXguhb8GPnKSXFrMzRk2NCEc131Gt5G3kZr5+s=$h+BoIf2CQ5BEjaIOShFE7g==$R95fzGt4UQ0uwrcrVYnIi4UcSlWn9wlmer+//526ZDwYAp50K82F1u1oacYcdjjhuEvbZnWk/uBG00UkgLLlO3WbINljqmu2QWdDEwjTgo/qWR6MU9d/82rxNiONHQE8UrZ8SV+htVr6XIB0ze3aCV0E+fwI93EeP79ZeDxuOEhuHoiYT0bHWMv5nA48AdluG4DbOo7SrDAWBVCBsEdXsOfYsS3/TIh0a/iFCMX4uhxY2824JwcWp4H36SFWyBYMZCJ3/U4DYFbbjWZtGRthoJlIik5BJq4FLu3Y1jEgza0AWlAvu4MKTEqrYSpUIghfxf1a1f+kPvxsHNq0as0kRwCXu09DObbdsiggbmeoBkxMZiFq0d9ar/3Gon0r3hfc3c124Wlivzbzu1JcZ3wURhLSsUS7b5cfG86aXHJkxmQDA5urBz6lw3bsIvlEUB2ErkQy/zD+cPwCG1Rs/WKt7KNh45lppCUkHccbf+xlpdc8OfUwj01Xp7BdH8LMR7Vx1C4hZCvSdtURVl0VaAMxHDX0MjRkwmqS";
|
||||||
|
|
||||||
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_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_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; }
|
||||||
|
|||||||
378
src/modules/module_26610.c
Normal file
378
src/modules/module_26610.c
Normal file
@ -0,0 +1,378 @@
|
|||||||
|
/**
|
||||||
|
* 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;
|
||||||
|
// 22610 generates a decryption key based on a password-guess and uses that to AES-GCM decrypt the data decrypts
|
||||||
|
static const char *HASH_NAME = "MetaMask Wallet (short hash, plaintext check)";
|
||||||
|
static const u64 KERN_TYPE = 26610;
|
||||||
|
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";
|
||||||
|
// hash generated using with python3 tools/metamask2hashcat.py --vault tools/2hashcat_tests/metamask2hashcat.json --shortdata
|
||||||
|
static const char *ST_HASH = "$metamask-short$jfGI3TXguhb8GPnKSXFrMzRk2NCEc131Gt5G3kZr5+s=$h+BoIf2CQ5BEjaIOShFE7g==$R95fzGt4UQ0uwrcrVYnIi4UcSlWn9wlmer+//526ZDwYAp50K82F1u1oacYcdjjhuEvbZnWk/uBG00UkgLLlOw==";
|
||||||
|
|
||||||
|
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_sha256_tmp
|
||||||
|
{
|
||||||
|
u32 ipad[8];
|
||||||
|
u32 opad[8];
|
||||||
|
|
||||||
|
u32 dgst[32];
|
||||||
|
u32 out[32];
|
||||||
|
|
||||||
|
} pbkdf2_sha256_tmp_t;
|
||||||
|
|
||||||
|
typedef struct pbkdf2_sha256_aes_gcm
|
||||||
|
{
|
||||||
|
u32 salt_buf[64];
|
||||||
|
u32 iv_buf[4];
|
||||||
|
u32 iv_len;
|
||||||
|
u32 ct_buf[784]; // TODO this can be smaller and would speedup the attack, only 64 bytes of ciphertext are allowed
|
||||||
|
u32 ct_len;
|
||||||
|
|
||||||
|
} pbkdf2_sha256_aes_gcm_t;
|
||||||
|
|
||||||
|
static const char *SIGNATURE_METAMASK_WALLET = "$metamask-short$";
|
||||||
|
|
||||||
|
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_sha256_aes_gcm_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_sha256_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_sha256_aes_gcm_t *metamask = (pbkdf2_sha256_aes_gcm_t *) esalt_buf;
|
||||||
|
|
||||||
|
#define CT_MAX_LEN_BASE64 (((3136+16) * 8) / 6) + 3 // TODO this can be smaller and would speedup the attack, only 64 bytes of ciphertext are allowed
|
||||||
|
|
||||||
|
hc_token_t token;
|
||||||
|
|
||||||
|
token.token_cnt = 4;
|
||||||
|
|
||||||
|
token.signatures_cnt = 1;
|
||||||
|
token.signatures_buf[0] = SIGNATURE_METAMASK_WALLET;
|
||||||
|
|
||||||
|
token.len[0] = 16;
|
||||||
|
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
|
||||||
|
| TOKEN_ATTR_VERIFY_SIGNATURE;
|
||||||
|
|
||||||
|
token.sep[1] = '$';
|
||||||
|
token.len_min[1] = 44;
|
||||||
|
token.len_max[1] = 44;
|
||||||
|
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH
|
||||||
|
| TOKEN_ATTR_VERIFY_BASE64A;
|
||||||
|
|
||||||
|
token.sep[2] = '$';
|
||||||
|
token.len_min[2] = 24;
|
||||||
|
token.len_max[2] = 24;
|
||||||
|
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
|
||||||
|
| TOKEN_ATTR_VERIFY_BASE64A;
|
||||||
|
|
||||||
|
token.sep[3] = '$';
|
||||||
|
token.len_min[3] = 32;
|
||||||
|
token.len_max[3] = 100; // TODO this can be smaller and would speedup the attack, only 64 bytes of ciphertext are allowed
|
||||||
|
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);
|
||||||
|
|
||||||
|
u8 tmp_buf[CT_MAX_LEN_BASE64] = { 0 };
|
||||||
|
|
||||||
|
size_t tmp_len = 0;
|
||||||
|
|
||||||
|
// iter
|
||||||
|
|
||||||
|
salt->salt_iter = 10000 - 1;
|
||||||
|
|
||||||
|
// salt
|
||||||
|
|
||||||
|
const u8 *salt_pos = token.buf[1];
|
||||||
|
const int salt_len = token.len[1];
|
||||||
|
|
||||||
|
memset (tmp_buf, 0, sizeof (tmp_buf));
|
||||||
|
|
||||||
|
tmp_len = base64_decode (base64_to_int, salt_pos, salt_len, tmp_buf);
|
||||||
|
|
||||||
|
if (tmp_len != 32) return (PARSER_SALT_LENGTH);
|
||||||
|
|
||||||
|
memcpy (salt->salt_buf, tmp_buf, tmp_len);
|
||||||
|
|
||||||
|
salt->salt_len = tmp_len;
|
||||||
|
|
||||||
|
metamask->salt_buf[0] = salt->salt_buf[0];
|
||||||
|
metamask->salt_buf[1] = salt->salt_buf[1];
|
||||||
|
metamask->salt_buf[2] = salt->salt_buf[2];
|
||||||
|
metamask->salt_buf[3] = salt->salt_buf[3];
|
||||||
|
metamask->salt_buf[4] = salt->salt_buf[4];
|
||||||
|
metamask->salt_buf[5] = salt->salt_buf[5];
|
||||||
|
metamask->salt_buf[6] = salt->salt_buf[6];
|
||||||
|
metamask->salt_buf[7] = salt->salt_buf[7];
|
||||||
|
|
||||||
|
// iv
|
||||||
|
|
||||||
|
const u8 *iv_pos = token.buf[2];
|
||||||
|
const int iv_len = token.len[2];
|
||||||
|
|
||||||
|
memset (tmp_buf, 0, sizeof (tmp_buf));
|
||||||
|
|
||||||
|
tmp_len = base64_decode (base64_to_int, iv_pos, iv_len, tmp_buf);
|
||||||
|
|
||||||
|
if (tmp_len != 16) return (PARSER_IV_LENGTH);
|
||||||
|
|
||||||
|
memcpy ((u8 *) metamask->iv_buf, tmp_buf, tmp_len);
|
||||||
|
|
||||||
|
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 = tmp_len;
|
||||||
|
|
||||||
|
// ciphertext
|
||||||
|
|
||||||
|
const u8 *ct_pos = token.buf[3];
|
||||||
|
const int ct_len = token.len[3];
|
||||||
|
|
||||||
|
memset (tmp_buf, 0, sizeof (tmp_buf));
|
||||||
|
|
||||||
|
tmp_len = base64_decode (base64_to_int, ct_pos, ct_len, tmp_buf);
|
||||||
|
|
||||||
|
memcpy ((u8 *) metamask->ct_buf, tmp_buf, tmp_len);
|
||||||
|
|
||||||
|
u32 j = tmp_len / 4;
|
||||||
|
|
||||||
|
if ((tmp_len % 4) > 0) j++;
|
||||||
|
|
||||||
|
for (u32 i = 0; i < j; i++) metamask->ct_buf[i] = byte_swap_32 (metamask->ct_buf[i]);
|
||||||
|
|
||||||
|
metamask->ct_len = tmp_len;
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
pbkdf2_sha256_aes_gcm_t *metamask = (pbkdf2_sha256_aes_gcm_t *) esalt_buf;
|
||||||
|
|
||||||
|
// salt
|
||||||
|
|
||||||
|
#define SALT_LEN_BASE64 ((32 * 8) / 6) + 3
|
||||||
|
#define IV_LEN_BASE64 ((16 * 8) / 6) + 3
|
||||||
|
#define CT_MAX_LEN_BASE64 (((3136+16) * 8) / 6) + 3 // TODO this can be much smaller now, probably 32 ?
|
||||||
|
|
||||||
|
u8 salt_buf[SALT_LEN_BASE64] = { 0 };
|
||||||
|
|
||||||
|
base64_encode (int_to_base64, (const u8 *) salt->salt_buf, (const int) salt->salt_len, salt_buf);
|
||||||
|
|
||||||
|
// iv
|
||||||
|
|
||||||
|
u32 tmp_iv_buf[4] = { 0 };
|
||||||
|
|
||||||
|
tmp_iv_buf[0] = byte_swap_32 (metamask->iv_buf[0]);
|
||||||
|
tmp_iv_buf[1] = byte_swap_32 (metamask->iv_buf[1]);
|
||||||
|
tmp_iv_buf[2] = byte_swap_32 (metamask->iv_buf[2]);
|
||||||
|
tmp_iv_buf[3] = byte_swap_32 (metamask->iv_buf[3]);
|
||||||
|
|
||||||
|
u8 iv_buf[IV_LEN_BASE64+1] = { 0 };
|
||||||
|
|
||||||
|
base64_encode (int_to_base64, (const u8 *) tmp_iv_buf, (const int) metamask->iv_len, iv_buf);
|
||||||
|
|
||||||
|
// ct
|
||||||
|
|
||||||
|
u32 ct_len = metamask->ct_len;
|
||||||
|
|
||||||
|
u32 j = ct_len / 4;
|
||||||
|
|
||||||
|
if ((ct_len % 4) > 0) j++;
|
||||||
|
|
||||||
|
u32 tmp_buf[784] = { 0 }; // TODO this can be smaller and would speedup the attack, only 64 bytes of ciphertext are allowed
|
||||||
|
|
||||||
|
for (u32 i = 0; i < j; i++) tmp_buf[i] = byte_swap_32 (metamask->ct_buf[i]);
|
||||||
|
|
||||||
|
u8 ct_buf[CT_MAX_LEN_BASE64] = { 0 };
|
||||||
|
|
||||||
|
base64_encode (int_to_base64, (const u8 *) tmp_buf, (const int) metamask->ct_len, 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;
|
||||||
|
}
|
||||||
41
tools/2hashcat_tests/metamask2hashcat-test.py
Normal file
41
tools/2hashcat_tests/metamask2hashcat-test.py
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
from base64 import b64decode
|
||||||
|
from hashlib import pbkdf2_hmac
|
||||||
|
|
||||||
|
from Crypto.Cipher import AES
|
||||||
|
|
||||||
|
#TODO perhaps load the vault from tools/2hashcat_tests/metamask2hashcat.json similar as in tools/metamask2hashcat.py
|
||||||
|
vault = {"data":"R95fzGt4UQ0uwrcrVYnIi4UcSlWn9wlmer+//526ZDwYAp50K82F1u1oacYcdjjhuEvbZnWk/uBG00UkgLLlO3WbINljqmu2QWdDEwjTgo/qWR6MU9d/82rxNiONHQE8UrZ8SV+htVr6XIB0ze3aCV0E+fwI93EeP79ZeDxuOEhuHoiYT0bHWMv5nA48AdluG4DbOo7SrDAWBVCBsEdXsOfYsS3/TIh0a/iFCMX4uhxY2824JwcWp4H36SFWyBYMZCJ3/U4DYFbbjWZtGRthoJlIik5BJq4FLu3Y1jEgza0AWlAvu4MKTEqrYSpUIghfxf1a1f+kPvxsHNq0as0kRwCXu09DObbdsiggbmeoBkxMZiFq0d9ar/3Gon0r3hfc3c124Wlivzbzu1JcZ3wURhLSsUS7b5cfG86aXHJkxmQDA5urBz6lw3bsIvlEUB2ErkQy/zD+cPwCG1Rs/WKt7KNh45lppCUkHccbf+xlpdc8OfUwj01Xp7BdH8LMR7Vx1C4hZCvSdtURVl0VaAMxHDX0MjRkwmqS","iv":"h+BoIf2CQ5BEjaIOShFE7g==","salt":"jfGI3TXguhb8GPnKSXFrMzRk2NCEc131Gt5G3kZr5+s="}
|
||||||
|
password = "hashcat1"
|
||||||
|
|
||||||
|
salt = b64decode(vault["salt"])
|
||||||
|
key = pbkdf2_hmac("sha256", password.encode(), salt, 10_000)
|
||||||
|
|
||||||
|
iv = b64decode(vault["iv"])
|
||||||
|
payload = b64decode(vault["data"])
|
||||||
|
ciphertext = payload[:-16]
|
||||||
|
print(f"ciphertext.hex()={ciphertext.hex()[0:128]}")
|
||||||
|
tag = payload[-16:]
|
||||||
|
|
||||||
|
cipher = AES.new(key, AES.MODE_GCM, nonce=iv)
|
||||||
|
plaintext = cipher.decrypt(ciphertext)
|
||||||
|
|
||||||
|
print(plaintext.hex()[0:128])
|
||||||
|
print(str(plaintext[0:128]))
|
||||||
|
|
||||||
|
print()
|
||||||
|
try:
|
||||||
|
cipher.verify(tag)
|
||||||
|
print("The message is authentic:", plaintext.decode())
|
||||||
|
except ValueError:
|
||||||
|
print("Key incorrect or message corrupted")
|
||||||
|
print()
|
||||||
|
|
||||||
|
cipher = AES.new(key, AES.MODE_GCM, nonce=iv)
|
||||||
|
plaintext = cipher.decrypt(ciphertext[:32])
|
||||||
|
print("Partially encrypted message (32 bytes):", plaintext.decode())
|
||||||
|
|
||||||
|
cipher = AES.new(key, AES.MODE_GCM, nonce=iv)
|
||||||
|
plaintext = cipher.decrypt(ciphertext[:450])
|
||||||
|
print("Partially encrypted message (450 bytes):", plaintext.decode())
|
||||||
1
tools/2hashcat_tests/metamask2hashcat.json
Normal file
1
tools/2hashcat_tests/metamask2hashcat.json
Normal file
@ -0,0 +1 @@
|
|||||||
|
{"data":"R95fzGt4UQ0uwrcrVYnIi4UcSlWn9wlmer+//526ZDwYAp50K82F1u1oacYcdjjhuEvbZnWk/uBG00UkgLLlO3WbINljqmu2QWdDEwjTgo/qWR6MU9d/82rxNiONHQE8UrZ8SV+htVr6XIB0ze3aCV0E+fwI93EeP79ZeDxuOEhuHoiYT0bHWMv5nA48AdluG4DbOo7SrDAWBVCBsEdXsOfYsS3/TIh0a/iFCMX4uhxY2824JwcWp4H36SFWyBYMZCJ3/U4DYFbbjWZtGRthoJlIik5BJq4FLu3Y1jEgza0AWlAvu4MKTEqrYSpUIghfxf1a1f+kPvxsHNq0as0kRwCXu09DObbdsiggbmeoBkxMZiFq0d9ar/3Gon0r3hfc3c124Wlivzbzu1JcZ3wURhLSsUS7b5cfG86aXHJkxmQDA5urBz6lw3bsIvlEUB2ErkQy/zD+cPwCG1Rs/WKt7KNh45lppCUkHccbf+xlpdc8OfUwj01Xp7BdH8LMR7Vx1C4hZCvSdtURVl0VaAMxHDX0MjRkwmqS","iv":"h+BoIf2CQ5BEjaIOShFE7g==","salt":"jfGI3TXguhb8GPnKSXFrMzRk2NCEc131Gt5G3kZr5+s="}
|
||||||
@ -11,8 +11,9 @@
|
|||||||
|
|
||||||
import json
|
import json
|
||||||
import argparse
|
import argparse
|
||||||
|
import base64
|
||||||
|
|
||||||
def metamask_parser(file):
|
def metamask_parser(file, shortdata):
|
||||||
try:
|
try:
|
||||||
f = open(file)
|
f = open(file)
|
||||||
|
|
||||||
@ -23,7 +24,16 @@ def metamask_parser(file):
|
|||||||
parser.print_help()
|
parser.print_help()
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
print('$metamask$' + j['salt'] + '$' + j['iv'] + '$' + j['data'])
|
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'])
|
||||||
except ValueError as e:
|
except ValueError as e:
|
||||||
parser.print_help()
|
parser.print_help()
|
||||||
exit(1)
|
exit(1)
|
||||||
@ -33,10 +43,12 @@ def metamask_parser(file):
|
|||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
parser = argparse.ArgumentParser(description="metamask2hashcat.py extraction tool")
|
parser = argparse.ArgumentParser(description="metamask2hashcat.py extraction tool")
|
||||||
parser.add_argument('--vault', required=True, help='set metamask vault (json) file from path', type=str)
|
parser.add_argument('--vault', required=True, help='set metamask vault (json) file from path', type=str)
|
||||||
|
parser.add_argument('--shortdata', help='force short data, can only be used with m26610, ', action='store_true')
|
||||||
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
if args.vault:
|
if args.vault:
|
||||||
metamask_parser(args.vault)
|
metamask_parser(args.vault, args.shortdata)
|
||||||
else:
|
else:
|
||||||
parser.print_help()
|
parser.print_help()
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|||||||
@ -58,6 +58,11 @@ sub module_generate_hash
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
# generate plaintext
|
||||||
|
|
||||||
|
# TODO now the data is all 0xff, would be better to have it mimic the same structure as the reference data:
|
||||||
|
# [{"type":"HD Key Tree","data":{"mnemonic":[112,97,121,109,101,110,116,32,117,112,115,101,116,32,109,101,116,97,108,32,99,104,97,112,116,101,114,32,114,117,110,32,97,100,109,105,116,32,109,101,97,115,117,114,101,32,114,101,109,105,110,100,32,115,117,112,112,108,121,32,104,111,112,101,32,101,110,101,109,121,32,104,101,100,103,101,104,111,103],"numberOfAccounts":1,"hdPath":"m/44'/60'/0'/0"}}]
|
||||||
|
# generated from tools/2hashcat_tests/metamask2hashcat-test.py
|
||||||
$pt = "\xff" x ($ct_min_len + int (rand ($ct_max_len - $ct_min_len)) + 1);
|
$pt = "\xff" x ($ct_min_len + int (rand ($ct_max_len - $ct_min_len)) + 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
112
tools/test_modules/m26610.pm
Normal file
112
tools/test_modules/m26610.pm
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
#!/usr/bin/env perl
|
||||||
|
|
||||||
|
##
|
||||||
|
## Author......: See docs/credits.txt
|
||||||
|
## License.....: MIT
|
||||||
|
##
|
||||||
|
|
||||||
|
use strict;
|
||||||
|
use warnings;
|
||||||
|
|
||||||
|
use Crypt::PBKDF2;
|
||||||
|
use Crypt::AuthEnc::GCM;
|
||||||
|
use MIME::Base64 qw (decode_base64 encode_base64);
|
||||||
|
|
||||||
|
sub module_constraints { [[8, 256], [64, 64], [-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 $ct_min_len = 30;
|
||||||
|
my $ct_max_len = 64;
|
||||||
|
|
||||||
|
my $kdf = Crypt::PBKDF2->new
|
||||||
|
(
|
||||||
|
hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 256),
|
||||||
|
iterations => 10000,
|
||||||
|
output_len => 32
|
||||||
|
);
|
||||||
|
|
||||||
|
my $salt_bin = pack ("H*", $salt);
|
||||||
|
|
||||||
|
my $key = $kdf->PBKDF2 ($salt_bin, $word);
|
||||||
|
|
||||||
|
my $iv_bin = pack ("H*", $iv);
|
||||||
|
|
||||||
|
my $pt;
|
||||||
|
|
||||||
|
if (defined $ct)
|
||||||
|
{
|
||||||
|
my $ct_bin = pack ("H*", $ct);
|
||||||
|
|
||||||
|
my $data_bin = $ct_bin;
|
||||||
|
|
||||||
|
my $aes = Crypt::AuthEnc::GCM->new ("AES", $key, $iv_bin);
|
||||||
|
|
||||||
|
$pt = $aes->decrypt_add ($data_bin);
|
||||||
|
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
# generate plaintext
|
||||||
|
|
||||||
|
# TODO now the data is all ASCII 'a', would be better to have it mimic the same structure as the reference data:
|
||||||
|
# [{"type":"HD Key Tree","data":{"mnemonic":[112,97,121,109,101,110,116,32,117,112,115,101,116,32,109,101,116,97,108,32,99,104,97,112,116,101,114,32,114,117,110,32,97,100,109,105,116,32,109,101,97,115,117,114,101,32,114,101,109,105,110,100,32,115,117,112,112,108,121,32,104,111,112,101,32,101,110,101,109,121,32,104,101,100,103,101,104,111,103],"numberOfAccounts":1,"hdPath":"m/44'/60'/0'/0"}}]
|
||||||
|
# generated from tools/2hashcat_tests/metamask2hashcat-test.py
|
||||||
|
$pt = "a" x ($ct_min_len + int (rand ($ct_max_len - $ct_min_len)) + 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
my $aes = Crypt::AuthEnc::GCM->new ("AES", $key, $iv_bin);
|
||||||
|
|
||||||
|
my $ct_bin = $aes->encrypt_add ($pt);
|
||||||
|
|
||||||
|
my $hash = sprintf ('$metamask-short$%s$%s$%s', encode_base64 ($salt_bin, ""), encode_base64 ($iv_bin, ""), encode_base64 ($ct_bin, ""));
|
||||||
|
|
||||||
|
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, 10) eq '$metamask-short$';
|
||||||
|
|
||||||
|
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_bin = decode_base64 ($salt);
|
||||||
|
my $iv_bin = decode_base64 ($iv);
|
||||||
|
my $ct_bin = decode_base64 ($ct);
|
||||||
|
|
||||||
|
return unless length $salt_bin == 32;
|
||||||
|
return unless length $iv_bin == 16;
|
||||||
|
|
||||||
|
my $ct_len = length ($ct_bin);
|
||||||
|
my $ct_min_len = 30;
|
||||||
|
my $ct_max_len = 3136;
|
||||||
|
|
||||||
|
return unless ($ct_len >= $ct_min_len && $ct_len <= $ct_max_len);
|
||||||
|
|
||||||
|
my $word_packed = pack_if_HEX_notation ($word);
|
||||||
|
|
||||||
|
my $new_hash = module_generate_hash ($word_packed, unpack ("H*", $salt_bin), unpack ("H*", $iv_bin), unpack ("H*", $ct_bin));
|
||||||
|
|
||||||
|
return ($new_hash, $word);
|
||||||
|
}
|
||||||
|
|
||||||
|
1;
|
||||||
Loading…
Reference in New Issue
Block a user