mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 08:08:10 +00:00
fixes #1279: added -m 16300 = Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256
This commit is contained in:
philsmd
parent
838a71637a
commit
bf656774bb
@ -1467,6 +1467,14 @@ typedef struct ethereum_scrypt
|
||||
|
||||
} ethereum_scrypt_t;
|
||||
|
||||
typedef struct ethereum_presale
|
||||
{
|
||||
u32 iv[4];
|
||||
u32 enc_seed[152];
|
||||
u32 enc_seed_len;
|
||||
|
||||
} ethereum_presale_t;
|
||||
|
||||
typedef struct tacacs_plus
|
||||
{
|
||||
u32 session_buf[16];
|
||||
|
||||
757
OpenCL/m16300.cl
Normal file
757
OpenCL/m16300.cl
Normal file
@ -0,0 +1,757 @@
|
||||
/**
|
||||
* Author......: See docs/credits.txt
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#define NEW_SIMD_CODE
|
||||
|
||||
#include "inc_vendor.cl"
|
||||
#include "inc_hash_constants.h"
|
||||
#include "inc_hash_functions.cl"
|
||||
#include "inc_types.cl"
|
||||
#include "inc_common.cl"
|
||||
#include "inc_simd.cl"
|
||||
#include "inc_hash_sha256.cl"
|
||||
#include "inc_cipher_aes.cl"
|
||||
|
||||
#define COMPARE_S "inc_comp_single.cl"
|
||||
#define COMPARE_M "inc_comp_multi.cl"
|
||||
|
||||
__constant u64a keccakf_rndc[24] =
|
||||
{
|
||||
0x0000000000000001, 0x0000000000008082, 0x800000000000808a,
|
||||
0x8000000080008000, 0x000000000000808b, 0x0000000080000001,
|
||||
0x8000000080008081, 0x8000000000008009, 0x000000000000008a,
|
||||
0x0000000000000088, 0x0000000080008009, 0x000000008000000a,
|
||||
0x000000008000808b, 0x800000000000008b, 0x8000000000008089,
|
||||
0x8000000000008003, 0x8000000000008002, 0x8000000000000080,
|
||||
0x000000000000800a, 0x800000008000000a, 0x8000000080008081,
|
||||
0x8000000000008080, 0x0000000080000001, 0x8000000080008008
|
||||
};
|
||||
|
||||
#ifndef KECCAK_ROUNDS
|
||||
#define KECCAK_ROUNDS 24
|
||||
#endif
|
||||
|
||||
#define Theta1(s) (st[0 + s] ^ st[5 + s] ^ st[10 + s] ^ st[15 + s] ^ st[20 + s])
|
||||
|
||||
#define Theta2(s) \
|
||||
{ \
|
||||
st[ 0 + s] ^= t; \
|
||||
st[ 5 + s] ^= t; \
|
||||
st[10 + s] ^= t; \
|
||||
st[15 + s] ^= t; \
|
||||
st[20 + s] ^= t; \
|
||||
}
|
||||
|
||||
#define Rho_Pi(s) \
|
||||
{ \
|
||||
u32 j = keccakf_piln[s]; \
|
||||
u32 k = keccakf_rotc[s]; \
|
||||
bc0 = st[j]; \
|
||||
st[j] = rotl64_S (t, k); \
|
||||
t = bc0; \
|
||||
}
|
||||
|
||||
#define Chi(s) \
|
||||
{ \
|
||||
bc0 = st[0 + s]; \
|
||||
bc1 = st[1 + s]; \
|
||||
bc2 = st[2 + s]; \
|
||||
bc3 = st[3 + s]; \
|
||||
bc4 = st[4 + s]; \
|
||||
st[0 + s] ^= ~bc1 & bc2; \
|
||||
st[1 + s] ^= ~bc2 & bc3; \
|
||||
st[2 + s] ^= ~bc3 & bc4; \
|
||||
st[3 + s] ^= ~bc4 & bc0; \
|
||||
st[4 + s] ^= ~bc0 & bc1; \
|
||||
}
|
||||
|
||||
void keccak_transform_S (u64 st[25])
|
||||
{
|
||||
const u8 keccakf_rotc[24] =
|
||||
{
|
||||
1, 3, 6, 10, 15, 21, 28, 36, 45, 55, 2, 14,
|
||||
27, 41, 56, 8, 25, 43, 62, 18, 39, 61, 20, 44
|
||||
};
|
||||
|
||||
const u8 keccakf_piln[24] =
|
||||
{
|
||||
10, 7, 11, 17, 18, 3, 5, 16, 8, 21, 24, 4,
|
||||
15, 23, 19, 13, 12, 2, 20, 14, 22, 9, 6, 1
|
||||
};
|
||||
|
||||
/**
|
||||
* Keccak
|
||||
*/
|
||||
|
||||
int round;
|
||||
|
||||
for (round = 0; round < KECCAK_ROUNDS; round++)
|
||||
{
|
||||
// Theta
|
||||
|
||||
u64 bc0 = Theta1 (0);
|
||||
u64 bc1 = Theta1 (1);
|
||||
u64 bc2 = Theta1 (2);
|
||||
u64 bc3 = Theta1 (3);
|
||||
u64 bc4 = Theta1 (4);
|
||||
|
||||
u64 t;
|
||||
|
||||
t = bc4 ^ rotl64_S (bc1, 1); Theta2 (0);
|
||||
t = bc0 ^ rotl64_S (bc2, 1); Theta2 (1);
|
||||
t = bc1 ^ rotl64_S (bc3, 1); Theta2 (2);
|
||||
t = bc2 ^ rotl64_S (bc4, 1); Theta2 (3);
|
||||
t = bc3 ^ rotl64_S (bc0, 1); Theta2 (4);
|
||||
|
||||
// Rho Pi
|
||||
|
||||
t = st[1];
|
||||
|
||||
Rho_Pi (0);
|
||||
Rho_Pi (1);
|
||||
Rho_Pi (2);
|
||||
Rho_Pi (3);
|
||||
Rho_Pi (4);
|
||||
Rho_Pi (5);
|
||||
Rho_Pi (6);
|
||||
Rho_Pi (7);
|
||||
Rho_Pi (8);
|
||||
Rho_Pi (9);
|
||||
Rho_Pi (10);
|
||||
Rho_Pi (11);
|
||||
Rho_Pi (12);
|
||||
Rho_Pi (13);
|
||||
Rho_Pi (14);
|
||||
Rho_Pi (15);
|
||||
Rho_Pi (16);
|
||||
Rho_Pi (17);
|
||||
Rho_Pi (18);
|
||||
Rho_Pi (19);
|
||||
Rho_Pi (20);
|
||||
Rho_Pi (21);
|
||||
Rho_Pi (22);
|
||||
Rho_Pi (23);
|
||||
|
||||
// Chi
|
||||
|
||||
Chi (0);
|
||||
Chi (5);
|
||||
Chi (10);
|
||||
Chi (15);
|
||||
Chi (20);
|
||||
|
||||
// Iota
|
||||
|
||||
st[0] ^= keccakf_rndc[round];
|
||||
}
|
||||
}
|
||||
|
||||
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])
|
||||
{
|
||||
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 void m16300_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 ethereum_presale_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 u64 gid_max)
|
||||
{
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
|
||||
const u64 gid = get_global_id (0);
|
||||
|
||||
if (gid >= gid_max) 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, pws[gid].i, pws[gid].pw_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 void m16300_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 ethereum_presale_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 u64 gid_max)
|
||||
{
|
||||
const u64 gid = get_global_id (0);
|
||||
|
||||
if ((gid * VECT_SIZE) >= gid_max) 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 void m16300_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 ethereum_presale_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 u64 gid_max)
|
||||
{
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
|
||||
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 u32 s_td0[256];
|
||||
__local u32 s_td1[256];
|
||||
__local u32 s_td2[256];
|
||||
__local u32 s_td3[256];
|
||||
__local u32 s_td4[256];
|
||||
|
||||
__local u32 s_te0[256];
|
||||
__local u32 s_te1[256];
|
||||
__local u32 s_te2[256];
|
||||
__local u32 s_te3[256];
|
||||
__local 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];
|
||||
}
|
||||
|
||||
barrier (CLK_LOCAL_MEM_FENCE);
|
||||
|
||||
#else
|
||||
|
||||
__constant u32a *s_td0 = td0;
|
||||
__constant u32a *s_td1 = td1;
|
||||
__constant u32a *s_td2 = td2;
|
||||
__constant u32a *s_td3 = td3;
|
||||
__constant u32a *s_td4 = td4;
|
||||
|
||||
__constant u32a *s_te0 = te0;
|
||||
__constant u32a *s_te1 = te1;
|
||||
__constant u32a *s_te2 = te2;
|
||||
__constant u32a *s_te3 = te3;
|
||||
__constant u32a *s_te4 = te4;
|
||||
|
||||
#endif
|
||||
|
||||
if (gid >= gid_max) return;
|
||||
|
||||
/*
|
||||
* AES-CBC-128 decrypt
|
||||
*/
|
||||
|
||||
/**
|
||||
* aes decrypt key
|
||||
*/
|
||||
|
||||
u32 ukey[4];
|
||||
|
||||
ukey[0] = tmps[gid].out[0];
|
||||
ukey[1] = tmps[gid].out[1];
|
||||
ukey[2] = tmps[gid].out[2];
|
||||
ukey[3] = tmps[gid].out[3];
|
||||
|
||||
/**
|
||||
* aes init
|
||||
*/
|
||||
|
||||
#define KEYLEN 60
|
||||
|
||||
u32 ks[KEYLEN];
|
||||
|
||||
AES128_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_te4, s_td0, s_td1, s_td2, s_td3, s_td4);
|
||||
|
||||
u32 iv[4];
|
||||
|
||||
iv[0] = esalt_bufs[digests_offset].iv[0];
|
||||
iv[1] = esalt_bufs[digests_offset].iv[1];
|
||||
iv[2] = esalt_bufs[digests_offset].iv[2];
|
||||
iv[3] = esalt_bufs[digests_offset].iv[3];
|
||||
|
||||
u32 a = iv[0];
|
||||
u32 b = iv[1];
|
||||
u32 c = iv[2];
|
||||
u32 d = iv[3];
|
||||
|
||||
u32 enc_seed_len = esalt_bufs[digests_offset].enc_seed_len;
|
||||
|
||||
u64 seed[76 + 1]; // we need the + 1 to add the final \x02
|
||||
|
||||
u32 loop_idx = 0;
|
||||
u32 seed_idx = 0;
|
||||
|
||||
for (loop_idx = 0, seed_idx = 0; loop_idx < enc_seed_len / 4; loop_idx += 4, seed_idx += 2)
|
||||
{
|
||||
u32 data[4];
|
||||
|
||||
data[0] = esalt_bufs[digests_offset].enc_seed[loop_idx + 0];
|
||||
data[1] = esalt_bufs[digests_offset].enc_seed[loop_idx + 1];
|
||||
data[2] = esalt_bufs[digests_offset].enc_seed[loop_idx + 2];
|
||||
data[3] = esalt_bufs[digests_offset].enc_seed[loop_idx + 3];
|
||||
|
||||
u32 out[4];
|
||||
|
||||
AES128_decrypt (ks, data, out, s_td0, s_td1, s_td2, s_td3, s_td4);
|
||||
|
||||
a ^= out[0];
|
||||
b ^= out[1];
|
||||
c ^= out[2];
|
||||
d ^= out[3];
|
||||
|
||||
a = swap32_S (a);
|
||||
b = swap32_S (b);
|
||||
c = swap32_S (c);
|
||||
d = swap32_S (d);
|
||||
|
||||
seed[seed_idx + 0] = hl32_to_64_S (b, a);
|
||||
seed[seed_idx + 1] = hl32_to_64_S (d, c);
|
||||
|
||||
a = data[0];
|
||||
b = data[1];
|
||||
c = data[2];
|
||||
d = data[3];
|
||||
}
|
||||
|
||||
/*
|
||||
* check padding
|
||||
*/
|
||||
|
||||
u32 padding_len = h32_from_64_S (seed[seed_idx - 1]) >> 24;
|
||||
|
||||
// the ethereum algorithm adds a \x02 after the seed i.e. keccak ($seed . "\x02")
|
||||
// and the keccak adds an additional \x01 after the whole input
|
||||
|
||||
u32 final_len = enc_seed_len - padding_len + 2;
|
||||
|
||||
switch (padding_len)
|
||||
{
|
||||
case 16:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffffff) != 0x1010101010101010) ||
|
||||
((seed[seed_idx - 2] & 0xffffffffffffffff) != 0x1010101010101010))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 2] = 0x0102;
|
||||
seed[seed_idx - 1] = 0;
|
||||
break;
|
||||
|
||||
case 15:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffffff) != 0x0f0f0f0f0f0f0f0f) ||
|
||||
((seed[seed_idx - 2] & 0xffffffffffffff00) != 0x0f0f0f0f0f0f0f00))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 2] &= 0x00000000000000ff;
|
||||
seed[seed_idx - 2] |= 0x0000000000010200;
|
||||
seed[seed_idx - 1] = 0;
|
||||
break;
|
||||
|
||||
case 14:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffffff) != 0x0e0e0e0e0e0e0e0e) ||
|
||||
((seed[seed_idx - 2] & 0xffffffffffff0000) != 0x0e0e0e0e0e0e0000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 2] &= 0x000000000000ffff;
|
||||
seed[seed_idx - 2] |= 0x0000000001020000;
|
||||
seed[seed_idx - 1] = 0;
|
||||
break;
|
||||
|
||||
case 13:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffffff) != 0x0d0d0d0d0d0d0d0d) ||
|
||||
((seed[seed_idx - 2] & 0xffffffffff000000) != 0x0d0d0d0d0d000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 2] &= 0x0000000000ffffff;
|
||||
seed[seed_idx - 2] |= 0x0000000102000000;
|
||||
seed[seed_idx - 1] = 0;
|
||||
break;
|
||||
|
||||
case 12:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffffff) != 0x0c0c0c0c0c0c0c0c) ||
|
||||
((seed[seed_idx - 2] & 0xffffffff00000000) != 0x0c0c0c0c00000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 2] &= 0x00000000ffffffff;
|
||||
seed[seed_idx - 2] |= 0x0000010200000000;
|
||||
seed[seed_idx - 1] = 0;
|
||||
break;
|
||||
|
||||
case 11:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffffff) != 0x0b0b0b0b0b0b0b0b) ||
|
||||
((seed[seed_idx - 2] & 0xffffff0000000000) != 0x0b0b0b0000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 2] &= 0x000000ffffffffff;
|
||||
seed[seed_idx - 2] |= 0x0001020000000000;
|
||||
seed[seed_idx - 1] = 0;
|
||||
break;
|
||||
|
||||
case 10:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffffff) != 0x0a0a0a0a0a0a0a0a) ||
|
||||
((seed[seed_idx - 2] & 0xffff000000000000) != 0x0a0a000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 2] &= 0x0000ffffffffffff;
|
||||
seed[seed_idx - 2] |= 0x0102000000000000;
|
||||
seed[seed_idx - 1] = 0;
|
||||
break;
|
||||
|
||||
case 9:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffffff) != 0x0909090909090909) ||
|
||||
((seed[seed_idx - 2] & 0xff00000000000000) != 0x0900000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 2] &= 0x00ffffffffffffff;
|
||||
seed[seed_idx - 2] |= 0x0200000000000000;
|
||||
seed[seed_idx - 1] = 0x01;
|
||||
break;
|
||||
|
||||
case 8:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffffff) != 0x0808080808080808) ||
|
||||
((seed[seed_idx - 2] & 0x0000000000000000) != 0x0000000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 1] = 0x0102;
|
||||
break;
|
||||
|
||||
case 7:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffffff00) != 0x0707070707070700) ||
|
||||
((seed[seed_idx - 2] & 0x0000000000000000) != 0x0000000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 1] &= 0x00000000000000ff;
|
||||
seed[seed_idx - 1] |= 0x0000000000010200;
|
||||
break;
|
||||
|
||||
case 6:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffffff0000) != 0x0606060606060000) ||
|
||||
((seed[seed_idx - 2] & 0x0000000000000000) != 0x0000000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 1] &= 0x000000000000ffff;
|
||||
seed[seed_idx - 1] |= 0x0000000001020000;
|
||||
break;
|
||||
|
||||
case 5:
|
||||
if (((seed[seed_idx - 1] & 0xffffffffff000000) != 0x0505050505000000) ||
|
||||
((seed[seed_idx - 2] & 0x0000000000000000) != 0x0000000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 1] &= 0x0000000000ffffff;
|
||||
seed[seed_idx - 1] |= 0x0000000102000000;
|
||||
break;
|
||||
|
||||
case 4:
|
||||
if (((seed[seed_idx - 1] & 0xffffffff00000000) != 0x0404040400000000) ||
|
||||
((seed[seed_idx - 2] & 0x0000000000000000) != 0x0000000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 1] &= 0x00000000ffffffff;
|
||||
seed[seed_idx - 1] |= 0x0000010200000000;
|
||||
break;
|
||||
|
||||
case 3:
|
||||
if (((seed[seed_idx - 1] & 0xffffff0000000000) != 0x0303030000000000) ||
|
||||
((seed[seed_idx - 2] & 0x0000000000000000) != 0x0000000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 1] &= 0x000000ffffffffff;
|
||||
seed[seed_idx - 1] |= 0x0001020000000000;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
if (((seed[seed_idx - 1] & 0xffff000000000000) != 0x0202000000000000) ||
|
||||
((seed[seed_idx - 2] & 0x0000000000000000) != 0x0000000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 1] &= 0x0000ffffffffffff;
|
||||
seed[seed_idx - 1] |= 0x0102000000000000;
|
||||
break;
|
||||
|
||||
case 1:
|
||||
if (((seed[seed_idx - 1] & 0xff00000000000000) != 0x0100000000000000) ||
|
||||
((seed[seed_idx - 2] & 0x0000000000000000) != 0x0000000000000000))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
seed[seed_idx - 1] &= 0x00ffffffffffffff;
|
||||
seed[seed_idx - 1] |= 0x0200000000000000;
|
||||
seed[seed_idx - 0] = 0x01;
|
||||
break;
|
||||
|
||||
default:
|
||||
return;
|
||||
break;
|
||||
}
|
||||
|
||||
/**
|
||||
* keccak
|
||||
*/
|
||||
|
||||
u64 st[25] = { 0 };
|
||||
|
||||
u32 keccak_idx = 0;
|
||||
|
||||
for (loop_idx = 0, seed_idx = 0, keccak_idx = 0; loop_idx < final_len; loop_idx += 8, seed_idx++, keccak_idx++)
|
||||
{
|
||||
if (keccak_idx == 17) // or just: keccak_idx > 16
|
||||
{
|
||||
keccak_transform_S (st);
|
||||
|
||||
keccak_idx = 0;
|
||||
}
|
||||
|
||||
st[keccak_idx] ^= seed[seed_idx];
|
||||
}
|
||||
|
||||
// final:
|
||||
|
||||
st[16] ^= 0x8000000000000000;
|
||||
|
||||
keccak_transform_S (st);
|
||||
|
||||
const u32 r0 = l32_from_64_S (st[0]);
|
||||
const u32 r1 = h32_from_64_S (st[0]);
|
||||
const u32 r2 = l32_from_64_S (st[1]);
|
||||
const u32 r3 = h32_from_64_S (st[1]);
|
||||
|
||||
#define il_pos 0
|
||||
|
||||
#include COMPARE_M
|
||||
}
|
||||
@ -15,6 +15,7 @@
|
||||
- Added hash-mode 16000 = Tripcode
|
||||
- Added hash-mode 16100 = TACACS+
|
||||
- Added hash-mode 16200 = Apple Secure Notes
|
||||
- Added hash-mode 16300 = Ethereum Pre-Sale Wallet, PBKDF2-SHA256
|
||||
|
||||
##
|
||||
## Bugs
|
||||
|
||||
@ -226,6 +226,7 @@ NVIDIA GPUs require "NVIDIA Driver" (367.x or later)
|
||||
- Password Safe v3
|
||||
- KeePass 1 (AES/Twofish) and KeePass 2 (AES)
|
||||
- JKS Java Key Store Private Keys (SHA1)
|
||||
- Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256
|
||||
- Ethereum Wallet, PBKDF2-HMAC-SHA256
|
||||
- Ethereum Wallet, SCRYPT
|
||||
- eCryptfs
|
||||
|
||||
@ -176,7 +176,7 @@ _hashcat ()
|
||||
{
|
||||
local VERSION=4.0.1
|
||||
|
||||
local HASH_MODES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 124 130 131 132 133 140 141 150 160 200 300 400 500 501 600 900 1000 1100 1400 1410 1411 1420 1421 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2501 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 3910 4010 4110 4300 4400 4500 4520 4521 4522 4700 4800 4900 5000 5100 5200 5300 5400 5500 5600 5700 5800 6000 6100 6211 6212 6213 6221 6222 6223 6231 6232 6233 6241 6242 6243 6300 6400 6500 6600 6700 6800 6900 7000 7100 7200 7300 7400 7500 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8800 8900 9000 9100 9200 9300 9400 9500 9600 9700 9710 9720 9800 9810 9820 9900 10000 10100 10200 10300 10400 10410 10420 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11700 11800 11900 12000 12001 12100 12200 12300 12400 12500 12600 12700 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 13900 14000 14100 14700 14800 14900 15000 15100 15200 15300 15400 15500 15600 15700 15900 16000 16100 16200"
|
||||
local HASH_MODES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 124 130 131 132 133 140 141 150 160 200 300 400 500 501 600 900 1000 1100 1400 1410 1411 1420 1421 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2501 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 3910 4010 4110 4300 4400 4500 4520 4521 4522 4700 4800 4900 5000 5100 5200 5300 5400 5500 5600 5700 5800 6000 6100 6211 6212 6213 6221 6222 6223 6231 6232 6233 6241 6242 6243 6300 6400 6500 6600 6700 6800 6900 7000 7100 7200 7300 7400 7500 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8800 8900 9000 9100 9200 9300 9400 9500 9600 9700 9710 9720 9800 9810 9820 9900 10000 10100 10200 10300 10400 10410 10420 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11700 11800 11900 12000 12001 12100 12200 12300 12400 12500 12600 12700 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 13900 14000 14100 14700 14800 14900 15000 15100 15200 15300 15400 15500 15600 15700 15900 16000 16100 16200 16300"
|
||||
local ATTACK_MODES="0 1 3 6 7"
|
||||
local HCCAPX_MESSAGE_PAIR="0 1 2 3 4 5"
|
||||
local OUTFILE_FORMATS="1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"
|
||||
|
||||
@ -469,6 +469,14 @@ typedef struct ethereum_scrypt
|
||||
|
||||
} ethereum_scrypt_t;
|
||||
|
||||
typedef struct ethereum_presale
|
||||
{
|
||||
u32 iv[4];
|
||||
u32 enc_seed[152];
|
||||
u32 enc_seed_len;
|
||||
|
||||
} ethereum_presale_t;
|
||||
|
||||
typedef struct tacacs_plus
|
||||
{
|
||||
u32 session_buf[16];
|
||||
@ -1317,6 +1325,8 @@ typedef enum display_len
|
||||
DISPLAY_LEN_MAX_16100 = 1 + 11 + 1 + 1 + 1 + 8 + 256 + 1 + 4,
|
||||
DISPLAY_LEN_MIN_16200 = 5 + 1 + 1 + 1 + 5 + 1 + 32 + 1 + 48,
|
||||
DISPLAY_LEN_MAX_16200 = 5 + 1 + 6 + 1 + 5 + 1 + 32 + 1 + 48,
|
||||
DISPLAY_LEN_MIN_16300 = 11 + 1 + 64 + 1 + 40 + 1 + 32,
|
||||
DISPLAY_LEN_MAX_16300 = 11 + 1 + 1248 + 1 + 40 + 1 + 32,
|
||||
DISPLAY_LEN_MIN_99999 = 1,
|
||||
DISPLAY_LEN_MAX_99999 = 55,
|
||||
|
||||
@ -1646,6 +1656,7 @@ typedef enum kern_type
|
||||
KERN_TYPE_TRIPCODE = 16000,
|
||||
KERN_TYPE_TACACS_PLUS = 16100,
|
||||
KERN_TYPE_APPLE_SECURE_NOTES = 16200,
|
||||
KERN_TYPE_ETHEREUM_PRESALE = 16300,
|
||||
KERN_TYPE_PLAINTEXT = 99999,
|
||||
|
||||
} kern_type_t;
|
||||
@ -1721,6 +1732,7 @@ typedef enum rounds_count
|
||||
ROUNDS_DPAPIMK_V2 = 8000 - 1, // from 4000 to 24000 (possibly more)
|
||||
ROUNDS_ETHEREUM_PBKDF2 = 262144 - 1,
|
||||
ROUNDS_APPLE_SECURE_NOTES = 20000,
|
||||
ROUNDS_ETHEREUM_PRESALE = 2000 - 1,
|
||||
ROUNDS_STDOUT = 0
|
||||
|
||||
} rounds_count_t;
|
||||
@ -1907,6 +1919,7 @@ int ethereum_scrypt_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_bu
|
||||
int tripcode_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
|
||||
int tacacs_plus_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
|
||||
int apple_secure_notes_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
|
||||
int ethereum_presale_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig);
|
||||
|
||||
/**
|
||||
* hook functions
|
||||
|
||||
275
src/interface.c
275
src/interface.c
@ -270,6 +270,7 @@ static const char *ST_HASH_15900 = "$DPAPImk$2*1*S-15-21-439882973-489230393-482
|
||||
static const char *ST_HASH_16000 = "pfaRCwDe0U";
|
||||
static const char *ST_HASH_16100 = "$tacacs-plus$0$5fde8e68$4e13e8fb33df$c006";
|
||||
static const char *ST_HASH_16200 = "$ASN$*1*20000*80771171105233481004850004085037*d04b17af7f6b184346aad3efefe8bec0987ee73418291a41";
|
||||
static const char *ST_HASH_16300 = "$ethereum$w*e94a8e49deac2d62206bf9bfb7d2aaea7eb06c1a378cfc1ac056cc599a569793c0ecc40e6a0c242dee2812f06b644d70f43331b1fa2ce4bd6cbb9f62dd25b443235bdb4c1ffb222084c9ded8c719624b338f17e0fd827b34d79801298ac75f74ed97ae16f72fccecf862d09a03498b1b8bd1d984fc43dd507ede5d4b6223a582352386407266b66c671077eefc1e07b5f42508bf926ab5616658c984968d8eec25c9d5197a4a30eed54c161595c3b4d558b17ab8a75ccca72b3d949919d197158ea5cfbc43ac7dd73cf77807dc2c8fe4ef1e942ccd11ec24fe8a410d48ef4b8a35c93ecf1a21c51a51a08f3225fbdcc338b1e7fdafd7d94b82a81d88c2e9a429acc3f8a5974eafb7af8c912597eb6fdcd80578bd12efddd99de47b44e7c8f6c38f2af3116b08796172eda89422e9ea9b99c7f98a7e331aeb4bb1b06f611e95082b629332c31dbcfd878aed77d300c9ed5c74af9cd6f5a8c4a261dd124317fb790a04481d93aec160af4ad8ec84c04d943a869f65f07f5ccf8295dc1c876f30408eac77f62192cbb25842470b4a5bdb4c8096f56da7e9ed05c21f61b94c54ef1c2e9e417cce627521a40a99e357dd9b7a7149041d589cbacbe0302db57ddc983b9a6d79ce3f2e9ae8ad45fa40b934ed6b36379b780549ae7553dbb1cab238138c05743d0103335325bd90e27d8ae1ea219eb8905503c5ad54fa12d22e9a7d296eee07c8a7b5041b8d56b8af290274d01eb0e4ad174eb26b23b5e9fb46ff7f88398e6266052292acb36554ccb9c2c03139fe72d3f5d30bd5d10bd79d7cb48d2ab24187d8efc3750d5a24980fb12122591455d14e75421a2074599f1cc9fdfc8f498c92ad8b904d3c4307f80c46921d8128*f3abede76ac15228f1b161dd9660bb9094e81b1b*d201ccd492c284484c7824c4d37b1593";
|
||||
static const char *ST_HASH_99999 = "hashcat";
|
||||
|
||||
static const char *OPTI_STR_OPTIMIZED_KERNEL = "Optimized-Kernel";
|
||||
@ -505,6 +506,7 @@ static const char *HT_15900 = "DPAPI masterkey file v2";
|
||||
static const char *HT_16000 = "Tripcode";
|
||||
static const char *HT_16100 = "TACACS+";
|
||||
static const char *HT_16200 = "Apple Secure Notes";
|
||||
static const char *HT_16300 = "Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256";
|
||||
static const char *HT_99999 = "Plaintext";
|
||||
|
||||
static const char *HT_00011 = "Joomla < 2.5.18";
|
||||
@ -651,6 +653,7 @@ static const char *SIGNATURE_ETHEREUM_PBKDF2 = "$ethereum$p";
|
||||
static const char *SIGNATURE_ETHEREUM_SCRYPT = "$ethereum$s";
|
||||
static const char *SIGNATURE_TACACS_PLUS = "$tacacs-plus$0$";
|
||||
static const char *SIGNATURE_APPLE_SECURE_NOTES = "$ASN$";
|
||||
static const char *SIGNATURE_ETHEREUM_PRESALE = "$ethereum$w";
|
||||
|
||||
/**
|
||||
* decoder / encoder
|
||||
@ -15951,6 +15954,113 @@ int apple_secure_notes_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_bu
|
||||
return (PARSER_OK);
|
||||
}
|
||||
|
||||
int ethereum_presale_parse_hash (u8 *input_buf, u32 input_len, hash_t *hash_buf, MAYBE_UNUSED const hashconfig_t *hashconfig)
|
||||
{
|
||||
if ((input_len < DISPLAY_LEN_MIN_16300) || (input_len > DISPLAY_LEN_MAX_16300)) return (PARSER_GLOBAL_LENGTH);
|
||||
|
||||
if (memcmp (SIGNATURE_ETHEREUM_PRESALE, input_buf, 11) != 0) return (PARSER_SIGNATURE_UNMATCHED);
|
||||
|
||||
u32 *digest = (u32 *) hash_buf->digest;
|
||||
|
||||
salt_t *salt = hash_buf->salt;
|
||||
|
||||
ethereum_presale_t *ethereum_presale = (ethereum_presale_t *) hash_buf->esalt;
|
||||
|
||||
/**
|
||||
* parse line
|
||||
*/
|
||||
|
||||
// encseed
|
||||
|
||||
u8 *encseed_pos = input_buf + 11 + 1;
|
||||
|
||||
// address
|
||||
|
||||
u8 *ethaddr_pos = (u8 *) strchr ((const char *) encseed_pos, '*');
|
||||
|
||||
if (ethaddr_pos == NULL) return (PARSER_SEPARATOR_UNMATCHED);
|
||||
|
||||
u32 encseed_len = ethaddr_pos - encseed_pos;
|
||||
|
||||
ethaddr_pos++;
|
||||
|
||||
// hash (bkp)
|
||||
|
||||
u8 *bkp_pos = (u8 *) strchr ((const char *) ethaddr_pos, '*');
|
||||
|
||||
if (bkp_pos == NULL) return (PARSER_SEPARATOR_UNMATCHED);
|
||||
|
||||
u32 ethaddr_len = bkp_pos - ethaddr_pos;
|
||||
|
||||
bkp_pos++;
|
||||
|
||||
u32 bkp_len = input_len - 11 - 1 - encseed_len - 1 - ethaddr_len - 1;
|
||||
|
||||
/**
|
||||
* verify some data
|
||||
*/
|
||||
|
||||
if (encseed_len < 64) return (PARSER_SALT_LENGTH);
|
||||
if (encseed_len > 1248) return (PARSER_SALT_LENGTH);
|
||||
if (ethaddr_len != 40) return (PARSER_SALT_LENGTH);
|
||||
if (bkp_len != 32) return (PARSER_SALT_LENGTH);
|
||||
|
||||
if ((encseed_len % 16) != 0) return (PARSER_SALT_LENGTH);
|
||||
|
||||
if (is_valid_hex_string (encseed_pos, encseed_len) == false) return (PARSER_SALT_ENCODING);
|
||||
if (is_valid_hex_string (ethaddr_pos, ethaddr_len) == false) return (PARSER_HASH_ENCODING);
|
||||
if (is_valid_hex_string (bkp_pos , bkp_len ) == false) return (PARSER_HASH_ENCODING);
|
||||
|
||||
/**
|
||||
* store data
|
||||
*/
|
||||
|
||||
// iv (16 bytes)
|
||||
|
||||
ethereum_presale->iv[0] = hex_to_u32 ((const u8 *) &encseed_pos[ 0]);
|
||||
ethereum_presale->iv[1] = hex_to_u32 ((const u8 *) &encseed_pos[ 8]);
|
||||
ethereum_presale->iv[2] = hex_to_u32 ((const u8 *) &encseed_pos[16]);
|
||||
ethereum_presale->iv[3] = hex_to_u32 ((const u8 *) &encseed_pos[24]);
|
||||
|
||||
ethereum_presale->iv[0] = byte_swap_32 (ethereum_presale->iv[0]);
|
||||
ethereum_presale->iv[1] = byte_swap_32 (ethereum_presale->iv[1]);
|
||||
ethereum_presale->iv[2] = byte_swap_32 (ethereum_presale->iv[2]);
|
||||
ethereum_presale->iv[3] = byte_swap_32 (ethereum_presale->iv[3]);
|
||||
|
||||
// encseed
|
||||
|
||||
u32 *esalt_buf_ptr = ethereum_presale->enc_seed;
|
||||
|
||||
for (u32 i = 32, j = 0; i < encseed_len; i += 8, j++)
|
||||
{
|
||||
esalt_buf_ptr[j] = hex_to_u32 ((const u8 *) &encseed_pos [i]);
|
||||
|
||||
esalt_buf_ptr[j] = byte_swap_32 (esalt_buf_ptr[j]);
|
||||
}
|
||||
|
||||
ethereum_presale->enc_seed_len = (encseed_len - 32) / 2; // encseed length without IV (raw bytes, not hex)
|
||||
|
||||
// salt
|
||||
|
||||
u8 *salt_buf_ptr = (u8 *) salt->salt_buf;
|
||||
|
||||
u32 salt_len = parse_and_store_salt (salt_buf_ptr, ethaddr_pos, 40, hashconfig);
|
||||
|
||||
if (salt_len == UINT_MAX) return (PARSER_SALT_LENGTH);
|
||||
|
||||
salt->salt_len = salt_len;
|
||||
salt->salt_iter = ROUNDS_ETHEREUM_PRESALE;
|
||||
|
||||
// hash
|
||||
|
||||
digest[0] = hex_to_u32 ((const u8 *) &bkp_pos[ 0]);
|
||||
digest[1] = hex_to_u32 ((const u8 *) &bkp_pos[ 8]);
|
||||
digest[2] = hex_to_u32 ((const u8 *) &bkp_pos[16]);
|
||||
digest[3] = hex_to_u32 ((const u8 *) &bkp_pos[24]);
|
||||
|
||||
return (PARSER_OK);
|
||||
}
|
||||
|
||||
/**
|
||||
* hook functions
|
||||
*/
|
||||
@ -16384,6 +16494,7 @@ const char *strhashtype (const u32 hash_mode)
|
||||
case 16000: return HT_16000;
|
||||
case 16100: return HT_16100;
|
||||
case 16200: return HT_16200;
|
||||
case 16300: return HT_16300;
|
||||
case 99999: return HT_99999;
|
||||
}
|
||||
|
||||
@ -19838,6 +19949,58 @@ int ascii_digest (hashcat_ctx_t *hashcat_ctx, char *out_buf, const size_t out_le
|
||||
byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[4]),
|
||||
byte_swap_32 (apple_secure_notes->ZCRYPTOWRAPPEDKEY[5]));
|
||||
}
|
||||
else if (hash_mode == 16300)
|
||||
{
|
||||
ethereum_presale_t *ethereum_presales = (ethereum_presale_t *) esalts_buf;
|
||||
ethereum_presale_t *ethereum_presale = ðereum_presales[digest_cur];
|
||||
|
||||
// get the initialization vector:
|
||||
|
||||
u8 encseed[1248 + 1] = { 0 };
|
||||
|
||||
u32 iv[4];
|
||||
|
||||
iv[0] = byte_swap_32 (ethereum_presale->iv[0]);
|
||||
iv[1] = byte_swap_32 (ethereum_presale->iv[1]);
|
||||
iv[2] = byte_swap_32 (ethereum_presale->iv[2]);
|
||||
iv[3] = byte_swap_32 (ethereum_presale->iv[3]);
|
||||
|
||||
u32_to_hex_lower (iv[0], encseed + 0);
|
||||
u32_to_hex_lower (iv[1], encseed + 8);
|
||||
u32_to_hex_lower (iv[2], encseed + 16);
|
||||
u32_to_hex_lower (iv[3], encseed + 24);
|
||||
|
||||
// get the raw enc_seed (without iv):
|
||||
|
||||
u32 *enc_seed_ptr = ethereum_presale->enc_seed;
|
||||
|
||||
for (u32 i = 0, j = 32; i < ethereum_presale->enc_seed_len / 4; i++, j += 8)
|
||||
{
|
||||
u32 tmp = enc_seed_ptr[i];
|
||||
|
||||
tmp = byte_swap_32 (tmp);
|
||||
|
||||
u32_to_hex_lower (tmp, encseed + j);
|
||||
}
|
||||
|
||||
const u32 max_hex_len = (16 + ethereum_presale->enc_seed_len) * 2; // 16 bytes IV + encrypted seed (in hex)
|
||||
|
||||
const u32 max_pos = MIN (sizeof (encseed) - 1, max_hex_len);
|
||||
|
||||
encseed[max_pos] = 0;
|
||||
|
||||
// output:
|
||||
|
||||
snprintf (out_buf, out_len - 1, "%s*%s*%s*%08x%08x%08x%08x",
|
||||
SIGNATURE_ETHEREUM_PRESALE,
|
||||
encseed,
|
||||
(char *) salt.salt_buf,
|
||||
digest_buf[0],
|
||||
digest_buf[1],
|
||||
digest_buf[2],
|
||||
digest_buf[3]
|
||||
);
|
||||
}
|
||||
else if (hash_mode == 99999)
|
||||
{
|
||||
char *ptr = (char *) digest_buf;
|
||||
@ -24833,6 +24996,24 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
||||
break;
|
||||
|
||||
case 16300: hashconfig->hash_type = HASH_TYPE_PBKDF2_SHA256;
|
||||
hashconfig->salt_type = SALT_TYPE_EMBEDDED;
|
||||
hashconfig->attack_exec = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||
hashconfig->opts_type = OPTS_TYPE_PT_GENERATE_LE
|
||||
| OPTS_TYPE_ST_HEX;
|
||||
hashconfig->kern_type = KERN_TYPE_ETHEREUM_PRESALE;
|
||||
hashconfig->dgst_size = DGST_SIZE_4_8;
|
||||
hashconfig->parse_func = ethereum_presale_parse_hash;
|
||||
hashconfig->opti_type = OPTI_TYPE_ZERO_BYTE
|
||||
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||
hashconfig->dgst_pos0 = 0;
|
||||
hashconfig->dgst_pos1 = 1;
|
||||
hashconfig->dgst_pos2 = 2;
|
||||
hashconfig->dgst_pos3 = 3;
|
||||
hashconfig->st_hash = ST_HASH_16300;
|
||||
hashconfig->st_pass = ST_PASS_HASHCAT_PLAIN;
|
||||
break;
|
||||
|
||||
case 99999: hashconfig->hash_type = HASH_TYPE_PLAINTEXT;
|
||||
hashconfig->salt_type = SALT_TYPE_NONE;
|
||||
hashconfig->attack_exec = ATTACK_EXEC_INSIDE_KERNEL;
|
||||
@ -25043,6 +25224,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
case 15900: hashconfig->esalt_size = sizeof (dpapimk_t); break;
|
||||
case 16100: hashconfig->esalt_size = sizeof (tacacs_plus_t); break;
|
||||
case 16200: hashconfig->esalt_size = sizeof (apple_secure_notes_t); break;
|
||||
case 16300: hashconfig->esalt_size = sizeof (ethereum_presale_t); break;
|
||||
}
|
||||
|
||||
// hook_salt_size
|
||||
@ -25151,6 +25333,7 @@ int hashconfig_init (hashcat_ctx_t *hashcat_ctx)
|
||||
case 15600: hashconfig->tmp_size = sizeof (pbkdf2_sha256_tmp_t); break;
|
||||
case 15900: hashconfig->tmp_size = sizeof (dpapimk_tmp_v2_t); break;
|
||||
case 16200: hashconfig->tmp_size = sizeof (apple_secure_notes_tmp_t); break;
|
||||
case 16300: hashconfig->tmp_size = sizeof (pbkdf2_sha256_tmp_t); break;
|
||||
};
|
||||
|
||||
// hook_size
|
||||
@ -25781,72 +25964,76 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo
|
||||
break;
|
||||
case 16200: salt->salt_len = 16;
|
||||
break;
|
||||
case 16300: salt->salt_len = 20;
|
||||
break;
|
||||
}
|
||||
|
||||
// special esalt handling
|
||||
|
||||
switch (hashconfig->hash_mode)
|
||||
{
|
||||
case 2500: ((wpa_t *) esalt)->eapol_len = 128;
|
||||
case 2500: ((wpa_t *) esalt)->eapol_len = 128;
|
||||
break;
|
||||
case 2501: ((wpa_t *) esalt)->eapol_len = 128;
|
||||
case 2501: ((wpa_t *) esalt)->eapol_len = 128;
|
||||
break;
|
||||
case 5300: ((ikepsk_t *) esalt)->nr_len = 1;
|
||||
((ikepsk_t *) esalt)->msg_len = 1;
|
||||
case 5300: ((ikepsk_t *) esalt)->nr_len = 1;
|
||||
((ikepsk_t *) esalt)->msg_len = 1;
|
||||
break;
|
||||
case 5400: ((ikepsk_t *) esalt)->nr_len = 1;
|
||||
((ikepsk_t *) esalt)->msg_len = 1;
|
||||
case 5400: ((ikepsk_t *) esalt)->nr_len = 1;
|
||||
((ikepsk_t *) esalt)->msg_len = 1;
|
||||
break;
|
||||
case 5500: ((netntlm_t *) esalt)->user_len = 1;
|
||||
((netntlm_t *) esalt)->domain_len = 1;
|
||||
((netntlm_t *) esalt)->srvchall_len = 1;
|
||||
((netntlm_t *) esalt)->clichall_len = 1;
|
||||
case 5500: ((netntlm_t *) esalt)->user_len = 1;
|
||||
((netntlm_t *) esalt)->domain_len = 1;
|
||||
((netntlm_t *) esalt)->srvchall_len = 1;
|
||||
((netntlm_t *) esalt)->clichall_len = 1;
|
||||
break;
|
||||
case 5600: ((netntlm_t *) esalt)->user_len = 1;
|
||||
((netntlm_t *) esalt)->domain_len = 1;
|
||||
((netntlm_t *) esalt)->srvchall_len = 1;
|
||||
((netntlm_t *) esalt)->clichall_len = 1;
|
||||
case 5600: ((netntlm_t *) esalt)->user_len = 1;
|
||||
((netntlm_t *) esalt)->domain_len = 1;
|
||||
((netntlm_t *) esalt)->srvchall_len = 1;
|
||||
((netntlm_t *) esalt)->clichall_len = 1;
|
||||
break;
|
||||
case 7300: ((rakp_t *) esalt)->salt_len = 32;
|
||||
case 7300: ((rakp_t *) esalt)->salt_len = 32;
|
||||
break;
|
||||
case 10400: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 32;
|
||||
((pdf_t *) esalt)->u_len = 32;
|
||||
case 10400: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 32;
|
||||
((pdf_t *) esalt)->u_len = 32;
|
||||
break;
|
||||
case 10410: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 32;
|
||||
((pdf_t *) esalt)->u_len = 32;
|
||||
case 10410: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 32;
|
||||
((pdf_t *) esalt)->u_len = 32;
|
||||
break;
|
||||
case 10420: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 32;
|
||||
((pdf_t *) esalt)->u_len = 32;
|
||||
case 10420: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 32;
|
||||
((pdf_t *) esalt)->u_len = 32;
|
||||
break;
|
||||
case 10500: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 32;
|
||||
((pdf_t *) esalt)->u_len = 32;
|
||||
case 10500: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 32;
|
||||
((pdf_t *) esalt)->u_len = 32;
|
||||
break;
|
||||
case 10600: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 127;
|
||||
((pdf_t *) esalt)->u_len = 127;
|
||||
case 10600: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 127;
|
||||
((pdf_t *) esalt)->u_len = 127;
|
||||
break;
|
||||
case 10700: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 127;
|
||||
((pdf_t *) esalt)->u_len = 127;
|
||||
case 10700: ((pdf_t *) esalt)->id_len = 16;
|
||||
((pdf_t *) esalt)->o_len = 127;
|
||||
((pdf_t *) esalt)->u_len = 127;
|
||||
break;
|
||||
case 11400: ((sip_t *) esalt)->salt_len = 2;
|
||||
((sip_t *) esalt)->esalt_len = 39;
|
||||
case 11400: ((sip_t *) esalt)->salt_len = 2;
|
||||
((sip_t *) esalt)->esalt_len = 39;
|
||||
break;
|
||||
case 13400: ((keepass_t *) esalt)->version = 2;
|
||||
case 13400: ((keepass_t *) esalt)->version = 2;
|
||||
break;
|
||||
case 13500: ((pstoken_t *) esalt)->salt_len = 113;
|
||||
case 13500: ((pstoken_t *) esalt)->salt_len = 113;
|
||||
break;
|
||||
case 13600: ((zip2_t *) esalt)->salt_len = 16;
|
||||
((zip2_t *) esalt)->data_len = 32;
|
||||
((zip2_t *) esalt)->mode = 3;
|
||||
case 13600: ((zip2_t *) esalt)->salt_len = 16;
|
||||
((zip2_t *) esalt)->data_len = 32;
|
||||
((zip2_t *) esalt)->mode = 3;
|
||||
break;
|
||||
case 14600: ((luks_t *) esalt)->key_size = HC_LUKS_KEY_SIZE_256;
|
||||
((luks_t *) esalt)->cipher_type = HC_LUKS_CIPHER_TYPE_AES;
|
||||
((luks_t *) esalt)->cipher_mode = HC_LUKS_CIPHER_MODE_XTS_PLAIN;
|
||||
case 14600: ((luks_t *) esalt)->key_size = HC_LUKS_KEY_SIZE_256;
|
||||
((luks_t *) esalt)->cipher_type = HC_LUKS_CIPHER_TYPE_AES;
|
||||
((luks_t *) esalt)->cipher_mode = HC_LUKS_CIPHER_MODE_XTS_PLAIN;
|
||||
break;
|
||||
case 16300: ((ethereum_presale_t *) esalt)->enc_seed_len = 608;
|
||||
break;
|
||||
}
|
||||
|
||||
@ -26054,6 +26241,8 @@ void hashconfig_benchmark_defaults (hashcat_ctx_t *hashcat_ctx, salt_t *salt, vo
|
||||
break;
|
||||
case 16200: salt->salt_iter = ROUNDS_APPLE_SECURE_NOTES - 1;
|
||||
break;
|
||||
case 16300: salt->salt_iter = ROUNDS_ETHEREUM_PRESALE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -362,6 +362,7 @@ static const char *const USAGE_BIG[] =
|
||||
" 15500 | JKS Java Key Store Private Keys (SHA1) | Password Managers",
|
||||
" 15600 | Ethereum Wallet, PBKDF2-HMAC-SHA256 | Password Managers",
|
||||
" 15700 | Ethereum Wallet, SCRYPT | Password Managers",
|
||||
" 16300 | Ethereum Pre-Sale Wallet, PBKDF2-HMAC-SHA256 | Password Managers",
|
||||
" 99999 | Plaintext | Plaintext",
|
||||
"",
|
||||
"- [ Outfile Formats ] -",
|
||||
|
||||
100
tools/test.pl
100
tools/test.pl
@ -50,7 +50,7 @@ my $hashcat = "./hashcat";
|
||||
|
||||
my $MAX_LEN = 55;
|
||||
|
||||
my @modes = (0, 10, 11, 12, 20, 21, 22, 23, 30, 40, 50, 60, 100, 101, 110, 111, 112, 120, 121, 122, 125, 130, 131, 132, 133, 140, 141, 150, 160, 200, 300, 400, 500, 600, 900, 1000, 1100, 1300, 1400, 1410, 1411, 1420, 1430, 1440, 1441, 1450, 1460, 1500, 1600, 1700, 1710, 1711, 1720, 1730, 1740, 1722, 1731, 1750, 1760, 1800, 2100, 2400, 2410, 2500, 2600, 2611, 2612, 2711, 2811, 3000, 3100, 3200, 3710, 3711, 3300, 3500, 3610, 3720, 3800, 3910, 4010, 4110, 4210, 4300, 4400, 4500, 4520, 4521, 4522, 4600, 4700, 4800, 4900, 5000, 5100, 5300, 5400, 5500, 5600, 5700, 5800, 6000, 6100, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7000, 7100, 7200, 7300, 7400, 7500, 7700, 7800, 7900, 8000, 8100, 8200, 8300, 8400, 8500, 8600, 8700, 8900, 9100, 9200, 9300, 9400, 9500, 9600, 9700, 9800, 9900, 10000, 10100, 10200, 10300, 10400, 10500, 10600, 10700, 10800, 10900, 11000, 11100, 11200, 11300, 11400, 11500, 11600, 11900, 12000, 12001, 12100, 12200, 12300, 12400, 12600, 12700, 12800, 12900, 13000, 13100, 13200, 13300, 13400, 13500, 13600, 13800, 13900, 14000, 14100, 14400, 14700, 14800, 14900, 15000, 15100, 15200, 15300, 15400, 15500, 15600, 15700, 15900, 16000, 16100, 16200, 99999);
|
||||
my @modes = (0, 10, 11, 12, 20, 21, 22, 23, 30, 40, 50, 60, 100, 101, 110, 111, 112, 120, 121, 122, 125, 130, 131, 132, 133, 140, 141, 150, 160, 200, 300, 400, 500, 600, 900, 1000, 1100, 1300, 1400, 1410, 1411, 1420, 1430, 1440, 1441, 1450, 1460, 1500, 1600, 1700, 1710, 1711, 1720, 1730, 1740, 1722, 1731, 1750, 1760, 1800, 2100, 2400, 2410, 2500, 2600, 2611, 2612, 2711, 2811, 3000, 3100, 3200, 3710, 3711, 3300, 3500, 3610, 3720, 3800, 3910, 4010, 4110, 4210, 4300, 4400, 4500, 4520, 4521, 4522, 4600, 4700, 4800, 4900, 5000, 5100, 5300, 5400, 5500, 5600, 5700, 5800, 6000, 6100, 6300, 6400, 6500, 6600, 6700, 6800, 6900, 7000, 7100, 7200, 7300, 7400, 7500, 7700, 7800, 7900, 8000, 8100, 8200, 8300, 8400, 8500, 8600, 8700, 8900, 9100, 9200, 9300, 9400, 9500, 9600, 9700, 9800, 9900, 10000, 10100, 10200, 10300, 10400, 10500, 10600, 10700, 10800, 10900, 11000, 11100, 11200, 11300, 11400, 11500, 11600, 11900, 12000, 12001, 12100, 12200, 12300, 12400, 12600, 12700, 12800, 12900, 13000, 13100, 13200, 13300, 13400, 13500, 13600, 13800, 13900, 14000, 14100, 14400, 14700, 14800, 14900, 15000, 15100, 15200, 15300, 15400, 15500, 15600, 15700, 15900, 16000, 16100, 16200, 16300, 99999);
|
||||
|
||||
my %is_utf16le = map { $_ => 1 } qw (30 40 130 131 132 133 140 141 1000 1100 1430 1440 1441 1730 1740 1731 5500 5600 8000 9400 9500 9600 9700 9800 11600 13500 13800);
|
||||
my %less_fifteen = map { $_ => 1 } qw (500 1600 1800 3200 6300 7400 10500 10700);
|
||||
@ -2843,6 +2843,32 @@ sub verify
|
||||
|
||||
next unless (exists ($db->{$hash_in}) and (! defined ($db->{$hash_in})));
|
||||
}
|
||||
# Ethereum Pre-Sale - PBKDF2
|
||||
elsif ($mode == 16300)
|
||||
{
|
||||
my $index1 = index ($line, ':');
|
||||
|
||||
next if ($index1 < 0);
|
||||
|
||||
$hash_in = substr ($line, 0, $index1);
|
||||
$word = substr ($line, $index1 + 1);
|
||||
|
||||
next if (length ($hash_in) < 12);
|
||||
|
||||
next unless (substr ($hash_in, 0, 12) eq "\$ethereum\$w\*");
|
||||
|
||||
my @data = split ('\*', $hash_in);
|
||||
|
||||
next unless (scalar (@data) == 4);
|
||||
|
||||
$param = pack ("H*", $data[1]); # encseed
|
||||
|
||||
$salt = $data[2]; # ethaddr
|
||||
|
||||
$param2 = pack ("H*", $data[3]); # bpk (the iv + keccak digest)
|
||||
|
||||
next unless (exists ($db->{$hash_in}) and (! defined ($db->{$hash_in})));
|
||||
}
|
||||
else
|
||||
{
|
||||
print "ERROR: hash mode is not supported\n";
|
||||
@ -3274,6 +3300,14 @@ sub verify
|
||||
|
||||
return unless (substr ($line, 0, $len) eq $hash_out);
|
||||
}
|
||||
elsif ($mode == 16300)
|
||||
{
|
||||
$hash_out = gen_hash ($mode, $word, $salt, 0, $param, $param2);
|
||||
|
||||
$len = length $hash_out;
|
||||
|
||||
return unless (substr ($line, 0, $len) eq $hash_out);
|
||||
}
|
||||
else
|
||||
{
|
||||
$hash_out = gen_hash ($mode, $word, $salt, $iter);
|
||||
@ -3592,7 +3626,7 @@ sub passthrough
|
||||
|
||||
$tmp_hash = gen_hash ($mode, $word_buf, $salt_buf);
|
||||
}
|
||||
elsif ($mode == 8400 || $mode == 11200)
|
||||
elsif ($mode == 8400 || $mode == 11200 || $mode == 16300)
|
||||
{
|
||||
$tmp_hash = gen_hash ($mode, $word_buf, substr ($salt_buf, 0, 40));
|
||||
}
|
||||
@ -4356,7 +4390,7 @@ sub single
|
||||
}
|
||||
}
|
||||
}
|
||||
elsif ($mode == 8400 || $mode == 11200 || $mode == 14700 || $mode == 14800)
|
||||
elsif ($mode == 8400 || $mode == 11200 || $mode == 14700 || $mode == 14800 || $mode == 16300)
|
||||
{
|
||||
for (my $i = 1; $i < 32; $i++)
|
||||
{
|
||||
@ -9240,6 +9274,66 @@ END_CODE
|
||||
|
||||
$tmp_hash = sprintf ('$ASN$*%d*%d*%s*%s', $Z_PK, $iterations, unpack ("H*", $salt_bin), unpack ("H*", $blob_bin));
|
||||
}
|
||||
elsif ($mode == 16300)
|
||||
{
|
||||
my $ethaddr = $salt_buf;
|
||||
|
||||
my $iv = "";
|
||||
my $seed = "";
|
||||
my $encseed = "";
|
||||
|
||||
# setup pbkdf2 params:
|
||||
|
||||
my $pbkdf2 = Crypt::PBKDF2->new
|
||||
(
|
||||
hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 256),
|
||||
iterations => 2000,
|
||||
output_len => 16
|
||||
);
|
||||
|
||||
my $key = $pbkdf2->PBKDF2 ($word_buf, $word_buf);
|
||||
|
||||
if (defined $additional_param)
|
||||
{
|
||||
$iv = substr ($additional_param, 0, 16);
|
||||
$encseed = substr ($additional_param, 16);
|
||||
|
||||
# AES-128-CBC decrypt:
|
||||
|
||||
my $aes_cbc = Crypt::CBC->new ({
|
||||
key => $key,
|
||||
cipher => "Crypt::Rijndael",
|
||||
iv => $iv,
|
||||
literal_key => 1,
|
||||
header => "none",
|
||||
keysize => 16
|
||||
});
|
||||
|
||||
$seed = $aes_cbc->decrypt ($encseed);
|
||||
}
|
||||
else
|
||||
{
|
||||
$iv = randbytes (16);
|
||||
$seed = randbytes (592);
|
||||
|
||||
# AES-128-CBC encrypt:
|
||||
|
||||
my $aes_cbc = Crypt::CBC->new ({
|
||||
key => $key,
|
||||
cipher => "Crypt::Rijndael",
|
||||
iv => $iv,
|
||||
literal_key => 1,
|
||||
header => "none",
|
||||
keysize => 16
|
||||
});
|
||||
|
||||
$encseed = $aes_cbc->encrypt ($seed);
|
||||
}
|
||||
|
||||
$hash_buf = keccak_256_hex ($seed . "\x02");
|
||||
|
||||
$tmp_hash = sprintf ("\$ethereum\$w*%s*%s*%s", unpack ("H*", $iv . $encseed), $ethaddr, substr ($hash_buf, 0, 32));
|
||||
}
|
||||
elsif ($mode == 99999)
|
||||
{
|
||||
$tmp_hash = sprintf ("%s", $word_buf);
|
||||
|
||||
@ -9,7 +9,7 @@ TDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||
|
||||
# missing hash types: 5200,6251,6261,6271,6281
|
||||
|
||||
HASH_TYPES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 125 130 131 132 133 140 141 150 160 200 300 400 500 600 900 1000 1100 1300 1400 1410 1411 1420 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 3910 4010 4110 4300 4400 4500 4520 4521 4522 4700 4800 4900 5000 5100 5300 5400 5500 5600 5700 5800 6000 6100 6211 6212 6213 6221 6222 6223 6231 6232 6233 6241 6242 6243 6300 6400 6500 6600 6700 6800 6900 7000 7100 7200 7300 7400 7500 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8900 9100 9200 9300 9400 9500 9600 9700 9800 9900 10000 10100 10200 10300 10400 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11900 12000 12001 12100 12200 12300 12400 12600 12700 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 13900 14000 14100 14400 14600 14700 14800 14900 15000 15100 15200 15300 15400 15500 15600 15700 15900 16000 16100 16200 99999"
|
||||
HASH_TYPES="0 10 11 12 20 21 22 23 30 40 50 60 100 101 110 111 112 120 121 122 125 130 131 132 133 140 141 150 160 200 300 400 500 600 900 1000 1100 1300 1400 1410 1411 1420 1430 1440 1441 1450 1460 1500 1600 1700 1710 1711 1720 1722 1730 1731 1740 1750 1760 1800 2100 2400 2410 2500 2600 2611 2612 2711 2811 3000 3100 3200 3710 3711 3800 3910 4010 4110 4300 4400 4500 4520 4521 4522 4700 4800 4900 5000 5100 5300 5400 5500 5600 5700 5800 6000 6100 6211 6212 6213 6221 6222 6223 6231 6232 6233 6241 6242 6243 6300 6400 6500 6600 6700 6800 6900 7000 7100 7200 7300 7400 7500 7700 7800 7900 8000 8100 8200 8300 8400 8500 8600 8700 8900 9100 9200 9300 9400 9500 9600 9700 9800 9900 10000 10100 10200 10300 10400 10500 10600 10700 10800 10900 11000 11100 11200 11300 11400 11500 11600 11900 12000 12001 12100 12200 12300 12400 12600 12700 12800 12900 13000 13100 13200 13300 13400 13500 13600 13800 13900 14000 14100 14400 14600 14700 14800 14900 15000 15100 15200 15300 15400 15500 15600 15700 15900 16000 16100 16200 16300 99999"
|
||||
|
||||
#ATTACK_MODES="0 1 3 6 7"
|
||||
ATTACK_MODES="0 1 3 7"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user