From 00ba7168fe9964f0d6297505d809274e90ecc78d Mon Sep 17 00:00:00 2001 From: philsmd Date: Fri, 14 Aug 2020 16:18:29 +0200 Subject: [PATCH] fixes #2510: Added -m 23500/23600 = AxCrypt 2 AES-128/256 --- OpenCL/m23500-pure.cl | 521 +++++++++++++++++++++++++++++++++ OpenCL/m23600-pure.cl | 537 +++++++++++++++++++++++++++++++++++ docs/changes.txt | 2 + docs/readme.txt | 2 + src/modules/module_23500.c | 363 +++++++++++++++++++++++ src/modules/module_23600.c | 363 +++++++++++++++++++++++ tools/test_modules/m23500.pm | 145 ++++++++++ tools/test_modules/m23600.pm | 142 +++++++++ 8 files changed, 2075 insertions(+) create mode 100644 OpenCL/m23500-pure.cl create mode 100644 OpenCL/m23600-pure.cl create mode 100644 src/modules/module_23500.c create mode 100644 src/modules/module_23600.c create mode 100644 tools/test_modules/m23500.pm create mode 100644 tools/test_modules/m23600.pm diff --git a/OpenCL/m23500-pure.cl b/OpenCL/m23500-pure.cl new file mode 100644 index 000000000..d884b1821 --- /dev/null +++ b/OpenCL/m23500-pure.cl @@ -0,0 +1,521 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#define NEW_SIMD_CODE + +#ifdef KERNEL_STATIC +#include "inc_vendor.h" +#include "inc_types.h" +#include "inc_platform.cl" +#include "inc_common.cl" +#include "inc_simd.cl" +#include "inc_hash_sha512.cl" +#include "inc_cipher_aes.cl" +#endif + +typedef struct axcrypt2 +{ + u32 salt[16]; + u32 data[36]; + +} axcrypt2_t; + +typedef struct axcrypt2_tmp +{ + u64 ipad[8]; + u64 opad[8]; + + u64 dgst[8]; + u64 out[8]; + + u32 KEK[4]; + u32 data[36]; + +} axcrypt2_tmp_t; + +DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, u64x *ipad, u64x *opad, u64x *digest) +{ + digest[0] = ipad[0]; + digest[1] = ipad[1]; + digest[2] = ipad[2]; + digest[3] = ipad[3]; + digest[4] = ipad[4]; + digest[5] = ipad[5]; + digest[6] = ipad[6]; + digest[7] = ipad[7]; + + sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); + + w0[0] = h32_from_64 (digest[0]); + w0[1] = l32_from_64 (digest[0]); + w0[2] = h32_from_64 (digest[1]); + w0[3] = l32_from_64 (digest[1]); + w1[0] = h32_from_64 (digest[2]); + w1[1] = l32_from_64 (digest[2]); + w1[2] = h32_from_64 (digest[3]); + w1[3] = l32_from_64 (digest[3]); + w2[0] = h32_from_64 (digest[4]); + w2[1] = l32_from_64 (digest[4]); + w2[2] = h32_from_64 (digest[5]); + w2[3] = l32_from_64 (digest[5]); + w3[0] = h32_from_64 (digest[6]); + w3[1] = l32_from_64 (digest[6]); + w3[2] = h32_from_64 (digest[7]); + w3[3] = l32_from_64 (digest[7]); + w4[0] = 0x80000000; + w4[1] = 0; + w4[2] = 0; + w4[3] = 0; + w5[0] = 0; + w5[1] = 0; + w5[2] = 0; + w5[3] = 0; + w6[0] = 0; + w6[1] = 0; + w6[2] = 0; + w6[3] = 0; + w7[0] = 0; + w7[1] = 0; + w7[2] = 0; + w7[3] = (128 + 64) * 8; + + digest[0] = opad[0]; + digest[1] = opad[1]; + digest[2] = opad[2]; + digest[3] = opad[3]; + digest[4] = opad[4]; + digest[5] = opad[5]; + digest[6] = opad[6]; + digest[7] = opad[7]; + + sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); +} + +KERNEL_FQ void m23500_init (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + sha512_hmac_ctx_t sha512_hmac_ctx; + + sha512_hmac_init_global_swap (&sha512_hmac_ctx, pws[gid].i, pws[gid].pw_len); + + tmps[gid].ipad[0] = sha512_hmac_ctx.ipad.h[0]; + tmps[gid].ipad[1] = sha512_hmac_ctx.ipad.h[1]; + tmps[gid].ipad[2] = sha512_hmac_ctx.ipad.h[2]; + tmps[gid].ipad[3] = sha512_hmac_ctx.ipad.h[3]; + tmps[gid].ipad[4] = sha512_hmac_ctx.ipad.h[4]; + tmps[gid].ipad[5] = sha512_hmac_ctx.ipad.h[5]; + tmps[gid].ipad[6] = sha512_hmac_ctx.ipad.h[6]; + tmps[gid].ipad[7] = sha512_hmac_ctx.ipad.h[7]; + + tmps[gid].opad[0] = sha512_hmac_ctx.opad.h[0]; + tmps[gid].opad[1] = sha512_hmac_ctx.opad.h[1]; + tmps[gid].opad[2] = sha512_hmac_ctx.opad.h[2]; + tmps[gid].opad[3] = sha512_hmac_ctx.opad.h[3]; + tmps[gid].opad[4] = sha512_hmac_ctx.opad.h[4]; + tmps[gid].opad[5] = sha512_hmac_ctx.opad.h[5]; + tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; + tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; + + sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[salt_pos].salt_buf, salt_bufs[salt_pos].salt_len); + + for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) + { + sha512_hmac_ctx_t sha512_hmac_ctx2 = sha512_hmac_ctx; + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + u32 w4[4]; + u32 w5[4]; + u32 w6[4]; + u32 w7[4]; + + w0[0] = j; + w0[1] = 0; + w0[2] = 0; + w0[3] = 0; + w1[0] = 0; + w1[1] = 0; + w1[2] = 0; + w1[3] = 0; + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + w4[0] = 0; + w4[1] = 0; + w4[2] = 0; + w4[3] = 0; + w5[0] = 0; + w5[1] = 0; + w5[2] = 0; + w5[3] = 0; + w6[0] = 0; + w6[1] = 0; + w6[2] = 0; + w6[3] = 0; + w7[0] = 0; + w7[1] = 0; + w7[2] = 0; + w7[3] = 0; + + sha512_hmac_update_128 (&sha512_hmac_ctx2, w0, w1, w2, w3, w4, w5, w6, w7, 4); + + sha512_hmac_final (&sha512_hmac_ctx2); + + tmps[gid].dgst[i + 0] = sha512_hmac_ctx2.opad.h[0]; + tmps[gid].dgst[i + 1] = sha512_hmac_ctx2.opad.h[1]; + tmps[gid].dgst[i + 2] = sha512_hmac_ctx2.opad.h[2]; + tmps[gid].dgst[i + 3] = sha512_hmac_ctx2.opad.h[3]; + tmps[gid].dgst[i + 4] = sha512_hmac_ctx2.opad.h[4]; + tmps[gid].dgst[i + 5] = sha512_hmac_ctx2.opad.h[5]; + tmps[gid].dgst[i + 6] = sha512_hmac_ctx2.opad.h[6]; + tmps[gid].dgst[i + 7] = sha512_hmac_ctx2.opad.h[7]; + + tmps[gid].out[i + 0] = tmps[gid].dgst[i + 0]; + tmps[gid].out[i + 1] = tmps[gid].dgst[i + 1]; + tmps[gid].out[i + 2] = tmps[gid].dgst[i + 2]; + tmps[gid].out[i + 3] = tmps[gid].dgst[i + 3]; + tmps[gid].out[i + 4] = tmps[gid].dgst[i + 4]; + tmps[gid].out[i + 5] = tmps[gid].dgst[i + 5]; + tmps[gid].out[i + 6] = tmps[gid].dgst[i + 6]; + tmps[gid].out[i + 7] = tmps[gid].dgst[i + 7]; + } +} + +KERNEL_FQ void m23500_loop (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + const u64 gid = get_global_id (0); + + if ((gid * VECT_SIZE) >= gid_max) return; + + u64x ipad[8]; + u64x opad[8]; + + ipad[0] = pack64v (tmps, ipad, gid, 0); + ipad[1] = pack64v (tmps, ipad, gid, 1); + ipad[2] = pack64v (tmps, ipad, gid, 2); + ipad[3] = pack64v (tmps, ipad, gid, 3); + ipad[4] = pack64v (tmps, ipad, gid, 4); + ipad[5] = pack64v (tmps, ipad, gid, 5); + ipad[6] = pack64v (tmps, ipad, gid, 6); + ipad[7] = pack64v (tmps, ipad, gid, 7); + + opad[0] = pack64v (tmps, opad, gid, 0); + opad[1] = pack64v (tmps, opad, gid, 1); + opad[2] = pack64v (tmps, opad, gid, 2); + opad[3] = pack64v (tmps, opad, gid, 3); + opad[4] = pack64v (tmps, opad, gid, 4); + opad[5] = pack64v (tmps, opad, gid, 5); + opad[6] = pack64v (tmps, opad, gid, 6); + opad[7] = pack64v (tmps, opad, gid, 7); + + for (u32 i = 0; i < 8; i += 8) + { + u64x dgst[8]; + u64x out[8]; + + dgst[0] = pack64v (tmps, dgst, gid, i + 0); + dgst[1] = pack64v (tmps, dgst, gid, i + 1); + dgst[2] = pack64v (tmps, dgst, gid, i + 2); + dgst[3] = pack64v (tmps, dgst, gid, i + 3); + dgst[4] = pack64v (tmps, dgst, gid, i + 4); + dgst[5] = pack64v (tmps, dgst, gid, i + 5); + dgst[6] = pack64v (tmps, dgst, gid, i + 6); + dgst[7] = pack64v (tmps, dgst, gid, i + 7); + + out[0] = pack64v (tmps, out, gid, i + 0); + out[1] = pack64v (tmps, out, gid, i + 1); + out[2] = pack64v (tmps, out, gid, i + 2); + out[3] = pack64v (tmps, out, gid, i + 3); + out[4] = pack64v (tmps, out, gid, i + 4); + out[5] = pack64v (tmps, out, gid, i + 5); + out[6] = pack64v (tmps, out, gid, i + 6); + out[7] = pack64v (tmps, out, gid, i + 7); + + for (u32 j = 0; j < loop_cnt; j++) + { + u32x w0[4]; + u32x w1[4]; + u32x w2[4]; + u32x w3[4]; + u32x w4[4]; + u32x w5[4]; + u32x w6[4]; + u32x w7[4]; + + w0[0] = h32_from_64 (dgst[0]); + w0[1] = l32_from_64 (dgst[0]); + w0[2] = h32_from_64 (dgst[1]); + w0[3] = l32_from_64 (dgst[1]); + w1[0] = h32_from_64 (dgst[2]); + w1[1] = l32_from_64 (dgst[2]); + w1[2] = h32_from_64 (dgst[3]); + w1[3] = l32_from_64 (dgst[3]); + w2[0] = h32_from_64 (dgst[4]); + w2[1] = l32_from_64 (dgst[4]); + w2[2] = h32_from_64 (dgst[5]); + w2[3] = l32_from_64 (dgst[5]); + w3[0] = h32_from_64 (dgst[6]); + w3[1] = l32_from_64 (dgst[6]); + w3[2] = h32_from_64 (dgst[7]); + w3[3] = l32_from_64 (dgst[7]); + w4[0] = 0x80000000; + w4[1] = 0; + w4[2] = 0; + w4[3] = 0; + w5[0] = 0; + w5[1] = 0; + w5[2] = 0; + w5[3] = 0; + w6[0] = 0; + w6[1] = 0; + w6[2] = 0; + w6[3] = 0; + w7[0] = 0; + w7[1] = 0; + w7[2] = 0; + w7[3] = (128 + 64) * 8; + + hmac_sha512_run_V (w0, w1, w2, w3, w4, w5, w6, w7, ipad, opad, dgst); + + out[0] ^= dgst[0]; + out[1] ^= dgst[1]; + out[2] ^= dgst[2]; + out[3] ^= dgst[3]; + out[4] ^= dgst[4]; + out[5] ^= dgst[5]; + out[6] ^= dgst[6]; + out[7] ^= dgst[7]; + } + + unpack64v (tmps, dgst, gid, i + 0, dgst[0]); + unpack64v (tmps, dgst, gid, i + 1, dgst[1]); + unpack64v (tmps, dgst, gid, i + 2, dgst[2]); + unpack64v (tmps, dgst, gid, i + 3, dgst[3]); + unpack64v (tmps, dgst, gid, i + 4, dgst[4]); + unpack64v (tmps, dgst, gid, i + 5, dgst[5]); + unpack64v (tmps, dgst, gid, i + 6, dgst[6]); + unpack64v (tmps, dgst, gid, i + 7, dgst[7]); + + unpack64v (tmps, out, gid, i + 0, out[0]); + unpack64v (tmps, out, gid, i + 1, out[1]); + unpack64v (tmps, out, gid, i + 2, out[2]); + unpack64v (tmps, out, gid, i + 3, out[3]); + unpack64v (tmps, out, gid, i + 4, out[4]); + unpack64v (tmps, out, gid, i + 5, out[5]); + unpack64v (tmps, out, gid, i + 6, out[6]); + unpack64v (tmps, out, gid, i + 7, out[7]); + } +} + +KERNEL_FQ void m23500_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + u32 out[16]; + + out[ 0] = h32_from_64_S (tmps[gid].out[0]); + out[ 1] = l32_from_64_S (tmps[gid].out[0]); + out[ 2] = h32_from_64_S (tmps[gid].out[1]); + out[ 3] = l32_from_64_S (tmps[gid].out[1]); + out[ 4] = h32_from_64_S (tmps[gid].out[2]); + out[ 5] = l32_from_64_S (tmps[gid].out[2]); + out[ 6] = h32_from_64_S (tmps[gid].out[3]); + out[ 7] = l32_from_64_S (tmps[gid].out[3]); + out[ 8] = h32_from_64_S (tmps[gid].out[4]); + out[ 9] = l32_from_64_S (tmps[gid].out[4]); + out[10] = h32_from_64_S (tmps[gid].out[5]); + out[11] = l32_from_64_S (tmps[gid].out[5]); + out[12] = h32_from_64_S (tmps[gid].out[6]); + out[13] = l32_from_64_S (tmps[gid].out[6]); + out[14] = h32_from_64_S (tmps[gid].out[7]); + out[15] = l32_from_64_S (tmps[gid].out[7]); + + u32 KEK[4]; + + KEK[0] = out[ 0] ^ out[ 4] ^ out[ 8] ^ out[12]; + KEK[1] = out[ 1] ^ out[ 5] ^ out[ 9] ^ out[13]; + KEK[2] = out[ 2] ^ out[ 6] ^ out[10] ^ out[14]; + KEK[3] = out[ 3] ^ out[ 7] ^ out[11] ^ out[15]; + + u32 salt[4]; + + salt[0] = esalt_bufs[digests_offset].salt[0]; + salt[1] = esalt_bufs[digests_offset].salt[1]; + salt[2] = esalt_bufs[digests_offset].salt[2]; + salt[3] = esalt_bufs[digests_offset].salt[3]; + + tmps[gid].KEK[0] = KEK[0] ^ salt[0]; + tmps[gid].KEK[1] = KEK[1] ^ salt[1]; + tmps[gid].KEK[2] = KEK[2] ^ salt[2]; + tmps[gid].KEK[3] = KEK[3] ^ salt[3]; + + for (int i = 0; i < 36; i++) + { + tmps[gid].data[i] = esalt_bufs[digests_offset].data[i]; + } +} + +KERNEL_FQ void m23500_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + /** + * 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_VK u32 s_td0[256]; + LOCAL_VK u32 s_td1[256]; + LOCAL_VK u32 s_td2[256]; + LOCAL_VK u32 s_td3[256]; + LOCAL_VK u32 s_td4[256]; + + LOCAL_VK u32 s_te0[256]; + LOCAL_VK u32 s_te1[256]; + LOCAL_VK u32 s_te2[256]; + LOCAL_VK u32 s_te3[256]; + LOCAL_VK u32 s_te4[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + s_td0[i] = td0[i]; + s_td1[i] = td1[i]; + s_td2[i] = td2[i]; + s_td3[i] = td3[i]; + s_td4[i] = td4[i]; + + s_te0[i] = te0[i]; + s_te1[i] = te1[i]; + s_te2[i] = te2[i]; + s_te3[i] = te3[i]; + s_te4[i] = te4[i]; + } + + SYNC_THREADS (); + + #else + + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; + + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; + + #endif + + if (gid >= gid_max) return; + + u32 ukey[4]; + + ukey[0] = tmps[gid].KEK[0]; + ukey[1] = tmps[gid].KEK[1]; + ukey[2] = tmps[gid].KEK[2]; + ukey[3] = tmps[gid].KEK[3]; + + u32 data[36]; + + for (int i = 0; i < 36; i++) + { + data[i] = tmps[gid].data[i]; + } + + /** + * aes init + */ + + #define KEYLEN 44 + + u32 ks[KEYLEN]; + + /** + * aes decrypt key + */ + + AES128_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); + + const int wrapping_rounds = (int) salt_bufs[salt_pos].salt_iter2; + + // custom AES un-wrapping loop + + for (int i = loop_cnt, j = wrapping_rounds - loop_pos; i > 0; i--, j--) + { + for (int k = 8, l = 4 * j; k >= 1; k -= 2, l -= 1) + { + u32 B[4]; + + B[0] = data[0]; + B[1] = data[1] ^ l; + B[2] = data[k + 0]; + B[3] = data[k + 1]; + + AES128_decrypt (ks, B, B, s_td0, s_td1, s_td2, s_td3, s_td4); + + data[ 0] = B[0]; + data[ 1] = B[1]; + data[k + 0] = B[2]; + data[k + 1] = B[3]; + } + } + + for (int i = 0; i < 36; i++) + { + tmps[gid].data[i] = data[i]; + } +} + +KERNEL_FQ void m23500_comp (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + if ((tmps[gid].data[0] == 0xa6a6a6a6) && + (tmps[gid].data[1] == 0xa6a6a6a6)) + { + if (atomic_inc (&hashes_shown[digests_offset]) == 0) + { + mark_hash (plains_buf, d_return_buf, salt_pos, digests_cnt, 0, digests_offset + 0, gid, 0, 0, 0); + } + + return; + } +} diff --git a/OpenCL/m23600-pure.cl b/OpenCL/m23600-pure.cl new file mode 100644 index 000000000..ca94532ca --- /dev/null +++ b/OpenCL/m23600-pure.cl @@ -0,0 +1,537 @@ +/** + * Author......: See docs/credits.txt + * License.....: MIT + */ + +#define NEW_SIMD_CODE + +#ifdef KERNEL_STATIC +#include "inc_vendor.h" +#include "inc_types.h" +#include "inc_platform.cl" +#include "inc_common.cl" +#include "inc_simd.cl" +#include "inc_hash_sha512.cl" +#include "inc_cipher_aes.cl" +#endif + +typedef struct axcrypt2 +{ + u32 salt[16]; + u32 data[36]; + +} axcrypt2_t; + +typedef struct axcrypt2_tmp +{ + u64 ipad[8]; + u64 opad[8]; + + u64 dgst[8]; + u64 out[8]; + + u32 KEK[8]; + u32 data[36]; + +} axcrypt2_tmp_t; + +DECLSPEC void hmac_sha512_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *w4, u32x *w5, u32x *w6, u32x *w7, u64x *ipad, u64x *opad, u64x *digest) +{ + digest[0] = ipad[0]; + digest[1] = ipad[1]; + digest[2] = ipad[2]; + digest[3] = ipad[3]; + digest[4] = ipad[4]; + digest[5] = ipad[5]; + digest[6] = ipad[6]; + digest[7] = ipad[7]; + + sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); + + w0[0] = h32_from_64 (digest[0]); + w0[1] = l32_from_64 (digest[0]); + w0[2] = h32_from_64 (digest[1]); + w0[3] = l32_from_64 (digest[1]); + w1[0] = h32_from_64 (digest[2]); + w1[1] = l32_from_64 (digest[2]); + w1[2] = h32_from_64 (digest[3]); + w1[3] = l32_from_64 (digest[3]); + w2[0] = h32_from_64 (digest[4]); + w2[1] = l32_from_64 (digest[4]); + w2[2] = h32_from_64 (digest[5]); + w2[3] = l32_from_64 (digest[5]); + w3[0] = h32_from_64 (digest[6]); + w3[1] = l32_from_64 (digest[6]); + w3[2] = h32_from_64 (digest[7]); + w3[3] = l32_from_64 (digest[7]); + w4[0] = 0x80000000; + w4[1] = 0; + w4[2] = 0; + w4[3] = 0; + w5[0] = 0; + w5[1] = 0; + w5[2] = 0; + w5[3] = 0; + w6[0] = 0; + w6[1] = 0; + w6[2] = 0; + w6[3] = 0; + w7[0] = 0; + w7[1] = 0; + w7[2] = 0; + w7[3] = (128 + 64) * 8; + + digest[0] = opad[0]; + digest[1] = opad[1]; + digest[2] = opad[2]; + digest[3] = opad[3]; + digest[4] = opad[4]; + digest[5] = opad[5]; + digest[6] = opad[6]; + digest[7] = opad[7]; + + sha512_transform_vector (w0, w1, w2, w3, w4, w5, w6, w7, digest); +} + +KERNEL_FQ void m23600_init (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + sha512_hmac_ctx_t sha512_hmac_ctx; + + sha512_hmac_init_global_swap (&sha512_hmac_ctx, pws[gid].i, pws[gid].pw_len); + + tmps[gid].ipad[0] = sha512_hmac_ctx.ipad.h[0]; + tmps[gid].ipad[1] = sha512_hmac_ctx.ipad.h[1]; + tmps[gid].ipad[2] = sha512_hmac_ctx.ipad.h[2]; + tmps[gid].ipad[3] = sha512_hmac_ctx.ipad.h[3]; + tmps[gid].ipad[4] = sha512_hmac_ctx.ipad.h[4]; + tmps[gid].ipad[5] = sha512_hmac_ctx.ipad.h[5]; + tmps[gid].ipad[6] = sha512_hmac_ctx.ipad.h[6]; + tmps[gid].ipad[7] = sha512_hmac_ctx.ipad.h[7]; + + tmps[gid].opad[0] = sha512_hmac_ctx.opad.h[0]; + tmps[gid].opad[1] = sha512_hmac_ctx.opad.h[1]; + tmps[gid].opad[2] = sha512_hmac_ctx.opad.h[2]; + tmps[gid].opad[3] = sha512_hmac_ctx.opad.h[3]; + tmps[gid].opad[4] = sha512_hmac_ctx.opad.h[4]; + tmps[gid].opad[5] = sha512_hmac_ctx.opad.h[5]; + tmps[gid].opad[6] = sha512_hmac_ctx.opad.h[6]; + tmps[gid].opad[7] = sha512_hmac_ctx.opad.h[7]; + + sha512_hmac_update_global (&sha512_hmac_ctx, salt_bufs[salt_pos].salt_buf, salt_bufs[salt_pos].salt_len); + + for (u32 i = 0, j = 1; i < 8; i += 8, j += 1) + { + sha512_hmac_ctx_t sha512_hmac_ctx2 = sha512_hmac_ctx; + + u32 w0[4]; + u32 w1[4]; + u32 w2[4]; + u32 w3[4]; + u32 w4[4]; + u32 w5[4]; + u32 w6[4]; + u32 w7[4]; + + w0[0] = j; + w0[1] = 0; + w0[2] = 0; + w0[3] = 0; + w1[0] = 0; + w1[1] = 0; + w1[2] = 0; + w1[3] = 0; + w2[0] = 0; + w2[1] = 0; + w2[2] = 0; + w2[3] = 0; + w3[0] = 0; + w3[1] = 0; + w3[2] = 0; + w3[3] = 0; + w4[0] = 0; + w4[1] = 0; + w4[2] = 0; + w4[3] = 0; + w5[0] = 0; + w5[1] = 0; + w5[2] = 0; + w5[3] = 0; + w6[0] = 0; + w6[1] = 0; + w6[2] = 0; + w6[3] = 0; + w7[0] = 0; + w7[1] = 0; + w7[2] = 0; + w7[3] = 0; + + sha512_hmac_update_128 (&sha512_hmac_ctx2, w0, w1, w2, w3, w4, w5, w6, w7, 4); + + sha512_hmac_final (&sha512_hmac_ctx2); + + tmps[gid].dgst[i + 0] = sha512_hmac_ctx2.opad.h[0]; + tmps[gid].dgst[i + 1] = sha512_hmac_ctx2.opad.h[1]; + tmps[gid].dgst[i + 2] = sha512_hmac_ctx2.opad.h[2]; + tmps[gid].dgst[i + 3] = sha512_hmac_ctx2.opad.h[3]; + tmps[gid].dgst[i + 4] = sha512_hmac_ctx2.opad.h[4]; + tmps[gid].dgst[i + 5] = sha512_hmac_ctx2.opad.h[5]; + tmps[gid].dgst[i + 6] = sha512_hmac_ctx2.opad.h[6]; + tmps[gid].dgst[i + 7] = sha512_hmac_ctx2.opad.h[7]; + + tmps[gid].out[i + 0] = tmps[gid].dgst[i + 0]; + tmps[gid].out[i + 1] = tmps[gid].dgst[i + 1]; + tmps[gid].out[i + 2] = tmps[gid].dgst[i + 2]; + tmps[gid].out[i + 3] = tmps[gid].dgst[i + 3]; + tmps[gid].out[i + 4] = tmps[gid].dgst[i + 4]; + tmps[gid].out[i + 5] = tmps[gid].dgst[i + 5]; + tmps[gid].out[i + 6] = tmps[gid].dgst[i + 6]; + tmps[gid].out[i + 7] = tmps[gid].dgst[i + 7]; + } +} + +KERNEL_FQ void m23600_loop (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + const u64 gid = get_global_id (0); + + if ((gid * VECT_SIZE) >= gid_max) return; + + u64x ipad[8]; + u64x opad[8]; + + ipad[0] = pack64v (tmps, ipad, gid, 0); + ipad[1] = pack64v (tmps, ipad, gid, 1); + ipad[2] = pack64v (tmps, ipad, gid, 2); + ipad[3] = pack64v (tmps, ipad, gid, 3); + ipad[4] = pack64v (tmps, ipad, gid, 4); + ipad[5] = pack64v (tmps, ipad, gid, 5); + ipad[6] = pack64v (tmps, ipad, gid, 6); + ipad[7] = pack64v (tmps, ipad, gid, 7); + + opad[0] = pack64v (tmps, opad, gid, 0); + opad[1] = pack64v (tmps, opad, gid, 1); + opad[2] = pack64v (tmps, opad, gid, 2); + opad[3] = pack64v (tmps, opad, gid, 3); + opad[4] = pack64v (tmps, opad, gid, 4); + opad[5] = pack64v (tmps, opad, gid, 5); + opad[6] = pack64v (tmps, opad, gid, 6); + opad[7] = pack64v (tmps, opad, gid, 7); + + for (u32 i = 0; i < 8; i += 8) + { + u64x dgst[8]; + u64x out[8]; + + dgst[0] = pack64v (tmps, dgst, gid, i + 0); + dgst[1] = pack64v (tmps, dgst, gid, i + 1); + dgst[2] = pack64v (tmps, dgst, gid, i + 2); + dgst[3] = pack64v (tmps, dgst, gid, i + 3); + dgst[4] = pack64v (tmps, dgst, gid, i + 4); + dgst[5] = pack64v (tmps, dgst, gid, i + 5); + dgst[6] = pack64v (tmps, dgst, gid, i + 6); + dgst[7] = pack64v (tmps, dgst, gid, i + 7); + + out[0] = pack64v (tmps, out, gid, i + 0); + out[1] = pack64v (tmps, out, gid, i + 1); + out[2] = pack64v (tmps, out, gid, i + 2); + out[3] = pack64v (tmps, out, gid, i + 3); + out[4] = pack64v (tmps, out, gid, i + 4); + out[5] = pack64v (tmps, out, gid, i + 5); + out[6] = pack64v (tmps, out, gid, i + 6); + out[7] = pack64v (tmps, out, gid, i + 7); + + for (u32 j = 0; j < loop_cnt; j++) + { + u32x w0[4]; + u32x w1[4]; + u32x w2[4]; + u32x w3[4]; + u32x w4[4]; + u32x w5[4]; + u32x w6[4]; + u32x w7[4]; + + w0[0] = h32_from_64 (dgst[0]); + w0[1] = l32_from_64 (dgst[0]); + w0[2] = h32_from_64 (dgst[1]); + w0[3] = l32_from_64 (dgst[1]); + w1[0] = h32_from_64 (dgst[2]); + w1[1] = l32_from_64 (dgst[2]); + w1[2] = h32_from_64 (dgst[3]); + w1[3] = l32_from_64 (dgst[3]); + w2[0] = h32_from_64 (dgst[4]); + w2[1] = l32_from_64 (dgst[4]); + w2[2] = h32_from_64 (dgst[5]); + w2[3] = l32_from_64 (dgst[5]); + w3[0] = h32_from_64 (dgst[6]); + w3[1] = l32_from_64 (dgst[6]); + w3[2] = h32_from_64 (dgst[7]); + w3[3] = l32_from_64 (dgst[7]); + w4[0] = 0x80000000; + w4[1] = 0; + w4[2] = 0; + w4[3] = 0; + w5[0] = 0; + w5[1] = 0; + w5[2] = 0; + w5[3] = 0; + w6[0] = 0; + w6[1] = 0; + w6[2] = 0; + w6[3] = 0; + w7[0] = 0; + w7[1] = 0; + w7[2] = 0; + w7[3] = (128 + 64) * 8; + + hmac_sha512_run_V (w0, w1, w2, w3, w4, w5, w6, w7, ipad, opad, dgst); + + out[0] ^= dgst[0]; + out[1] ^= dgst[1]; + out[2] ^= dgst[2]; + out[3] ^= dgst[3]; + out[4] ^= dgst[4]; + out[5] ^= dgst[5]; + out[6] ^= dgst[6]; + out[7] ^= dgst[7]; + } + + unpack64v (tmps, dgst, gid, i + 0, dgst[0]); + unpack64v (tmps, dgst, gid, i + 1, dgst[1]); + unpack64v (tmps, dgst, gid, i + 2, dgst[2]); + unpack64v (tmps, dgst, gid, i + 3, dgst[3]); + unpack64v (tmps, dgst, gid, i + 4, dgst[4]); + unpack64v (tmps, dgst, gid, i + 5, dgst[5]); + unpack64v (tmps, dgst, gid, i + 6, dgst[6]); + unpack64v (tmps, dgst, gid, i + 7, dgst[7]); + + unpack64v (tmps, out, gid, i + 0, out[0]); + unpack64v (tmps, out, gid, i + 1, out[1]); + unpack64v (tmps, out, gid, i + 2, out[2]); + unpack64v (tmps, out, gid, i + 3, out[3]); + unpack64v (tmps, out, gid, i + 4, out[4]); + unpack64v (tmps, out, gid, i + 5, out[5]); + unpack64v (tmps, out, gid, i + 6, out[6]); + unpack64v (tmps, out, gid, i + 7, out[7]); + } +} + +KERNEL_FQ void m23600_init2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + u32 out[16]; + + out[ 0] = h32_from_64_S (tmps[gid].out[0]); + out[ 1] = l32_from_64_S (tmps[gid].out[0]); + out[ 2] = h32_from_64_S (tmps[gid].out[1]); + out[ 3] = l32_from_64_S (tmps[gid].out[1]); + out[ 4] = h32_from_64_S (tmps[gid].out[2]); + out[ 5] = l32_from_64_S (tmps[gid].out[2]); + out[ 6] = h32_from_64_S (tmps[gid].out[3]); + out[ 7] = l32_from_64_S (tmps[gid].out[3]); + out[ 8] = h32_from_64_S (tmps[gid].out[4]); + out[ 9] = l32_from_64_S (tmps[gid].out[4]); + out[10] = h32_from_64_S (tmps[gid].out[5]); + out[11] = l32_from_64_S (tmps[gid].out[5]); + out[12] = h32_from_64_S (tmps[gid].out[6]); + out[13] = l32_from_64_S (tmps[gid].out[6]); + out[14] = h32_from_64_S (tmps[gid].out[7]); + out[15] = l32_from_64_S (tmps[gid].out[7]); + + u32 KEK[8]; + + KEK[0] = out[ 0] ^ out[ 8]; + KEK[1] = out[ 1] ^ out[ 9]; + KEK[2] = out[ 2] ^ out[10]; + KEK[3] = out[ 3] ^ out[11]; + KEK[4] = out[ 4] ^ out[12]; + KEK[5] = out[ 5] ^ out[13]; + KEK[6] = out[ 6] ^ out[14]; + KEK[7] = out[ 7] ^ out[15]; + + u32 salt[8]; + + salt[0] = esalt_bufs[digests_offset].salt[0]; + salt[1] = esalt_bufs[digests_offset].salt[1]; + salt[2] = esalt_bufs[digests_offset].salt[2]; + salt[3] = esalt_bufs[digests_offset].salt[3]; + salt[4] = esalt_bufs[digests_offset].salt[4]; + salt[5] = esalt_bufs[digests_offset].salt[5]; + salt[6] = esalt_bufs[digests_offset].salt[6]; + salt[7] = esalt_bufs[digests_offset].salt[7]; + + tmps[gid].KEK[0] = KEK[0] ^ salt[0]; + tmps[gid].KEK[1] = KEK[1] ^ salt[1]; + tmps[gid].KEK[2] = KEK[2] ^ salt[2]; + tmps[gid].KEK[3] = KEK[3] ^ salt[3]; + tmps[gid].KEK[4] = KEK[4] ^ salt[4]; + tmps[gid].KEK[5] = KEK[5] ^ salt[5]; + tmps[gid].KEK[6] = KEK[6] ^ salt[6]; + tmps[gid].KEK[7] = KEK[7] ^ salt[7]; + + for (int i = 0; i < 36; i++) + { + tmps[gid].data[i] = esalt_bufs[digests_offset].data[i]; + } +} + +KERNEL_FQ void m23600_loop2 (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + /** + * 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_VK u32 s_td0[256]; + LOCAL_VK u32 s_td1[256]; + LOCAL_VK u32 s_td2[256]; + LOCAL_VK u32 s_td3[256]; + LOCAL_VK u32 s_td4[256]; + + LOCAL_VK u32 s_te0[256]; + LOCAL_VK u32 s_te1[256]; + LOCAL_VK u32 s_te2[256]; + LOCAL_VK u32 s_te3[256]; + LOCAL_VK u32 s_te4[256]; + + for (u32 i = lid; i < 256; i += lsz) + { + s_td0[i] = td0[i]; + s_td1[i] = td1[i]; + s_td2[i] = td2[i]; + s_td3[i] = td3[i]; + s_td4[i] = td4[i]; + + s_te0[i] = te0[i]; + s_te1[i] = te1[i]; + s_te2[i] = te2[i]; + s_te3[i] = te3[i]; + s_te4[i] = te4[i]; + } + + SYNC_THREADS (); + + #else + + CONSTANT_AS u32a *s_td0 = td0; + CONSTANT_AS u32a *s_td1 = td1; + CONSTANT_AS u32a *s_td2 = td2; + CONSTANT_AS u32a *s_td3 = td3; + CONSTANT_AS u32a *s_td4 = td4; + + CONSTANT_AS u32a *s_te0 = te0; + CONSTANT_AS u32a *s_te1 = te1; + CONSTANT_AS u32a *s_te2 = te2; + CONSTANT_AS u32a *s_te3 = te3; + CONSTANT_AS u32a *s_te4 = te4; + + #endif + + if (gid >= gid_max) return; + + u32 ukey[8]; + + ukey[0] = tmps[gid].KEK[0]; + ukey[1] = tmps[gid].KEK[1]; + ukey[2] = tmps[gid].KEK[2]; + ukey[3] = tmps[gid].KEK[3]; + ukey[4] = tmps[gid].KEK[4]; + ukey[5] = tmps[gid].KEK[5]; + ukey[6] = tmps[gid].KEK[6]; + ukey[7] = tmps[gid].KEK[7]; + + u32 data[36]; + + for (int i = 0; i < 36; i++) + { + data[i] = tmps[gid].data[i]; + } + + /** + * aes init + */ + + #define KEYLEN 60 + + u32 ks[KEYLEN]; + + /** + * aes decrypt key + */ + + AES256_set_decrypt_key (ks, ukey, s_te0, s_te1, s_te2, s_te3, s_td0, s_td1, s_td2, s_td3); + + const int wrapping_rounds = (int) salt_bufs[salt_pos].salt_iter2; + + // custom AES un-wrapping loop + + for (int i = loop_cnt, j = wrapping_rounds - loop_pos; i > 0; i--, j--) + { + for (int k = 12, l = 6 * j; k >= 1; k -= 2, l -= 1) + { + u32 B[4]; + + B[0] = data[0]; + B[1] = data[1] ^ l; + B[2] = data[k + 0]; + B[3] = data[k + 1]; + + AES256_decrypt (ks, B, B, s_td0, s_td1, s_td2, s_td3, s_td4); + + data[ 0] = B[0]; + data[ 1] = B[1]; + data[k + 0] = B[2]; + data[k + 1] = B[3]; + } + } + + for (int i = 0; i < 36; i++) + { + tmps[gid].data[i] = data[i]; + } +} + +KERNEL_FQ void m23600_comp (KERN_ATTR_TMPS_ESALT (axcrypt2_tmp_t, axcrypt2_t)) +{ + /** + * base + */ + + const u64 gid = get_global_id (0); + + if (gid >= gid_max) return; + + if ((tmps[gid].data[0] == 0xa6a6a6a6) && + (tmps[gid].data[1] == 0xa6a6a6a6)) + { + if (atomic_inc (&hashes_shown[digests_offset]) == 0) + { + mark_hash (plains_buf, d_return_buf, salt_pos, digests_cnt, 0, digests_offset + 0, gid, 0, 0, 0); + } + + return; + } +} diff --git a/docs/changes.txt b/docs/changes.txt index 2a3a03148..425071287 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -5,6 +5,8 @@ ## - Added hash-mode: Apple iWork +- Added hash-mode: AxCrypt 2 AES-128 +- Added hash-mode: AxCrypt 2 AES-256 - Added hash-mode: RSA/DSA/EC/OPENSSH Private Keys ## diff --git a/docs/readme.txt b/docs/readme.txt index c10359a59..679922e00 100644 --- a/docs/readme.txt +++ b/docs/readme.txt @@ -310,6 +310,8 @@ NVIDIA GPUs require "NVIDIA Driver" (440.64 or later) and "CUDA Toolkit" (9.0 or - Android Backup - AxCrypt 1 - AxCrypt 1 in-memory SHA1 +- AxCrypt 2 AES-128 +- AxCrypt 2 AES-256 - WBB3 (Woltlab Burning Board) - vBulletin < v3.8.5 - vBulletin >= v3.8.5 diff --git a/src/modules/module_23500.c b/src/modules/module_23500.c new file mode 100644 index 000000000..c78ef23cd --- /dev/null +++ b/src/modules/module_23500.c @@ -0,0 +1,363 @@ +/** + * 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" + +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_ARCHIVE; +static const char *HASH_NAME = "AxCrypt 2 AES-128"; +static const u64 KERN_TYPE = 23500; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64 + | OPTI_TYPE_SLOW_HASH_SIMD_LOOP; +static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE + | OPTS_TYPE_ST_HEX + | OPTS_TYPE_INIT2 + | OPTS_TYPE_LOOP2; +static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED; +static const char *ST_PASS = "hashcat"; +static const char *ST_HASH = "$axcrypt$*2*10000*6d44c6d19076bce9920c5fb76b246c161926ce65abb93ec2003919d78898aadd5bc6e5754201ff25d681ad89fa2861d20ef7c3fd7bde051909dfef8adcb50491*68f78a1b80291a42b2a117d6209d3eb3541a8d47ed6b970b2b8294b2bc78347fc2b494a0599f8cba6d45e88fd8fbc5b4dd7e888f6c9543e679489de132167222e130d5925278693ad8599284705fdf99360b2199ed0005be05867b9b7aa6bb4be76f5f979819eb27cf590a47d81830575b2af09dda756360c844b89c7dcec099cfdd27d2d0c95d24f143405f303e4843*1000*debdeb8ea7b9800b01855de09b105fdb8840efc1f67dc742283d13a5570165f8"; + +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 axcrypt2 +{ + u32 salt[16]; + u32 data[36]; + +} axcrypt2_t; + +typedef struct axcrypt2_tmp +{ + u64 ipad[8]; + u64 opad[8]; + + u64 dgst[8]; + u64 out[8]; + + u32 KEK[4]; + u32 data[36]; + +} axcrypt2_tmp_t; + +static const char *SIGNATURE_AXCRYPT2 = "$axcrypt$"; + +bool module_unstable_warning (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 hc_device_param_t *device_param) +{ + // amdgpu-pro-19.30-934563-ubuntu-18.04: password not found + if ((device_param->opencl_device_vendor_id == VENDOR_ID_AMD) && (device_param->has_vperm == false)) + { + return true; + } + + return false; +} + +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 (axcrypt2_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 (axcrypt2_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; + + axcrypt2_t *axcrypt2 = (axcrypt2_t *) esalt_buf; + + token_t token; + + token.token_cnt = 7; + + token.signatures_cnt = 1; + token.signatures_buf[0] = SIGNATURE_AXCRYPT2; + + token.sep[0] = '*'; + token.len_min[0] = 9; + token.len_max[0] = 9; + token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_SIGNATURE; + + token.sep[1] = '*'; + token.len_min[1] = 1; + token.len_max[1] = 1; + token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_DIGIT; + + token.sep[2] = '*'; + token.len_min[2] = 1; + token.len_max[2] = 7; + token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_DIGIT; + + token.sep[3] = '*'; + token.len_min[3] = 128; + token.len_max[3] = 128; + token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + token.sep[4] = '*'; + token.len_min[4] = 288; + token.len_max[4] = 288; + token.attr[4] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + token.sep[5] = '*'; + token.len_min[5] = 1; + token.len_max[5] = 7; + token.attr[5] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_DIGIT; + + token.len[6] = 64; + token.attr[6] = TOKEN_ATTR_FIXED_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); + + // version + + const u8 *version_pos = token.buf[1]; + + if (version_pos[0] != '2') return (PARSER_SIGNATURE_UNMATCHED); + + // iterations wrap + + const u8 *iter_wrap_pos = token.buf[2]; + + const u32 iter_wrap = hc_strtoul ((const char *) iter_wrap_pos, NULL, 10); + + if (iter_wrap < 1) return (PARSER_SALT_ITERATION); + if (iter_wrap > 9999999) return (PARSER_SALT_ITERATION); + + salt->salt_iter2 = iter_wrap; + + // salt wrap + + const u8 *salt_wrap_pos = token.buf[3]; + const int salt_wrap_len = token.len[3]; + + hex_decode (salt_wrap_pos, salt_wrap_len, (u8 *) axcrypt2->salt); + + for (int i = 0; i < 16; i++) + { + axcrypt2->salt[i] = byte_swap_32 (axcrypt2->salt[i]); + } + + // data wrap + + const u8 *data_pos = token.buf[4]; + const int data_len = token.len[4]; + + hex_decode (data_pos, data_len, (u8 *) axcrypt2->data); + + for (int i = 0; i < 36; i++) + { + axcrypt2->data[i] = byte_swap_32 (axcrypt2->data[i]); + } + + // iterations KDF + + const u8 *iter_kdf_pos = token.buf[5]; + + const u32 iter_kdf = hc_strtoul ((const char *) iter_kdf_pos, NULL, 10); + + if (iter_kdf < 1) return (PARSER_SALT_ITERATION); + if (iter_kdf > 9999999) return (PARSER_SALT_ITERATION); + + salt->salt_iter = iter_kdf - 1; + + // salt KDF + + const u8 *salt_kdf_pos = token.buf[6]; + const int salt_kdf_len = token.len[6]; + + salt->salt_len = hex_decode (salt_kdf_pos, salt_kdf_len, (u8 *) salt->salt_buf); + + for (int i = 0; i < 8; i++) + { + salt->salt_buf[i] = byte_swap_32 (salt->salt_buf[i]); + } + + if (salt->salt_len != 32) return (PARSER_SALT_LENGTH); + + // fake hash + + digest[0] = axcrypt2->data[0]; + digest[1] = axcrypt2->data[1]; + digest[2] = axcrypt2->data[2]; + digest[3] = axcrypt2->data[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) +{ + axcrypt2_t *axcrypt2 = (axcrypt2_t *) esalt_buf; + + // salt wrap buffer + + u32 tmp_buf[256 + 1] = { 0 }; + + for (int i = 0; i < 16; i++) + { + tmp_buf[i] = byte_swap_32 (axcrypt2->salt[i]); + } + + u8 salt_wrap_buf[128 + 1] = { 0 }; + + hex_encode ((const u8 *) tmp_buf, 64, salt_wrap_buf); + + // data wrap buffer + + memset (tmp_buf, 0, sizeof (tmp_buf)); + + for (int i = 0; i < 36; i++) + { + tmp_buf[i] = byte_swap_32 (axcrypt2->data[i]); + } + + u8 data_wrap_buf[288 + 1] = { 0 }; + + hex_encode ((const u8 *) tmp_buf, 144, data_wrap_buf); + + // salt kdf buffer + + memset (tmp_buf, 0, sizeof (tmp_buf)); + + for (int i = 0; i < 8; i++) + { + tmp_buf[i] = byte_swap_32 (salt->salt_buf[i]); + } + + u8 salt_kdf_buf[64 + 1] = { 0 }; + + hex_encode ((const u8 *) tmp_buf, 32, salt_kdf_buf); + + const int line_len = snprintf (line_buf, line_size, "%s*2*%i*%s*%s*%i*%s", + SIGNATURE_AXCRYPT2, + salt->salt_iter2, + salt_wrap_buf, + data_wrap_buf, + salt->salt_iter + 1, + salt_kdf_buf); + + return line_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_salt = MODULE_DEFAULT; + module_ctx->module_build_plain_postprocess = MODULE_DEFAULT; + module_ctx->module_deep_comp_kernel = 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_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_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_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_DEFAULT; + 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_unstable_warning; + module_ctx->module_warmup_disable = MODULE_DEFAULT; +} diff --git a/src/modules/module_23600.c b/src/modules/module_23600.c new file mode 100644 index 000000000..c27a39756 --- /dev/null +++ b/src/modules/module_23600.c @@ -0,0 +1,363 @@ +/** + * 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" + +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_ARCHIVE; +static const char *HASH_NAME = "AxCrypt 2 AES-256"; +static const u64 KERN_TYPE = 23600; +static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE + | OPTI_TYPE_USES_BITS_64 + | OPTI_TYPE_SLOW_HASH_SIMD_LOOP; +static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE + | OPTS_TYPE_ST_HEX + | OPTS_TYPE_INIT2 + | OPTS_TYPE_LOOP2; +static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED; +static const char *ST_PASS = "hashcat"; +static const char *ST_HASH = "$axcrypt$*2*10000*79bea2d51670484a065241c52613b41a33bf56d2dda9993770e8b0188e3bbf881bea6552a2986c70dc97240b0f91df2eecfa2c7044998041b3fbd58369cfef79*4982f7a860d4e92079bc677c1f89304aa3a2d9ab8c81efaff6c78a12e2873a3a23e6ae6e23a7144248446d8b44e3e82b19a307b2105570a39e1a7bed70b77bbf6b3e85371fe5bb52d1d4c7fcb3d755b308796ab7c4ff270c9217f05477aff5e8e94e5e8af1fba3ce069ce6fc94ae7aeebcb3da270cab672e95c8042a848cefc70bde7201b52cba9a8a0615ac70315792*1000*e2438859e86f7b4076b0ee4044ad5d17c3bb1f5a05fcb1af28ed7326cf71ced2"; + +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 axcrypt2 +{ + u32 salt[16]; + u32 data[36]; + +} axcrypt2_t; + +typedef struct axcrypt2_tmp +{ + u64 ipad[8]; + u64 opad[8]; + + u64 dgst[8]; + u64 out[8]; + + u32 KEK[8]; + u32 data[36]; + +} axcrypt2_tmp_t; + +static const char *SIGNATURE_AXCRYPT2 = "$axcrypt$"; + +bool module_unstable_warning (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 hc_device_param_t *device_param) +{ + // amdgpu-pro-19.30-934563-ubuntu-18.04: password not found + if ((device_param->opencl_device_vendor_id == VENDOR_ID_AMD) && (device_param->has_vperm == false)) + { + return true; + } + + return false; +} + +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 (axcrypt2_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 (axcrypt2_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; + + axcrypt2_t *axcrypt2 = (axcrypt2_t *) esalt_buf; + + token_t token; + + token.token_cnt = 7; + + token.signatures_cnt = 1; + token.signatures_buf[0] = SIGNATURE_AXCRYPT2; + + token.sep[0] = '*'; + token.len_min[0] = 9; + token.len_max[0] = 9; + token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_SIGNATURE; + + token.sep[1] = '*'; + token.len_min[1] = 1; + token.len_max[1] = 1; + token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_DIGIT; + + token.sep[2] = '*'; + token.len_min[2] = 1; + token.len_max[2] = 7; + token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_DIGIT; + + token.sep[3] = '*'; + token.len_min[3] = 128; + token.len_max[3] = 128; + token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + token.sep[4] = '*'; + token.len_min[4] = 288; + token.len_max[4] = 288; + token.attr[4] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_HEX; + + token.sep[5] = '*'; + token.len_min[5] = 1; + token.len_max[5] = 7; + token.attr[5] = TOKEN_ATTR_VERIFY_LENGTH + | TOKEN_ATTR_VERIFY_DIGIT; + + token.len[6] = 64; + token.attr[6] = TOKEN_ATTR_FIXED_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); + + // version + + const u8 *version_pos = token.buf[1]; + + if (version_pos[0] != '2') return (PARSER_SIGNATURE_UNMATCHED); + + // iterations wrap + + const u8 *iter_wrap_pos = token.buf[2]; + + const u32 iter_wrap = hc_strtoul ((const char *) iter_wrap_pos, NULL, 10); + + if (iter_wrap < 1) return (PARSER_SALT_ITERATION); + if (iter_wrap > 9999999) return (PARSER_SALT_ITERATION); + + salt->salt_iter2 = iter_wrap; + + // salt wrap + + const u8 *salt_wrap_pos = token.buf[3]; + const int salt_wrap_len = token.len[3]; + + hex_decode (salt_wrap_pos, salt_wrap_len, (u8 *) axcrypt2->salt); + + for (int i = 0; i < 16; i++) + { + axcrypt2->salt[i] = byte_swap_32 (axcrypt2->salt[i]); + } + + // data wrap + + const u8 *data_pos = token.buf[4]; + const int data_len = token.len[4]; + + hex_decode (data_pos, data_len, (u8 *) axcrypt2->data); + + for (int i = 0; i < 36; i++) + { + axcrypt2->data[i] = byte_swap_32 (axcrypt2->data[i]); + } + + // iterations KDF + + const u8 *iter_kdf_pos = token.buf[5]; + + const u32 iter_kdf = hc_strtoul ((const char *) iter_kdf_pos, NULL, 10); + + if (iter_kdf < 1) return (PARSER_SALT_ITERATION); + if (iter_kdf > 9999999) return (PARSER_SALT_ITERATION); + + salt->salt_iter = iter_kdf - 1; + + // salt KDF + + const u8 *salt_kdf_pos = token.buf[6]; + const int salt_kdf_len = token.len[6]; + + salt->salt_len = hex_decode (salt_kdf_pos, salt_kdf_len, (u8 *) salt->salt_buf); + + if (salt->salt_len != 32) return (PARSER_SALT_LENGTH); + + for (int i = 0; i < 8; i++) + { + salt->salt_buf[i] = byte_swap_32 (salt->salt_buf[i]); + } + + // fake hash + + digest[0] = axcrypt2->data[0]; + digest[1] = axcrypt2->data[1]; + digest[2] = axcrypt2->data[2]; + digest[3] = axcrypt2->data[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) +{ + axcrypt2_t *axcrypt2 = (axcrypt2_t *) esalt_buf; + + // salt wrap buffer + + u32 tmp_buf[256 + 1] = { 0 }; + + for (int i = 0; i < 16; i++) + { + tmp_buf[i] = byte_swap_32 (axcrypt2->salt[i]); + } + + u8 salt_wrap_buf[128 + 1] = { 0 }; + + hex_encode ((const u8 *) tmp_buf, 64, salt_wrap_buf); + + // data wrap buffer + + memset (tmp_buf, 0, sizeof (tmp_buf)); + + for (int i = 0; i < 36; i++) + { + tmp_buf[i] = byte_swap_32 (axcrypt2->data[i]); + } + + u8 data_wrap_buf[288 + 1] = { 0 }; + + hex_encode ((const u8 *) tmp_buf, 144, data_wrap_buf); + + // salt kdf buffer + + memset (tmp_buf, 0, sizeof (tmp_buf)); + + for (int i = 0; i < 8; i++) + { + tmp_buf[i] = byte_swap_32 (salt->salt_buf[i]); + } + + u8 salt_kdf_buf[64 + 1] = { 0 }; + + hex_encode ((const u8 *) tmp_buf, 32, salt_kdf_buf); + + const int line_len = snprintf (line_buf, line_size, "%s*2*%i*%s*%s*%i*%s", + SIGNATURE_AXCRYPT2, + salt->salt_iter2, + salt_wrap_buf, + data_wrap_buf, + salt->salt_iter + 1, + salt_kdf_buf); + + return line_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_salt = MODULE_DEFAULT; + module_ctx->module_build_plain_postprocess = MODULE_DEFAULT; + module_ctx->module_deep_comp_kernel = 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_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_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_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_DEFAULT; + 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_unstable_warning; + module_ctx->module_warmup_disable = MODULE_DEFAULT; +} diff --git a/tools/test_modules/m23500.pm b/tools/test_modules/m23500.pm new file mode 100644 index 000000000..488412a50 --- /dev/null +++ b/tools/test_modules/m23500.pm @@ -0,0 +1,145 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Crypt::PBKDF2; +use Crypt::Mode::ECB; + +sub module_constraints { [[0, 256], [64, 64], [-1, -1], [-1, -1], [-1, -1]] } + +my $AXCRYPT_MAGIC = pack ("H*", "a6a6a6a6a6a6a6a6"); + +sub module_generate_hash +{ + my $word = shift; + my $salt_wrap = shift; + my $iter_wrap = shift // 10000; + my $data = shift; + my $salt_kdf = shift // random_bytes (32); + my $iter_kdf = shift // 1000; + + my $pbkdf2 = Crypt::PBKDF2->new + ( + hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 512), + iterations => $iter_kdf, + output_len => 64 + ); + + # most heavy part (PBKDF2-HMAC-SHA512): + + my $KEK = $pbkdf2->PBKDF2 ($salt_kdf, $word); + + # reduce 64 bytes of key to 16 bytes (why not just use 16 byte output length o.O ?) + + $KEK = substr ($KEK, 0, 16) ^ + substr ($KEK, 16, 16) ^ + substr ($KEK, 32, 16) ^ + substr ($KEK, 48, 16); + + $KEK = $KEK ^ substr ($salt_wrap, 0, 16); + + my $aes = Crypt::Mode::ECB->new ('AES', 0); + + if (defined ($data)) # decrypt + { + # unwrap: + + my $data_mod = $data; + + for (my $j = $iter_wrap - 1; $j >= 0; $j--) + { + for (my $k = 4; $k >= 1; $k--) + { + my $idx = 4 * $j + $k; + + my $block = substr ($data_mod, 0, 4) . + (substr ($data_mod, 4, 4) ^ pack ("L>", $idx)) . + substr ($data_mod, $k * 8, 8); + + $block = $aes->decrypt ($block, $KEK); + + substr ($data_mod, 0, 8) = substr ($block, 0, 8); + substr ($data_mod, $k * 8, 8) = substr ($block, 8, 8); + } + } + + if (index ($data_mod, $AXCRYPT_MAGIC) != 0) + { + $data = "WRONG"; + } + } + else # encrypt + { + # wrap: + + $data = $AXCRYPT_MAGIC . random_bytes (136); + + for (my $j = 0; $j < $iter_wrap; $j++) + { + for (my $k = 1; $k <= 4; $k++) + { + my $idx = 4 * $j + $k; + + my $block = substr ($data, 0, 8) . + substr ($data, $k * 8, 8); + + $block = $aes->encrypt ($block, $KEK); + + substr ($block, 4, 4) ^= pack ("L>", $idx); + + substr ($data, 0, 8) = substr ($block, 0, 8); + substr ($data, $k * 8, 8) = substr ($block, 8, 8); + } + } + } + + my $hash = sprintf ("\$axcrypt\$*2*%i*%s*%s*%i*%s", $iter_wrap, unpack ("H*", $salt_wrap), unpack ("H*", $data), $iter_kdf, unpack ("H*", $salt_kdf)); + + 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, 11) eq '$axcrypt$*2'; + + my (undef, undef, $iter_wrap, $salt_wrap, $data, $iter_kdf, $salt_kdf) = split ('\*', $hash); + + return unless defined ($iter_wrap); + return unless defined ($salt_wrap); + return unless defined ($data); + return unless defined ($iter_kdf); + return unless defined ($salt_kdf); + + return unless ($iter_wrap =~ m/^[0-9]{1,7}$/); + return unless ($salt_wrap =~ m/^[0-9a-fA-F]+$/); + return unless ($data =~ m/^[0-9a-fA-F]+$/); + return unless ($iter_kdf =~ m/^[0-9]{1,7}$/); + return unless ($salt_kdf =~ m/^[0-9a-fA-F]+$/); + + $salt_wrap = pack ("H*", $salt_wrap); + $data = pack ("H*", $data); + $salt_kdf = pack ("H*", $salt_kdf); + + my $word_packed = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word_packed, $salt_wrap, $iter_wrap, $data, $salt_kdf, $iter_kdf); + + return ($new_hash, $word); +} + +1; diff --git a/tools/test_modules/m23600.pm b/tools/test_modules/m23600.pm new file mode 100644 index 000000000..80294f150 --- /dev/null +++ b/tools/test_modules/m23600.pm @@ -0,0 +1,142 @@ +#!/usr/bin/env perl + +## +## Author......: See docs/credits.txt +## License.....: MIT +## + +use strict; +use warnings; + +use Crypt::PBKDF2; +use Crypt::Mode::ECB; + +sub module_constraints { [[0, 256], [64, 64], [-1, -1], [-1, -1], [-1, -1]] } + +my $AXCRYPT_MAGIC = pack ("H*", "a6a6a6a6a6a6a6a6"); + +sub module_generate_hash +{ + my $word = shift; + my $salt_wrap = shift; + my $iter_wrap = shift // 10000; + my $data = shift; + my $salt_kdf = shift // random_bytes (32); + my $iter_kdf = shift // 1000; + + my $pbkdf2 = Crypt::PBKDF2->new + ( + hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 512), + iterations => $iter_kdf, + output_len => 64 + ); + + # most heavy part (PBKDF2-HMAC-SHA512): + + my $KEK = $pbkdf2->PBKDF2 ($salt_kdf, $word); + + # reduce 64 bytes of key to 16 bytes (why not just use 16 byte output length o.O ?) + + $KEK = substr ($KEK, 0, 32) ^ substr ($KEK, 32, 32); + + $KEK = $KEK ^ substr ($salt_wrap, 0, 32); + + my $aes = Crypt::Mode::ECB->new ('AES', 0); + + if (defined ($data)) # decrypt + { + # unwrap: + + my $data_mod = $data; + + for (my $j = $iter_wrap - 1; $j >= 0; $j--) + { + for (my $k = 6; $k >= 1; $k--) + { + my $idx = 6 * $j + $k; + + my $block = substr ($data_mod, 0, 4) . + (substr ($data_mod, 4, 4) ^ pack ("L>", $idx)) . + substr ($data_mod, $k * 8, 8); + + $block = $aes->decrypt ($block, $KEK); + + substr ($data_mod, 0, 8) = substr ($block, 0, 8); + substr ($data_mod, $k * 8, 8) = substr ($block, 8, 8); + } + } + + if (index ($data_mod, $AXCRYPT_MAGIC) != 0) + { + $data = "WRONG"; + } + } + else # encrypt + { + # wrap: + + $data = $AXCRYPT_MAGIC . random_bytes (136); + + for (my $j = 0; $j < $iter_wrap; $j++) + { + for (my $k = 1; $k <= 6; $k++) + { + my $idx = 6 * $j + $k; + + my $block = substr ($data, 0, 8) . + substr ($data, $k * 8, 8); + + $block = $aes->encrypt ($block, $KEK); + + substr ($block, 4, 4) ^= pack ("L>", $idx); + + substr ($data, 0, 8) = substr ($block, 0, 8); + substr ($data, $k * 8, 8) = substr ($block, 8, 8); + } + } + } + + my $hash = sprintf ("\$axcrypt\$*2*%i*%s*%s*%i*%s", $iter_wrap, unpack ("H*", $salt_wrap), unpack ("H*", $data), $iter_kdf, unpack ("H*", $salt_kdf)); + + 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, 11) eq '$axcrypt$*2'; + + my (undef, undef, $iter_wrap, $salt_wrap, $data, $iter_kdf, $salt_kdf) = split ('\*', $hash); + + return unless defined ($iter_wrap); + return unless defined ($salt_wrap); + return unless defined ($data); + return unless defined ($iter_kdf); + return unless defined ($salt_kdf); + + return unless ($iter_wrap =~ m/^[0-9]{1,7}$/); + return unless ($salt_wrap =~ m/^[0-9a-fA-F]+$/); + return unless ($data =~ m/^[0-9a-fA-F]+$/); + return unless ($iter_kdf =~ m/^[0-9]{1,7}$/); + return unless ($salt_kdf =~ m/^[0-9a-fA-F]+$/); + + $salt_wrap = pack ("H*", $salt_wrap); + $data = pack ("H*", $data); + $salt_kdf = pack ("H*", $salt_kdf); + + my $word_packed = pack_if_HEX_notation ($word); + + my $new_hash = module_generate_hash ($word_packed, $salt_wrap, $iter_wrap, $data, $salt_kdf, $iter_kdf); + + return ($new_hash, $word); +} + +1;