mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 08:08:10 +00:00
Merge branch 'hashcat:master' into metal_prepare_kernelIncludes_v2
This commit is contained in:
Gabriele Gristina
GitHub
commit
2c0b4cd20a
354
OpenCL/m28600-pure.cl
Normal file
354
OpenCL/m28600-pure.cl
Normal file
@ -0,0 +1,354 @@
|
||||
/**
|
||||
* 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_sha256.cl"
|
||||
#endif
|
||||
|
||||
#define COMPARE_S "inc_comp_single.cl"
|
||||
#define COMPARE_M "inc_comp_multi.cl"
|
||||
|
||||
typedef struct postgres_sha256_tmp
|
||||
{
|
||||
u32 ipad[8];
|
||||
u32 opad[8];
|
||||
|
||||
u32 dgst[8];
|
||||
u32 out[8];
|
||||
|
||||
} postgres_sha256_tmp_t;
|
||||
|
||||
typedef struct postgres_sha256
|
||||
{
|
||||
u32 salt[16];
|
||||
u32 storedKey[16];
|
||||
|
||||
u32 salt_len;
|
||||
u32 storedKey_len;
|
||||
|
||||
} postgres_sha256_t;
|
||||
|
||||
DECLSPEC void hmac_sha256_run_V (u32x *w0, u32x *w1, u32x *w2, u32x *w3, u32x *ipad, u32x *opad, 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 m28600_init (KERN_ATTR_TMPS_ESALT (postgres_sha256_tmp_t, postgres_sha256_t))
|
||||
{
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
|
||||
const u64 gid = get_global_id (0);
|
||||
|
||||
if (gid >= GID_CNT) return;
|
||||
|
||||
sha256_hmac_ctx_t sha256_hmac_ctx;
|
||||
|
||||
sha256_hmac_init_global_swap (&sha256_hmac_ctx, pws[gid].i, pws[gid].pw_len);
|
||||
|
||||
tmps[gid].ipad[0] = sha256_hmac_ctx.ipad.h[0];
|
||||
tmps[gid].ipad[1] = sha256_hmac_ctx.ipad.h[1];
|
||||
tmps[gid].ipad[2] = sha256_hmac_ctx.ipad.h[2];
|
||||
tmps[gid].ipad[3] = sha256_hmac_ctx.ipad.h[3];
|
||||
tmps[gid].ipad[4] = sha256_hmac_ctx.ipad.h[4];
|
||||
tmps[gid].ipad[5] = sha256_hmac_ctx.ipad.h[5];
|
||||
tmps[gid].ipad[6] = sha256_hmac_ctx.ipad.h[6];
|
||||
tmps[gid].ipad[7] = sha256_hmac_ctx.ipad.h[7];
|
||||
|
||||
tmps[gid].opad[0] = sha256_hmac_ctx.opad.h[0];
|
||||
tmps[gid].opad[1] = sha256_hmac_ctx.opad.h[1];
|
||||
tmps[gid].opad[2] = sha256_hmac_ctx.opad.h[2];
|
||||
tmps[gid].opad[3] = sha256_hmac_ctx.opad.h[3];
|
||||
tmps[gid].opad[4] = sha256_hmac_ctx.opad.h[4];
|
||||
tmps[gid].opad[5] = sha256_hmac_ctx.opad.h[5];
|
||||
tmps[gid].opad[6] = sha256_hmac_ctx.opad.h[6];
|
||||
tmps[gid].opad[7] = sha256_hmac_ctx.opad.h[7];
|
||||
|
||||
sha256_hmac_update_global (&sha256_hmac_ctx, esalt_bufs[DIGESTS_OFFSET_HOST].salt, esalt_bufs[DIGESTS_OFFSET_HOST].salt_len);
|
||||
|
||||
for (u32 i = 0, j = 1; i < 8; i += 8, j += 1)
|
||||
{
|
||||
sha256_hmac_ctx_t sha256_hmac_ctx2 = sha256_hmac_ctx;
|
||||
|
||||
u32 w0[4];
|
||||
u32 w1[4];
|
||||
u32 w2[4];
|
||||
u32 w3[4];
|
||||
|
||||
w0[0] = j;
|
||||
w0[1] = 0;
|
||||
w0[2] = 0;
|
||||
w0[3] = 0;
|
||||
w1[0] = 0;
|
||||
w1[1] = 0;
|
||||
w1[2] = 0;
|
||||
w1[3] = 0;
|
||||
w2[0] = 0;
|
||||
w2[1] = 0;
|
||||
w2[2] = 0;
|
||||
w2[3] = 0;
|
||||
w3[0] = 0;
|
||||
w3[1] = 0;
|
||||
w3[2] = 0;
|
||||
w3[3] = 0;
|
||||
|
||||
sha256_hmac_update_64 (&sha256_hmac_ctx2, w0, w1, w2, w3, 4);
|
||||
|
||||
sha256_hmac_final (&sha256_hmac_ctx2);
|
||||
|
||||
tmps[gid].dgst[i + 0] = sha256_hmac_ctx2.opad.h[0];
|
||||
tmps[gid].dgst[i + 1] = sha256_hmac_ctx2.opad.h[1];
|
||||
tmps[gid].dgst[i + 2] = sha256_hmac_ctx2.opad.h[2];
|
||||
tmps[gid].dgst[i + 3] = sha256_hmac_ctx2.opad.h[3];
|
||||
tmps[gid].dgst[i + 4] = sha256_hmac_ctx2.opad.h[4];
|
||||
tmps[gid].dgst[i + 5] = sha256_hmac_ctx2.opad.h[5];
|
||||
tmps[gid].dgst[i + 6] = sha256_hmac_ctx2.opad.h[6];
|
||||
tmps[gid].dgst[i + 7] = sha256_hmac_ctx2.opad.h[7];
|
||||
|
||||
tmps[gid].out[i + 0] = tmps[gid].dgst[i + 0];
|
||||
tmps[gid].out[i + 1] = tmps[gid].dgst[i + 1];
|
||||
tmps[gid].out[i + 2] = tmps[gid].dgst[i + 2];
|
||||
tmps[gid].out[i + 3] = tmps[gid].dgst[i + 3];
|
||||
tmps[gid].out[i + 4] = tmps[gid].dgst[i + 4];
|
||||
tmps[gid].out[i + 5] = tmps[gid].dgst[i + 5];
|
||||
tmps[gid].out[i + 6] = tmps[gid].dgst[i + 6];
|
||||
tmps[gid].out[i + 7] = tmps[gid].dgst[i + 7];
|
||||
}
|
||||
}
|
||||
|
||||
KERNEL_FQ void m28600_loop (KERN_ATTR_TMPS_ESALT (postgres_sha256_tmp_t, postgres_sha256_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 m28600_comp (KERN_ATTR_TMPS_ESALT (postgres_sha256_tmp_t, postgres_sha256_t))
|
||||
{
|
||||
/**
|
||||
* base
|
||||
*/
|
||||
|
||||
const u64 gid = get_global_id (0);
|
||||
|
||||
if (gid >= GID_CNT) return;
|
||||
|
||||
const u64 lid = get_local_id (0);
|
||||
|
||||
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];
|
||||
|
||||
// HMAC-SHA256 with "Server Key" salt:
|
||||
|
||||
u32 w0[4];
|
||||
u32 w1[4];
|
||||
u32 w2[4];
|
||||
u32 w3[4];
|
||||
|
||||
w0[0] = out[0];
|
||||
w0[1] = out[1];
|
||||
w0[2] = out[2];
|
||||
w0[3] = out[3];
|
||||
w1[0] = out[4];
|
||||
w1[1] = out[5];
|
||||
w1[2] = out[6];
|
||||
w1[3] = out[7];
|
||||
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_ctx_t sha256_hmac_ctx;
|
||||
|
||||
sha256_hmac_init_64 (&sha256_hmac_ctx, w0, w1, w2, w3);
|
||||
|
||||
w0[0] = 0x53657276; // Serv
|
||||
w0[1] = 0x6572204b; // er K
|
||||
w0[2] = 0x65790000; // ey
|
||||
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_ctx, w0, w1, w2, w3, 10);
|
||||
|
||||
sha256_hmac_final (&sha256_hmac_ctx);
|
||||
|
||||
const u32 r0 = sha256_hmac_ctx.opad.h[DGST_R0];
|
||||
const u32 r1 = sha256_hmac_ctx.opad.h[DGST_R1];
|
||||
const u32 r2 = sha256_hmac_ctx.opad.h[DGST_R2];
|
||||
const u32 r3 = sha256_hmac_ctx.opad.h[DGST_R3];
|
||||
|
||||
#define il_pos 0
|
||||
|
||||
#ifdef KERNEL_STATIC
|
||||
#include COMPARE_M
|
||||
#endif
|
||||
}
|
||||
@ -7,6 +7,7 @@
|
||||
- Added hash-mode: Exodus Desktop Wallet (scrypt)
|
||||
- Added hash-mode: Teamspeak 3 (channel hash)
|
||||
- Added hash-mode: sha256($salt.sha256_bin($pass))
|
||||
- Added hash-mode: PostgreSQL SCRAM-SHA-256
|
||||
|
||||
##
|
||||
## Features
|
||||
@ -14,6 +15,7 @@
|
||||
|
||||
- Added support to use --debug-mode in attack-mode 9 (Association Attack)
|
||||
- Added guess data to --status-json output
|
||||
- Added hex format for --separator option
|
||||
|
||||
##
|
||||
## Bugs
|
||||
@ -29,8 +31,23 @@
|
||||
- Fixed bug on benchmark engine, from now it will not stop at the first error detected
|
||||
- Fixed false negative on Unit Test in case of out-of-memory with grep in single mode
|
||||
- Fixed Unit Test early exit on luks test file download/extract failure
|
||||
- Fixed Unit Test salt-max in case of optimized kernel, with hash-type 22 and 23
|
||||
- Fixed Unit Test false negative if there are spaces in the filesystem path to hashcat
|
||||
- Fixed --hash-info example password output: force uppercase if OPTS_TYPE_PT_UPPER is set
|
||||
- Hash-Mode 9700: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 9710: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 9720: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 9800: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 9810: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 9820: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 10400: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 10410: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 10420: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 18200: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 25400: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 7500: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 10500: set native_threads to 32 with Apple GPU's
|
||||
- Hash-Mode 13100: set native_threads to 32 with Apple GPU's
|
||||
|
||||
##
|
||||
## Technical
|
||||
|
||||
@ -66,6 +66,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -74,6 +80,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -69,6 +69,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -77,6 +83,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -69,6 +69,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -77,6 +83,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -70,6 +70,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -78,6 +84,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -71,6 +71,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -79,6 +85,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -70,6 +70,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -78,6 +84,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -72,6 +72,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -80,6 +86,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -76,6 +76,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -84,6 +90,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -77,6 +77,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -85,6 +91,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -76,6 +76,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -84,6 +90,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -100,6 +100,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -108,6 +114,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -64,6 +64,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -72,6 +78,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -64,6 +64,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -72,6 +78,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
@ -104,6 +104,12 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
}
|
||||
else if (device_param->opencl_device_type & CL_DEVICE_TYPE_GPU)
|
||||
{
|
||||
#if defined (__APPLE__)
|
||||
|
||||
native_threads = 32;
|
||||
|
||||
#else
|
||||
|
||||
if (device_param->device_local_mem_size < 49152)
|
||||
{
|
||||
native_threads = MIN (device_param->kernel_preferred_wgs_multiple, 32); // We can't just set 32, because Intel GPU need 8
|
||||
@ -112,6 +118,8 @@ char *module_jit_build_options (MAYBE_UNUSED const hashconfig_t *hashconfig, MAY
|
||||
{
|
||||
native_threads = device_param->kernel_preferred_wgs_multiple;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
hc_asprintf (&jit_build_options, "-D FIXED_LOCAL_SIZE=%u -D _unroll", native_threads);
|
||||
|
||||
397
src/modules/module_28600.c
Normal file
397
src/modules/module_28600.c
Normal file
@ -0,0 +1,397 @@
|
||||
/**
|
||||
* 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 "emu_inc_hash_sha256.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_8;
|
||||
static const u32 HASH_CATEGORY = HASH_CATEGORY_DATABASE_SERVER;
|
||||
static const char *HASH_NAME = "PostgreSQL SCRAM-SHA-256";
|
||||
static const u64 KERN_TYPE = 28600;
|
||||
static const u32 OPTI_TYPE =
|
||||
OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE | OPTS_TYPE_ST_BASE64;
|
||||
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
|
||||
static const char *ST_PASS = "hashcat";
|
||||
static const char *ST_HASH = "SCRAM-SHA-256$4096:IKfxzJ8Nq4PkLJCfgKcPmA==$"
|
||||
"iRw3qwTp18uaBnsTOEExbtgWdKeBMbSSnZvqD4sdqLQ=:"
|
||||
"hPciC1CcnBna3szR8Mf3MVc8t0W7QPbIHoMMrh4zRV0=";
|
||||
|
||||
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 postgres_sha256_tmp {
|
||||
u32 ipad[8];
|
||||
u32 opad[8];
|
||||
|
||||
u32 dgst[8];
|
||||
u32 out[8];
|
||||
|
||||
} postgres_sha256_tmp_t;
|
||||
|
||||
typedef struct postgres_sha256 {
|
||||
u32 salt[16];
|
||||
u32 storedKey[16];
|
||||
|
||||
u32 salt_len;
|
||||
u32 storedKey_len;
|
||||
|
||||
} postgres_sha256_t;
|
||||
|
||||
static const char *SIGNATURE_POSTGRES_SHA256 = "SCRAM-SHA-256";
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
// NVIDIA GPU
|
||||
if (device_param->opencl_device_vendor_id == VENDOR_ID_NV) {
|
||||
hc_asprintf(&jit_build_options, "-D _unroll");
|
||||
}
|
||||
|
||||
// HIP
|
||||
if (device_param->opencl_device_vendor_id == VENDOR_ID_AMD_USE_HIP) {
|
||||
hc_asprintf(&jit_build_options, "-D _unroll");
|
||||
}
|
||||
|
||||
// ROCM
|
||||
if ((device_param->opencl_device_vendor_id == VENDOR_ID_AMD) &&
|
||||
(device_param->has_vperm == true)) {
|
||||
hc_asprintf(&jit_build_options, "-D _unroll");
|
||||
}
|
||||
|
||||
return jit_build_options;
|
||||
}
|
||||
|
||||
u64 module_esalt_size (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const user_options_t *user_options, MAYBE_UNUSED const user_options_extra_t *user_options_extra)
|
||||
{
|
||||
const u64 esalt_size = (const u64)sizeof(postgres_sha256_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(postgres_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;
|
||||
|
||||
postgres_sha256_t *postgres_sha256 = (postgres_sha256_t *)esalt_buf;
|
||||
|
||||
hc_token_t token;
|
||||
|
||||
token.token_cnt = 5;
|
||||
|
||||
token.signatures_cnt = 1;
|
||||
token.signatures_buf[0] = SIGNATURE_POSTGRES_SHA256;
|
||||
|
||||
token.sep[0] = '$';
|
||||
token.len_min[0] = 13;
|
||||
token.len_max[0] = 13;
|
||||
token.attr[0] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_SIGNATURE;
|
||||
|
||||
token.sep[1] = ':';
|
||||
token.len_min[1] = 1;
|
||||
token.len_max[1] = 7;
|
||||
token.attr[1] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_DIGIT;
|
||||
|
||||
token.sep[2] = '$';
|
||||
token.len_min[2] = 0;
|
||||
token.len_max[2] = 88;
|
||||
token.attr[2] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A;
|
||||
|
||||
token.sep[3] = ':';
|
||||
token.len_min[3] = 44;
|
||||
token.len_max[3] = 44;
|
||||
token.attr[3] = TOKEN_ATTR_VERIFY_LENGTH | TOKEN_ATTR_VERIFY_BASE64A;
|
||||
|
||||
token.len[4] = 44;
|
||||
token.attr[4] = TOKEN_ATTR_FIXED_LENGTH | TOKEN_ATTR_VERIFY_BASE64A;
|
||||
|
||||
const int rc_tokenizer =
|
||||
input_tokenizer((const u8 *)line_buf, line_len, &token);
|
||||
|
||||
if (rc_tokenizer != PARSER_OK)
|
||||
return (rc_tokenizer);
|
||||
|
||||
// iter
|
||||
|
||||
const u8 *iter_pos = token.buf[1];
|
||||
|
||||
const u32 iter = hc_strtoul((const char *)iter_pos, NULL, 10);
|
||||
|
||||
if (iter < 1)
|
||||
return (PARSER_SALT_ITERATION);
|
||||
|
||||
salt->salt_iter = iter - 1;
|
||||
|
||||
// salt
|
||||
u8 tmp_buf[100] = {0};
|
||||
|
||||
const u8 *salt_pos = token.buf[2];
|
||||
const int salt_len = token.len[2];
|
||||
|
||||
int tmp_len = base64_decode(base64_to_int, salt_pos, salt_len, tmp_buf);
|
||||
|
||||
if (tmp_len > 64)
|
||||
return (PARSER_SALT_LENGTH);
|
||||
|
||||
memcpy(postgres_sha256->salt, tmp_buf, tmp_len);
|
||||
|
||||
postgres_sha256->salt[0] = byte_swap_32(postgres_sha256->salt[0]);
|
||||
postgres_sha256->salt[1] = byte_swap_32(postgres_sha256->salt[1]);
|
||||
postgres_sha256->salt[2] = byte_swap_32(postgres_sha256->salt[2]);
|
||||
postgres_sha256->salt[3] = byte_swap_32(postgres_sha256->salt[3]);
|
||||
postgres_sha256->salt[4] = byte_swap_32(postgres_sha256->salt[4]);
|
||||
postgres_sha256->salt[5] = byte_swap_32(postgres_sha256->salt[5]);
|
||||
postgres_sha256->salt[6] = byte_swap_32(postgres_sha256->salt[6]);
|
||||
postgres_sha256->salt[7] = byte_swap_32(postgres_sha256->salt[7]);
|
||||
postgres_sha256->salt[8] = byte_swap_32(postgres_sha256->salt[8]);
|
||||
postgres_sha256->salt[9] = byte_swap_32(postgres_sha256->salt[9]);
|
||||
postgres_sha256->salt[10] = byte_swap_32(postgres_sha256->salt[10]);
|
||||
postgres_sha256->salt[11] = byte_swap_32(postgres_sha256->salt[11]);
|
||||
postgres_sha256->salt[12] = byte_swap_32(postgres_sha256->salt[12]);
|
||||
postgres_sha256->salt[13] = byte_swap_32(postgres_sha256->salt[13]);
|
||||
postgres_sha256->salt[14] = byte_swap_32(postgres_sha256->salt[14]);
|
||||
postgres_sha256->salt[15] = byte_swap_32(postgres_sha256->salt[15]);
|
||||
|
||||
postgres_sha256->salt_len = tmp_len;
|
||||
salt->salt_len = tmp_len;
|
||||
|
||||
salt->salt_buf[0] = postgres_sha256->salt[0];
|
||||
salt->salt_buf[1] = postgres_sha256->salt[1];
|
||||
salt->salt_buf[2] = postgres_sha256->salt[2];
|
||||
salt->salt_buf[3] = postgres_sha256->salt[3];
|
||||
salt->salt_buf[4] = postgres_sha256->salt[4];
|
||||
salt->salt_buf[5] = postgres_sha256->salt[5];
|
||||
salt->salt_buf[6] = postgres_sha256->salt[6];
|
||||
salt->salt_buf[7] = postgres_sha256->salt[7];
|
||||
salt->salt_buf[8] = postgres_sha256->salt[8];
|
||||
salt->salt_buf[9] = postgres_sha256->salt[9];
|
||||
salt->salt_buf[10] = postgres_sha256->salt[10];
|
||||
salt->salt_buf[11] = postgres_sha256->salt[11];
|
||||
salt->salt_buf[12] = postgres_sha256->salt[12];
|
||||
salt->salt_buf[13] = postgres_sha256->salt[13];
|
||||
salt->salt_buf[14] = postgres_sha256->salt[14];
|
||||
salt->salt_buf[15] = postgres_sha256->salt[15];
|
||||
|
||||
// stored key
|
||||
const u8 *stored_key_pos = token.buf[3];
|
||||
const int stored_key_len = token.len[3];
|
||||
|
||||
memset(tmp_buf, 0, sizeof(tmp_buf));
|
||||
|
||||
tmp_len = base64_decode(base64_to_int, stored_key_pos, stored_key_len, tmp_buf);
|
||||
|
||||
memcpy(postgres_sha256->storedKey, tmp_buf, tmp_len);
|
||||
|
||||
postgres_sha256->storedKey_len = tmp_len;
|
||||
|
||||
// server key
|
||||
|
||||
const u8 *hash_pos = token.buf[4];
|
||||
const int hash_len = token.len[4];
|
||||
|
||||
memset(tmp_buf, 0, sizeof(tmp_buf));
|
||||
|
||||
tmp_len = base64_decode(base64_to_int, hash_pos, hash_len, tmp_buf);
|
||||
|
||||
if (tmp_len != 32)
|
||||
return (PARSER_HASH_LENGTH);
|
||||
|
||||
memcpy(digest, tmp_buf, 32);
|
||||
|
||||
digest[0] = byte_swap_32(digest[0]);
|
||||
digest[1] = byte_swap_32(digest[1]);
|
||||
digest[2] = byte_swap_32(digest[2]);
|
||||
digest[3] = byte_swap_32(digest[3]);
|
||||
digest[4] = byte_swap_32(digest[4]);
|
||||
digest[5] = byte_swap_32(digest[5]);
|
||||
digest[6] = byte_swap_32(digest[6]);
|
||||
digest[7] = byte_swap_32(digest[7]);
|
||||
|
||||
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)
|
||||
{
|
||||
u32 *digest = (u32 *)digest_buf;
|
||||
|
||||
postgres_sha256_t *postgres_sha256 = (postgres_sha256_t *)esalt_buf;
|
||||
|
||||
// salt
|
||||
|
||||
u32 salt_buf[8] = {0}; // make the buffer large enough for base64_encode ()
|
||||
|
||||
salt_buf[0] = byte_swap_32(postgres_sha256->salt[0]);
|
||||
salt_buf[1] = byte_swap_32(postgres_sha256->salt[1]);
|
||||
salt_buf[2] = byte_swap_32(postgres_sha256->salt[2]);
|
||||
salt_buf[3] = byte_swap_32(postgres_sha256->salt[3]);
|
||||
salt_buf[4] = byte_swap_32(postgres_sha256->salt[4]);
|
||||
salt_buf[5] = byte_swap_32(postgres_sha256->salt[5]);
|
||||
salt_buf[6] = byte_swap_32(postgres_sha256->salt[6]);
|
||||
salt_buf[7] = byte_swap_32(postgres_sha256->salt[7]);
|
||||
|
||||
u8 salt_base64[64] = {0};
|
||||
|
||||
base64_encode(int_to_base64, (const u8 *)salt_buf, salt->salt_len,
|
||||
salt_base64);
|
||||
|
||||
// server key
|
||||
|
||||
u32 hash[8] = {0}; // make the buffer large enough for base64_encode ()
|
||||
|
||||
hash[0] = byte_swap_32(digest[0]);
|
||||
hash[1] = byte_swap_32(digest[1]);
|
||||
hash[2] = byte_swap_32(digest[2]);
|
||||
hash[3] = byte_swap_32(digest[3]);
|
||||
hash[4] = byte_swap_32(digest[4]);
|
||||
hash[5] = byte_swap_32(digest[5]);
|
||||
hash[6] = byte_swap_32(digest[6]);
|
||||
hash[7] = byte_swap_32(digest[7]);
|
||||
|
||||
u8 server_key_base64[64] = {0};
|
||||
|
||||
base64_encode(int_to_base64, (const u8 *)hash, 32, server_key_base64);
|
||||
|
||||
// stored key
|
||||
|
||||
u8 stored_key_bin[100] = { 0 };
|
||||
|
||||
memcpy (stored_key_bin, (char *) postgres_sha256->storedKey, postgres_sha256->storedKey_len);
|
||||
|
||||
u8 stored_key_base64[64] = {0};
|
||||
|
||||
base64_encode(int_to_base64, stored_key_bin, postgres_sha256->storedKey_len, stored_key_base64);
|
||||
|
||||
// print final line
|
||||
|
||||
const int line_len =
|
||||
snprintf(line_buf, line_size, "%s$%u:%s$%s:%s", SIGNATURE_POSTGRES_SHA256,
|
||||
salt->salt_iter + 1, salt_base64, stored_key_base64, server_key_base64);
|
||||
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_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;
|
||||
}
|
||||
@ -7,6 +7,7 @@
|
||||
#include "types.h"
|
||||
#include "memory.h"
|
||||
#include "event.h"
|
||||
#include "convert.h"
|
||||
#include "logfile.h"
|
||||
#include "interface.h"
|
||||
#include "shared.h"
|
||||
@ -594,9 +595,31 @@ int user_options_sanity (hashcat_ctx_t *hashcat_ctx)
|
||||
|
||||
if (user_options->separator_chgd == true)
|
||||
{
|
||||
if (strlen (user_options->separator) != 1)
|
||||
bool error = false;
|
||||
if ((strlen (user_options->separator) != 1) && (strlen (user_options->separator) != 4))
|
||||
{
|
||||
event_log_error (hashcat_ctx, "Separator length has to be exactly 1 byte.");
|
||||
error = true;
|
||||
}
|
||||
if (strlen (user_options->separator) == 4)
|
||||
{
|
||||
if ((user_options->separator[0] == '0') && (user_options->separator[1] == 'x'))
|
||||
{
|
||||
if (is_valid_hex_string((u8 * )(&(user_options->separator[2])),2)){
|
||||
u8 sep = hex_to_u8((u8 * )(&(user_options->separator[2])));
|
||||
user_options->separator[0] = sep;
|
||||
user_options->separator[1] = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
error = true;
|
||||
}
|
||||
}
|
||||
else{
|
||||
error = true;
|
||||
}
|
||||
}
|
||||
if (error){
|
||||
event_log_error (hashcat_ctx, "Separator length has to be exactly 1 byte (single char or hex format e.g. 0x09 for TAB)");
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ use warnings;
|
||||
|
||||
use Digest::MD5 qw (md5);
|
||||
|
||||
sub module_constraints { [[0, 232], [0, 232], [0, 32], [0, 32], [0, 32]] }
|
||||
sub module_constraints { [[0, 232], [0, 232], [0, 32], [0, 28], [0, 32]] }
|
||||
|
||||
sub module_generate_hash
|
||||
{
|
||||
|
||||
@ -10,7 +10,7 @@ use warnings;
|
||||
|
||||
use Digest::MD5 qw (md5_hex);
|
||||
|
||||
sub module_constraints { [[0, 247], [0, 247], [0, 47], [0, 47], [0, 47]] }
|
||||
sub module_constraints { [[0, 247], [0, 247], [0, 47], [0, 43], [0, 47]] }
|
||||
|
||||
sub module_generate_hash
|
||||
{
|
||||
|
||||
78
tools/test_modules/m28600.pm
Normal file
78
tools/test_modules/m28600.pm
Normal file
@ -0,0 +1,78 @@
|
||||
#!/usr/bin/env perl
|
||||
|
||||
##
|
||||
## Author......: See docs/credits.txt
|
||||
## License.....: MIT
|
||||
##
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use MIME::Base64 qw (decode_base64 encode_base64);
|
||||
use Digest::SHA qw (sha256);
|
||||
use Digest::HMAC qw (hmac);
|
||||
use Crypt::PBKDF2;
|
||||
|
||||
sub module_constraints { [[0, 256], [28, 28], [-1, -1], [-1, -1], [-1, -1]] }
|
||||
|
||||
my $ITERATIONS = 4096;
|
||||
my $HMAC_SALT = "Server Key";
|
||||
my $HMAC_SALT_2 = "Client Key";
|
||||
|
||||
sub module_generate_hash
|
||||
{
|
||||
my $word = shift;
|
||||
my $salt = shift;
|
||||
my $iter = shift // $ITERATIONS;
|
||||
|
||||
my $pbkdf = Crypt::PBKDF2->new
|
||||
(
|
||||
hasher => Crypt::PBKDF2->hasher_from_algorithm ('HMACSHA2', 256),
|
||||
iterations => $iter,
|
||||
output_len => 32
|
||||
);
|
||||
|
||||
my $pbkdf2_dgst = $pbkdf->PBKDF2 ($salt, $word);
|
||||
|
||||
my $server_key = hmac ($HMAC_SALT, $pbkdf2_dgst, \&sha256);
|
||||
my $stored_key = hmac ($HMAC_SALT_2, $pbkdf2_dgst, \&sha256);
|
||||
|
||||
my $hash = sprintf ('SCRAM-SHA-256$%i:%s$%s:%s', $iter, encode_base64 ($salt, ""), encode_base64 ($stored_key, ""), encode_base64 ($server_key, ""));
|
||||
|
||||
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, 13) eq 'SCRAM-SHA-256';
|
||||
|
||||
my (undef, $iter, $salt) = split ('\*|\$', $hash);
|
||||
|
||||
return unless defined ($iter);
|
||||
return unless defined ($salt);
|
||||
|
||||
return unless ($iter =~ m/^[1-9][0-9]{0,7}$/);
|
||||
|
||||
$iter = int ($iter);
|
||||
|
||||
return unless ($salt =~ m/^[A-Za-z0-9+\/=]{0,88}$/);
|
||||
|
||||
$salt = decode_base64 ($salt);
|
||||
|
||||
my $word_packed = pack_if_HEX_notation ($word);
|
||||
|
||||
my $new_hash = module_generate_hash ($word_packed, $salt, $iter);
|
||||
|
||||
return ($new_hash, $word);
|
||||
}
|
||||
|
||||
1;
|
||||
Loading…
Reference in New Issue
Block a user