Add module and kernel for -m 31800

pull/3677/head
jsteube 1 year ago
parent 1c6c650931
commit 3df97954c6

@ -0,0 +1,459 @@
/**
* 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 onepassword8
{
u32 hkdf_salt_buf[8];
u32 hkdf_key_buf[8];
u32 iv_buf[4];
u32 tag_buf[4];
u32 email_buf[64];
int email_len;
u32 ct_buf[1024];
int ct_len;
} onepassword8_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 m31800_init (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, onepassword8_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];
u32 salt_buf[16];
salt_buf[ 0] = esalt_bufs[DIGESTS_OFFSET_HOST].hkdf_salt_buf[0];
salt_buf[ 1] = esalt_bufs[DIGESTS_OFFSET_HOST].hkdf_salt_buf[1];
salt_buf[ 2] = esalt_bufs[DIGESTS_OFFSET_HOST].hkdf_salt_buf[2];
salt_buf[ 3] = esalt_bufs[DIGESTS_OFFSET_HOST].hkdf_salt_buf[3];
salt_buf[ 4] = esalt_bufs[DIGESTS_OFFSET_HOST].hkdf_salt_buf[4];
salt_buf[ 5] = esalt_bufs[DIGESTS_OFFSET_HOST].hkdf_salt_buf[5];
salt_buf[ 6] = esalt_bufs[DIGESTS_OFFSET_HOST].hkdf_salt_buf[6];
salt_buf[ 7] = esalt_bufs[DIGESTS_OFFSET_HOST].hkdf_salt_buf[7];
salt_buf[ 8] = 0;
salt_buf[ 9] = 0;
salt_buf[10] = 0;
salt_buf[11] = 0;
salt_buf[12] = 0;
salt_buf[13] = 0;
salt_buf[14] = 0;
salt_buf[15] = 0;
sha256_hmac_update (&sha256_hmac_ctx, salt_buf, 32);
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 m31800_loop (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, onepassword8_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 m31800_comp (KERN_ATTR_TMPS_ESALT (pbkdf2_sha256_tmp_t, onepassword8_t))
{
const u64 gid = get_global_id (0);
const u64 lid = get_local_id (0);
const u64 lsz = get_local_size (0);
/**
* aes shared
*/
#ifdef REAL_SHM
LOCAL_VK u32 s_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;
const u32 digest_pos = LOOP_POS;
const u32 digest_cur = DIGESTS_OFFSET_HOST + digest_pos;
GLOBAL_AS const onepassword8_t *onepassword8 = &esalt_bufs[digest_cur];
// keys
u32 hkdf_key[8];
hkdf_key[0] = onepassword8->hkdf_key_buf[0];
hkdf_key[1] = onepassword8->hkdf_key_buf[1];
hkdf_key[2] = onepassword8->hkdf_key_buf[2];
hkdf_key[3] = onepassword8->hkdf_key_buf[3];
hkdf_key[4] = onepassword8->hkdf_key_buf[4];
hkdf_key[5] = onepassword8->hkdf_key_buf[5];
hkdf_key[6] = onepassword8->hkdf_key_buf[6];
hkdf_key[7] = onepassword8->hkdf_key_buf[7];
u32 out[8];
out[0] = tmps[gid].out[0];
out[1] = tmps[gid].out[1];
out[2] = tmps[gid].out[2];
out[3] = tmps[gid].out[3];
out[4] = tmps[gid].out[4];
out[5] = tmps[gid].out[5];
out[6] = tmps[gid].out[6];
out[7] = tmps[gid].out[7];
u32 muk[8];
muk[0] = out[0] ^ hkdf_key[0];
muk[1] = out[1] ^ hkdf_key[1];
muk[2] = out[2] ^ hkdf_key[2];
muk[3] = out[3] ^ hkdf_key[3];
muk[4] = out[4] ^ hkdf_key[4];
muk[5] = out[5] ^ hkdf_key[5];
muk[6] = out[6] ^ hkdf_key[6];
muk[7] = out[7] ^ hkdf_key[7];
u32 key_len = 32 * 8;
u32 key[60] = { 0 };
u32 subKey[4] = { 0 };
AES_GCM_Init (muk, key_len, key, subKey, s_te0, s_te1, s_te2, s_te3, s_te4);
// iv
u32 iv[4];
iv[0] = onepassword8->iv_buf[0];
iv[1] = onepassword8->iv_buf[1];
iv[2] = onepassword8->iv_buf[2];
iv[3] = onepassword8->iv_buf[3];
const u32 iv_len = 16;
u32 J0[4] = { 0 };
AES_GCM_Prepare_J0 (iv, iv_len, subKey, J0);
u32 ct[8];
ct[0] = onepassword8->ct_buf[0];
ct[1] = onepassword8->ct_buf[1];
ct[2] = onepassword8->ct_buf[2];
ct[3] = onepassword8->ct_buf[3];
ct[4] = onepassword8->ct_buf[4];
ct[5] = onepassword8->ct_buf[5];
ct[6] = onepassword8->ct_buf[6];
ct[7] = onepassword8->ct_buf[7];
u32 pt[8] = { 0 };
AES_GCM_decrypt (key, J0, ct, 32, pt, s_te0, s_te1, s_te2, s_te3, s_te4);
const int correct = is_valid_printable_32 (pt[0])
+ is_valid_printable_32 (pt[1])
+ is_valid_printable_32 (pt[2])
+ is_valid_printable_32 (pt[3])
+ is_valid_printable_32 (pt[4])
+ is_valid_printable_32 (pt[5])
+ is_valid_printable_32 (pt[6])
+ is_valid_printable_32 (pt[7]);
if (correct != 8) return;
/*
const int pt_len = 28; // not using 32 byte but 28 because our UTF8 allows up to 4 byte per character and since we decrypt 32 byte
// only we can't garantee it is not in the middle of a UTF8 byte stream at that point
if (hc_enc_scan (pt, pt_len))
{
hc_enc_t hc_enc;
hc_enc_init (&hc_enc);
while (hc_enc_has_next (&hc_enc, pt_len))
{
u32 enc_buf[16] = { 0 };
const int enc_len = hc_enc_next (&hc_enc, pt, pt_len, 32, enc_buf, sizeof (enc_buf));
if (enc_len == -1) return;
}
}
*/
const u32 r0 = ct[0];
const u32 r1 = ct[1];
const u32 r2 = ct[2];
const u32 r3 = ct[3];
#define il_pos 0
#ifdef KERNEL_STATIC
#include COMPARE_M
#endif
}

@ -0,0 +1,448 @@
/**
* 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_PASSWORD_MANAGER;
static const char *HASH_NAME = "1Password, mobilekeychain (1Password 8)";
static const u64 KERN_TYPE = 31800;
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
| OPTS_TYPE_DEEP_COMP_KERNEL;
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "$mobilekeychain$31800@hashcat.net$0226802599846590531367298686059042845608249051353268870564348733$fa53b7d424cdd36667dc12e585810729efc8ea9b2f8e5dd7a3ee72f7576a6788$100000$e1fea241e7b7c84535a0d53388bccbb9$dfd5f9ad6da1a72a47a3c04e03b02142b2fc301b3afff610669058527828a0e0388f5a2b0e6909813a5f9653c54f797adf0869107f4b875d4beb736cfbcec428ca19fc28346642fa32ec00f2ca4ad8dcf119af33cb247273e7b7427fd20eae8fb992779979a5e25aa465b3954794f62f4ea85355032efcd4e43ae3db6b14720d1dda963a384c37b521a92cef3494f77580edab210987ebcf2f0f7ed0220c0a4777be693e075b5f1e1302$995f3703b8ea4519f8cdc1cbded4d595";
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 onepassword8
{
u32 hkdf_salt_buf[8];
u32 hkdf_key_buf[8];
u32 iv_buf[4];
u32 tag_buf[4];
u32 email_buf[64];
int email_len;
u32 ct_buf[1024];
int ct_len;
} onepassword8_t;
static const char *SIGNATURE_1PASSWORD8 = "$mobilekeychain$";
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;
}
u32 module_deep_comp_kernel (MAYBE_UNUSED const hashes_t *hashes, MAYBE_UNUSED const u32 salt_pos, MAYBE_UNUSED const u32 digest_pos)
{
return KERN_RUN_3;
}
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 (onepassword8_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_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;
onepassword8_t *onepassword8 = (onepassword8_t *) esalt_buf;
hc_token_t token;
token.token_cnt = 8;
token.signatures_cnt = 1;
token.signatures_buf[0] = SIGNATURE_1PASSWORD8;
token.len[0] = 16;
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
| TOKEN_ATTR_VERIFY_SIGNATURE;
token.sep[1] = '$';
token.len_min[1] = 0;
token.len_max[1] = 255;
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH;
token.sep[2] = '$';
token.len_min[2] = 64;
token.len_max[2] = 64;
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX;
token.sep[3] = '$';
token.len_min[3] = 64;
token.len_max[3] = 64;
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX;
token.sep[4] = '$';
token.len_min[4] = 1;
token.len_max[4] = 10;
token.attr[4] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_DIGIT;
token.sep[5] = '$';
token.len_min[5] = 32;
token.len_max[5] = 32;
token.attr[5] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX;
token.sep[6] = '$';
token.len_min[6] = 16;
token.len_max[6] = 4096;
token.attr[6] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX;
token.sep[7] = '$';
token.len_min[7] = 32;
token.len_max[7] = 32;
token.attr[7] = TOKEN_ATTR_VERIFY_LENGTH
| TOKEN_ATTR_VERIFY_HEX;
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
// email
const int email_len = token.len[1];
const u8 *email_pos = token.buf[1];
onepassword8->email_len = email_len;
memcpy ((void *) onepassword8->email_buf, email_pos, email_len);
u8 *ptr = (u8 *) onepassword8->email_buf;
ptr[email_len] = 0;
// hkdf_salt
//const int hkdf_salt_len = token.len[2];
const u8 *hkdf_salt_pos = token.buf[2];
onepassword8->hkdf_salt_buf[0] = hex_to_u32 (hkdf_salt_pos + 0);
onepassword8->hkdf_salt_buf[1] = hex_to_u32 (hkdf_salt_pos + 8);
onepassword8->hkdf_salt_buf[2] = hex_to_u32 (hkdf_salt_pos + 16);
onepassword8->hkdf_salt_buf[3] = hex_to_u32 (hkdf_salt_pos + 24);
onepassword8->hkdf_salt_buf[4] = hex_to_u32 (hkdf_salt_pos + 32);
onepassword8->hkdf_salt_buf[5] = hex_to_u32 (hkdf_salt_pos + 40);
onepassword8->hkdf_salt_buf[6] = hex_to_u32 (hkdf_salt_pos + 48);
onepassword8->hkdf_salt_buf[7] = hex_to_u32 (hkdf_salt_pos + 56);
onepassword8->hkdf_salt_buf[0] = byte_swap_32 (onepassword8->hkdf_salt_buf[0]);
onepassword8->hkdf_salt_buf[1] = byte_swap_32 (onepassword8->hkdf_salt_buf[1]);
onepassword8->hkdf_salt_buf[2] = byte_swap_32 (onepassword8->hkdf_salt_buf[2]);
onepassword8->hkdf_salt_buf[3] = byte_swap_32 (onepassword8->hkdf_salt_buf[3]);
onepassword8->hkdf_salt_buf[4] = byte_swap_32 (onepassword8->hkdf_salt_buf[4]);
onepassword8->hkdf_salt_buf[5] = byte_swap_32 (onepassword8->hkdf_salt_buf[5]);
onepassword8->hkdf_salt_buf[6] = byte_swap_32 (onepassword8->hkdf_salt_buf[6]);
onepassword8->hkdf_salt_buf[7] = byte_swap_32 (onepassword8->hkdf_salt_buf[7]);
// hkdf_key
//const int hkdf_key_len = token.len[3];
const u8 *hkdf_key_pos = token.buf[3];
onepassword8->hkdf_key_buf[0] = hex_to_u32 (hkdf_key_pos + 0);
onepassword8->hkdf_key_buf[1] = hex_to_u32 (hkdf_key_pos + 8);
onepassword8->hkdf_key_buf[2] = hex_to_u32 (hkdf_key_pos + 16);
onepassword8->hkdf_key_buf[3] = hex_to_u32 (hkdf_key_pos + 24);
onepassword8->hkdf_key_buf[4] = hex_to_u32 (hkdf_key_pos + 32);
onepassword8->hkdf_key_buf[5] = hex_to_u32 (hkdf_key_pos + 40);
onepassword8->hkdf_key_buf[6] = hex_to_u32 (hkdf_key_pos + 48);
onepassword8->hkdf_key_buf[7] = hex_to_u32 (hkdf_key_pos + 56);
onepassword8->hkdf_key_buf[0] = byte_swap_32 (onepassword8->hkdf_key_buf[0]);
onepassword8->hkdf_key_buf[1] = byte_swap_32 (onepassword8->hkdf_key_buf[1]);
onepassword8->hkdf_key_buf[2] = byte_swap_32 (onepassword8->hkdf_key_buf[2]);
onepassword8->hkdf_key_buf[3] = byte_swap_32 (onepassword8->hkdf_key_buf[3]);
onepassword8->hkdf_key_buf[4] = byte_swap_32 (onepassword8->hkdf_key_buf[4]);
onepassword8->hkdf_key_buf[5] = byte_swap_32 (onepassword8->hkdf_key_buf[5]);
onepassword8->hkdf_key_buf[6] = byte_swap_32 (onepassword8->hkdf_key_buf[6]);
onepassword8->hkdf_key_buf[7] = byte_swap_32 (onepassword8->hkdf_key_buf[7]);
// iter
const u8 *iter_pos = token.buf[4];
salt->salt_iter = hc_strtoul ((const char *) iter_pos, NULL, 10) - 1;
// iv
//const int iv_len = token.len[5];
const u8 *iv_pos = token.buf[5];
onepassword8->iv_buf[0] = hex_to_u32 (iv_pos + 0);
onepassword8->iv_buf[1] = hex_to_u32 (iv_pos + 8);
onepassword8->iv_buf[2] = hex_to_u32 (iv_pos + 16);
onepassword8->iv_buf[3] = hex_to_u32 (iv_pos + 24);
onepassword8->iv_buf[0] = byte_swap_32 (onepassword8->iv_buf[0]);
onepassword8->iv_buf[1] = byte_swap_32 (onepassword8->iv_buf[1]);
onepassword8->iv_buf[2] = byte_swap_32 (onepassword8->iv_buf[2]);
onepassword8->iv_buf[3] = byte_swap_32 (onepassword8->iv_buf[3]);
// ct
const int ct_len = token.len[6];
const u8 *ct_pos = token.buf[6];
onepassword8->ct_len = hex_decode (ct_pos, ct_len, (u8 *) onepassword8->ct_buf);
for (int i = 0; i < 1024; i++) onepassword8->ct_buf[i] = byte_swap_32 (onepassword8->ct_buf[i]);
// tag
//const int tag_len = token.len[7];
const u8 *tag_pos = token.buf[7];
onepassword8->tag_buf[0] = hex_to_u32 (tag_pos + 0);
onepassword8->tag_buf[1] = hex_to_u32 (tag_pos + 8);
onepassword8->tag_buf[2] = hex_to_u32 (tag_pos + 16);
onepassword8->tag_buf[3] = hex_to_u32 (tag_pos + 24);
onepassword8->tag_buf[0] = byte_swap_32 (onepassword8->tag_buf[0]);
onepassword8->tag_buf[1] = byte_swap_32 (onepassword8->tag_buf[1]);
onepassword8->tag_buf[2] = byte_swap_32 (onepassword8->tag_buf[2]);
onepassword8->tag_buf[3] = byte_swap_32 (onepassword8->tag_buf[3]);
// salt
salt->salt_buf[0] = onepassword8->hkdf_salt_buf[0];
salt->salt_buf[1] = onepassword8->hkdf_salt_buf[1];
salt->salt_buf[2] = onepassword8->hkdf_salt_buf[2];
salt->salt_buf[3] = onepassword8->hkdf_salt_buf[3];
salt->salt_buf[4] = onepassword8->hkdf_salt_buf[4];
salt->salt_buf[5] = onepassword8->hkdf_salt_buf[5];
salt->salt_buf[6] = onepassword8->hkdf_salt_buf[6];
salt->salt_buf[7] = onepassword8->hkdf_salt_buf[7];
salt->salt_len = 32;
// digest
digest[0] = onepassword8->ct_buf[0];
digest[1] = onepassword8->ct_buf[1];
digest[2] = onepassword8->ct_buf[2];
digest[3] = onepassword8->ct_buf[3];
return (PARSER_OK);
}
int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size)
{
// const u32 *digest = (const u32 *) digest_buf;
onepassword8_t *onepassword8 = (onepassword8_t *) esalt_buf;
// ct
u32 ct_buf[1024];
for (int i = 0; i < 1024; i++) ct_buf[i] = byte_swap_32 (onepassword8->ct_buf[i]);
u8 ct_buf8[1024 * 4];
const int ct_len = hex_encode ((const u8 *) ct_buf, onepassword8->ct_len, ct_buf8);
ct_buf8[ct_len] = 0;
// final
int out_len = snprintf ((char *) line_buf, line_size, "%s%s$%08x%08x%08x%08x%08x%08x%08x%08x$%08x%08x%08x%08x%08x%08x%08x%08x$%u$%08x%08x%08x%08x$%s$%08x%08x%08x%08x",
SIGNATURE_1PASSWORD8,
(char *) onepassword8->email_buf,
onepassword8->hkdf_salt_buf[0],
onepassword8->hkdf_salt_buf[1],
onepassword8->hkdf_salt_buf[2],
onepassword8->hkdf_salt_buf[3],
onepassword8->hkdf_salt_buf[4],
onepassword8->hkdf_salt_buf[5],
onepassword8->hkdf_salt_buf[6],
onepassword8->hkdf_salt_buf[7],
onepassword8->hkdf_key_buf[0],
onepassword8->hkdf_key_buf[1],
onepassword8->hkdf_key_buf[2],
onepassword8->hkdf_key_buf[3],
onepassword8->hkdf_key_buf[4],
onepassword8->hkdf_key_buf[5],
onepassword8->hkdf_key_buf[6],
onepassword8->hkdf_key_buf[7],
salt->salt_iter + 1,
onepassword8->iv_buf[0],
onepassword8->iv_buf[1],
onepassword8->iv_buf[2],
onepassword8->iv_buf[3],
(char *) ct_buf8,
onepassword8->tag_buf[0],
onepassword8->tag_buf[1],
onepassword8->tag_buf[2],
onepassword8->tag_buf[3]);
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_deep_comp_kernel;
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_DEFAULT;
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;
}
Loading…
Cancel
Save