mirror of
https://github.com/hashcat/hashcat.git
synced 2024-11-22 08:08:10 +00:00
Merge branch 'hashcat:master' into autotune_error_handling
This commit is contained in:
Gabriele Gristina
GitHub
commit
6175459b0a
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
|
||||
@ -25,6 +27,13 @@
|
||||
- Fixed missing option flag OPTS_TYPE_SUGGEST_KG for hash-mode 11600 to inform the user about possible false positives in this mode
|
||||
- Fixed undefined function call to hc_byte_perm_S() in hash-mode 17010 on non-CUDA compute devices
|
||||
- Fixed wordlist handling in -m 3000 when candidate passwords use the $HEX[...] syntax
|
||||
- Fixed false negative on Unit Test with hash-type 25400
|
||||
- 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
|
||||
|
||||
##
|
||||
## Technical
|
||||
@ -45,6 +54,10 @@
|
||||
- CUDA Backend: moved functions to ext_cuda.c/ext_nvrtc.c and includes to ext_cuda.h/ext_nvrtc.h
|
||||
- Autotune: Added error handling. By default skipping device on error, with --force using accel/loops/threads min values instead
|
||||
- Makefile: updated MACOSX_DEPLOYMENT_TARGET to 10.15 and removed OpenCL framework from LFLAGS_NATIVE on MacOS
|
||||
- Status code: updated negative status code, usefull in Unit tests engine (test.sh)
|
||||
- Unit tests: added -r (--runtime) option
|
||||
- Unit tests: handle negative status code, skip deprecated hash-types, skip hash-types with known perl modules issues, updated output
|
||||
- Hash Info: show more information (Updated Hash-Format. Added Autodetect, Self-Test, Potfile and Plaintext encoding)
|
||||
|
||||
* changes v6.2.4 -> v6.2.5
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ Gabriele "matrix" Gristina <matrix@hashcat.net> (@gm4tr1x)
|
||||
* Apple macOS port
|
||||
* Apple Silicon support
|
||||
* Hardware monitor initial code base and maintenance
|
||||
* Test suite initial code base
|
||||
* Test suite initial code base and maintenance
|
||||
* Makefile initial code base
|
||||
* Multithreading initial code base
|
||||
* MultiGPU initial code base
|
||||
|
||||
@ -1,6 +1,12 @@
|
||||
status codes on exit:
|
||||
=====================
|
||||
|
||||
-8 = mixed backend errors (combo of -3, -4, -5, -6, -7 errors type)
|
||||
-7 = backend error: Invalid module_extra_buffer_size
|
||||
-6 = backend error: Too many compute units to keep minimum kernel accel limit
|
||||
-5 = backend error: main kernel build error
|
||||
-4 = backend error: memory hit
|
||||
-3 = backend error: skipping hash-type due to module_unstable_warning settings
|
||||
-2 = gpu-watchdog alarm
|
||||
-1 = error
|
||||
0 = OK/cracked
|
||||
|
||||
@ -25,7 +25,7 @@ Slightly modified to work with hashcat to no falsly detect _SORT_R_LINUX with mi
|
||||
*/
|
||||
|
||||
#if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \
|
||||
defined __FreeBSD__ || defined __DragonFly__)
|
||||
defined __FreeBSD__ || defined __DragonFly__ || defined __NetBSD__)
|
||||
# define _SORT_R_BSD
|
||||
# define _SORT_R_INLINE inline
|
||||
#elif (defined __linux__) || defined (__CYGWIN__)
|
||||
@ -202,7 +202,12 @@ static _SORT_R_INLINE void sort_r_simple(void *base, size_t nel, size_t w,
|
||||
struct sort_r_data tmp;
|
||||
tmp.arg = arg;
|
||||
tmp.compar = compar;
|
||||
qsort_r(base, nel, width, &tmp, sort_r_arg_swap);
|
||||
|
||||
#if defined __NetBSD__
|
||||
sort_r_simple(base, nel, width, compar, arg);
|
||||
#else
|
||||
qsort_r(base, nel, width, &tmp, sort_r_arg_swap);
|
||||
#endif
|
||||
|
||||
#elif defined _SORT_R_WINDOWS
|
||||
|
||||
|
||||
@ -1694,6 +1694,17 @@ typedef struct backend_ctx
|
||||
{
|
||||
bool enabled;
|
||||
|
||||
// global rc
|
||||
|
||||
bool memory_hit_warning;
|
||||
bool runtime_skip_warning;
|
||||
bool kernel_build_warning;
|
||||
bool kernel_accel_warnings;
|
||||
bool extra_size_warning;
|
||||
bool mixed_warnings;
|
||||
|
||||
// generic
|
||||
|
||||
void *cuda;
|
||||
void *hip;
|
||||
void *ocl;
|
||||
|
||||
14
src/Makefile
14
src/Makefile
@ -31,7 +31,7 @@ UNAME := $(patsubst MSYS_NT-%,MSYS2,$(UNAME))
|
||||
UNAME := $(patsubst MINGW32_NT-%,MSYS2,$(UNAME))
|
||||
UNAME := $(patsubst MINGW64_NT-%,MSYS2,$(UNAME))
|
||||
|
||||
ifeq (,$(filter $(UNAME),Linux FreeBSD Darwin CYGWIN MSYS2))
|
||||
ifeq (,$(filter $(UNAME),Linux FreeBSD NetBSD Darwin CYGWIN MSYS2))
|
||||
$(error "! Your Operating System ($(UNAME)) is not supported by this Makefile")
|
||||
endif
|
||||
|
||||
@ -78,7 +78,7 @@ SED_IN_PLACE := -i ""
|
||||
DARWIN_VERSION := $(shell uname -r | cut -d. -f1)
|
||||
endif
|
||||
|
||||
ifeq ($(UNAME),FreeBSD)
|
||||
ifneq (,$(filter $(UNAME),FreeBSD NetBSD))
|
||||
CC := cc
|
||||
CXX := c++
|
||||
SED := gsed
|
||||
@ -314,6 +314,12 @@ LFLAGS_NATIVE += -liconv
|
||||
endif
|
||||
endif # FreeBSD
|
||||
|
||||
ifeq ($(UNAME),NetBSD)
|
||||
CFLAGS_NATIVE := $(CFLAGS)
|
||||
LFLAGS_NATIVE := $(LFLAGS)
|
||||
LFLAGS_NATIVE += -lpthread
|
||||
endif # NetBSD
|
||||
|
||||
ifeq ($(UNAME),Darwin)
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.15
|
||||
CFLAGS_NATIVE := $(CFLAGS)
|
||||
@ -457,10 +463,10 @@ distclean: clean
|
||||
# allow (whitelist) "make install" only on unix-based systems (also disallow cygwin/msys)
|
||||
|
||||
ifneq ($(findstring install,$(MAKECMDGOALS)),)
|
||||
ifeq (,$(filter $(UNAME),Linux FreeBSD Darwin))
|
||||
ifeq (,$(filter $(UNAME),Linux FreeBSD Darwin NetBSD))
|
||||
define ERROR_INSTALL_DISALLOWED
|
||||
! The 'install' target is not allowed on this operating system ($(UNAME)). \
|
||||
Only Linux, FreeBSD and Darwin can use the 'install' target
|
||||
Only Linux, FreeBSD, NetBSD and Darwin can use the 'install' target
|
||||
endef
|
||||
|
||||
$(error $(ERROR_INSTALL_DISALLOWED))
|
||||
|
||||
@ -45,6 +45,12 @@ static int pthread_setaffinity_np (pthread_t thread, size_t cpu_size, cpu_set_t
|
||||
typedef cpuset_t cpu_set_t;
|
||||
#endif
|
||||
|
||||
#if defined(__NetBSD__)
|
||||
#include <pthread.h>
|
||||
#include <sched.h>
|
||||
typedef cpuset_t cpu_set_t;
|
||||
#endif
|
||||
|
||||
int set_cpu_affinity (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
#if defined (__CYGWIN__)
|
||||
@ -54,19 +60,31 @@ int set_cpu_affinity (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx)
|
||||
|
||||
if (user_options->cpu_affinity == NULL) return 0;
|
||||
|
||||
char *devices = hcstrdup (user_options->cpu_affinity);
|
||||
|
||||
if (devices == NULL) return -1;
|
||||
|
||||
#if defined (_WIN)
|
||||
DWORD_PTR aff_mask = 0;
|
||||
const int cpu_id_max = 8 * sizeof (aff_mask);
|
||||
#elif defined(__NetBSD__)
|
||||
cpuset_t * cpuset;
|
||||
const int cpu_id_max = 8 * cpuset_size (cpuset);
|
||||
cpuset = cpuset_create();
|
||||
if (cpuset == NULL)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "cpuset_create() failed with error: %d", errno);
|
||||
|
||||
hcfree (devices);
|
||||
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
cpu_set_t cpuset;
|
||||
const int cpu_id_max = 8 * sizeof (cpuset);
|
||||
CPU_ZERO (&cpuset);
|
||||
#endif
|
||||
|
||||
char *devices = hcstrdup (user_options->cpu_affinity);
|
||||
|
||||
if (devices == NULL) return -1;
|
||||
|
||||
char *saveptr = NULL;
|
||||
|
||||
char *next = strtok_r (devices, ",", &saveptr);
|
||||
@ -79,6 +97,17 @@ int set_cpu_affinity (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
#if defined (_WIN)
|
||||
aff_mask = 0;
|
||||
#elif defined (__NetBSD__)
|
||||
cpuset_destroy (cpuset);
|
||||
cpuset = cpuset_create ();
|
||||
if (cpuset == NULL)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "cpuset_create() failed with error: %d", errno);
|
||||
|
||||
hcfree (devices);
|
||||
|
||||
return -1;
|
||||
}
|
||||
#else
|
||||
CPU_ZERO (&cpuset);
|
||||
#endif
|
||||
@ -90,6 +119,10 @@ int set_cpu_affinity (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "Invalid cpu_id %d specified.", cpu_id);
|
||||
|
||||
#if defined (__NetBSD__)
|
||||
cpuset_destroy (cpuset);
|
||||
#endif
|
||||
|
||||
hcfree (devices);
|
||||
|
||||
return -1;
|
||||
@ -97,12 +130,18 @@ int set_cpu_affinity (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx)
|
||||
|
||||
#if defined (_WIN)
|
||||
aff_mask |= ((DWORD_PTR) 1) << (cpu_id - 1);
|
||||
#elif defined (__NetBSD__)
|
||||
cpuset_set (cpu_id - 1, cpuset);
|
||||
#else
|
||||
CPU_SET ((cpu_id - 1), &cpuset);
|
||||
#endif
|
||||
|
||||
} while ((next = strtok_r ((char *) NULL, ",", &saveptr)) != NULL);
|
||||
|
||||
#if defined (__NetBSD__)
|
||||
cpuset_destroy (cpuset);
|
||||
#endif
|
||||
|
||||
hcfree (devices);
|
||||
|
||||
#if defined (_WIN)
|
||||
@ -114,6 +153,19 @@ int set_cpu_affinity (MAYBE_UNUSED hashcat_ctx_t *hashcat_ctx)
|
||||
return -1;
|
||||
}
|
||||
|
||||
#elif defined (__NetBSD__)
|
||||
|
||||
pthread_t thread = pthread_self ();
|
||||
|
||||
const int rc = pthread_setaffinity_np (thread, cpuset_size(cpuset), cpuset);
|
||||
|
||||
if (rc != 0)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "pthread_setaffinity_np() failed with error: %d", rc);
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
pthread_t thread = pthread_self ();
|
||||
|
||||
@ -535,7 +535,6 @@ HC_API_CALL void *thread_autotune (void *p)
|
||||
hc_device_param_t *device_param = backend_ctx->devices_param + thread_param->tid;
|
||||
|
||||
if (device_param->skipped == true) return NULL;
|
||||
|
||||
if (device_param->skipped_warning == true) return NULL;
|
||||
|
||||
// init autotunes status and rc
|
||||
|
||||
112
src/backend.c
112
src/backend.c
@ -112,7 +112,6 @@ static int backend_ctx_find_alias_devices (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *backend_device = &backend_ctx->devices_param[backend_devices_pos];
|
||||
|
||||
if (backend_device->skipped == true) continue;
|
||||
|
||||
if (backend_device->skipped_warning == true) continue;
|
||||
|
||||
for (int device_id_alias_pos = 0; device_id_alias_pos < backend_device->device_id_alias_cnt; device_id_alias_pos++)
|
||||
@ -122,7 +121,6 @@ static int backend_ctx_find_alias_devices (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *alias_device = &backend_ctx->devices_param[alias_pos];
|
||||
|
||||
if (alias_device->skipped == true) continue;
|
||||
|
||||
if (alias_device->skipped_warning == true) continue;
|
||||
|
||||
// this lets CUDA devices survive over OpenCL
|
||||
@ -6433,7 +6431,6 @@ void backend_ctx_devices_sync_tuning (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param_src = &backend_ctx->devices_param[backend_devices_cnt_src];
|
||||
|
||||
if (device_param_src->skipped == true) continue;
|
||||
|
||||
if (device_param_src->skipped_warning == true) continue;
|
||||
|
||||
for (int backend_devices_cnt_dst = backend_devices_cnt_src + 1; backend_devices_cnt_dst < backend_ctx->backend_devices_cnt; backend_devices_cnt_dst++)
|
||||
@ -6441,7 +6438,6 @@ void backend_ctx_devices_sync_tuning (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param_dst = &backend_ctx->devices_param[backend_devices_cnt_dst];
|
||||
|
||||
if (device_param_dst->skipped == true) continue;
|
||||
|
||||
if (device_param_dst->skipped_warning == true) continue;
|
||||
|
||||
if (is_same_device_type (device_param_src, device_param_dst) == false) continue;
|
||||
@ -6477,7 +6473,6 @@ void backend_ctx_devices_update_power (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) continue;
|
||||
|
||||
if (device_param->skipped_warning == true) continue;
|
||||
|
||||
kernel_power_all += device_param->kernel_power;
|
||||
@ -6525,7 +6520,6 @@ void backend_ctx_devices_kernel_loops (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) continue;
|
||||
|
||||
if (device_param->skipped_warning == true) continue;
|
||||
|
||||
device_param->kernel_loops_min = device_param->kernel_loops_min_sav;
|
||||
@ -7321,6 +7315,19 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
|
||||
|
||||
u32 hardware_power_all = 0;
|
||||
|
||||
int backend_memory_hit_warnings = 0;
|
||||
int backend_runtime_skip_warnings = 0;
|
||||
int backend_kernel_build_warnings = 0;
|
||||
int backend_kernel_accel_warnings = 0;
|
||||
int backend_extra_size_warning = 0;
|
||||
|
||||
backend_ctx->memory_hit_warning = false;
|
||||
backend_ctx->runtime_skip_warning = false;
|
||||
backend_ctx->kernel_build_warning = false;
|
||||
backend_ctx->kernel_accel_warnings = false;
|
||||
backend_ctx->extra_size_warning = false;
|
||||
backend_ctx->mixed_warnings = false;
|
||||
|
||||
for (int backend_devices_idx = 0; backend_devices_idx < backend_ctx->backend_devices_cnt; backend_devices_idx++)
|
||||
{
|
||||
/**
|
||||
@ -7351,8 +7358,9 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
|
||||
event_log_warning (hashcat_ctx, " This is due to a known CUDA/HIP/OpenCL runtime/driver issue (not a hashcat issue)");
|
||||
event_log_warning (hashcat_ctx, " You can use --force to override, but do not report related errors.");
|
||||
|
||||
device_param->skipped_warning = true;
|
||||
backend_runtime_skip_warnings++;
|
||||
|
||||
device_param->skipped_warning = true;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@ -7940,7 +7948,9 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "Invalid extra buffer size.");
|
||||
|
||||
device_param->skipped = true;
|
||||
backend_extra_size_warning++;
|
||||
|
||||
device_param->skipped_warning = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
@ -8475,7 +8485,10 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "* Device #%u: Kernel %s build failed.", device_param->device_id + 1, source_file);
|
||||
|
||||
return -1;
|
||||
backend_kernel_build_warnings++;
|
||||
|
||||
device_param->skipped_warning = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
hcfree (build_options_module_buf);
|
||||
@ -8636,7 +8649,10 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "* Device #%u: Not enough allocatable device memory for this hashlist/ruleset.", device_id + 1);
|
||||
|
||||
return -1;
|
||||
backend_memory_hit_warnings++;
|
||||
|
||||
device_param->skipped_warning = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (device_param->is_cuda == true)
|
||||
@ -11226,7 +11242,10 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
|
||||
event_log_error (hashcat_ctx, "* Device #%u: Too many compute units to keep minimum kernel accel limit.", device_id + 1);
|
||||
event_log_error (hashcat_ctx, " Retry with lower --backend-kernel-threads value.");
|
||||
|
||||
return -1;
|
||||
backend_kernel_accel_warnings++;
|
||||
|
||||
device_param->skipped_warning = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
// Opposite direction check: find out if we would request too much memory on memory blocks which are based on kernel_accel
|
||||
@ -11411,7 +11430,10 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
|
||||
{
|
||||
event_log_error (hashcat_ctx, "* Device #%u: Not enough allocatable device memory for this attack.", device_id + 1);
|
||||
|
||||
return -1;
|
||||
backend_memory_hit_warnings++;
|
||||
|
||||
device_param->skipped_warning = true;
|
||||
continue;
|
||||
}
|
||||
|
||||
// similar process for association attack
|
||||
@ -11740,6 +11762,32 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
|
||||
EVENT_DATA (EVENT_BACKEND_DEVICE_INIT_POST, &backend_devices_idx, sizeof (int));
|
||||
}
|
||||
|
||||
int rc = 0;
|
||||
|
||||
backend_ctx->memory_hit_warning = (backend_memory_hit_warnings == backend_ctx->backend_devices_active);
|
||||
backend_ctx->runtime_skip_warning = (backend_runtime_skip_warnings == backend_ctx->backend_devices_active);
|
||||
backend_ctx->kernel_build_warning = (backend_kernel_build_warnings == backend_ctx->backend_devices_active);
|
||||
backend_ctx->kernel_accel_warnings = (backend_kernel_accel_warnings == backend_ctx->backend_devices_active);
|
||||
backend_ctx->extra_size_warning = (backend_extra_size_warning == backend_ctx->backend_devices_active);
|
||||
|
||||
// if all active devices failed, set rc to -1
|
||||
// later we prevent hashcat exit if is started in benchmark mode
|
||||
if ((backend_ctx->memory_hit_warning == true) ||
|
||||
(backend_ctx->runtime_skip_warning == true) ||
|
||||
(backend_ctx->kernel_build_warning == true) ||
|
||||
(backend_ctx->kernel_accel_warnings == true) ||
|
||||
(backend_ctx->extra_size_warning == true))
|
||||
{
|
||||
rc = -1;
|
||||
}
|
||||
else
|
||||
{
|
||||
// handle mix of, in case of multiple devices with different warnings
|
||||
backend_ctx->mixed_warnings = ((backend_memory_hit_warnings + backend_runtime_skip_warnings + backend_kernel_build_warnings + backend_kernel_accel_warnings + backend_extra_size_warning) == backend_ctx->backend_devices_active);
|
||||
|
||||
if (backend_ctx->mixed_warnings) rc = -1;
|
||||
}
|
||||
|
||||
if (user_options->benchmark == false)
|
||||
{
|
||||
if (hardware_power_all == 0) return -1;
|
||||
@ -11749,7 +11797,7 @@ int backend_session_begin (hashcat_ctx_t *hashcat_ctx)
|
||||
|
||||
EVENT_DATA (EVENT_BACKEND_SESSION_HOSTMEM, &size_total_host_all, sizeof (u64));
|
||||
|
||||
return 0;
|
||||
return rc;
|
||||
}
|
||||
|
||||
void backend_session_destroy (hashcat_ctx_t *hashcat_ctx)
|
||||
@ -12264,7 +12312,6 @@ int backend_session_update_combinator (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) continue;
|
||||
|
||||
if (device_param->skipped_warning == true) continue;
|
||||
|
||||
// kernel_params
|
||||
@ -12310,7 +12357,6 @@ int backend_session_update_mp (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) continue;
|
||||
|
||||
if (device_param->skipped_warning == true) continue;
|
||||
|
||||
device_param->kernel_params_mp_buf64[3] = 0;
|
||||
@ -12318,27 +12364,18 @@ int backend_session_update_mp (hashcat_ctx_t *hashcat_ctx)
|
||||
|
||||
if (device_param->is_cuda == true)
|
||||
{
|
||||
//for (u32 i = 3; i < 4; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp, i, sizeof (cl_ulong), device_param->kernel_params_mp[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 4; i < 8; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp, i, sizeof (cl_uint), device_param->kernel_params_mp[i]); if (CL_rc == -1) return -1; }
|
||||
|
||||
if (hc_cuMemcpyHtoDAsync (hashcat_ctx, device_param->cuda_d_root_css_buf, mask_ctx->root_css_buf, device_param->size_root_css, device_param->cuda_stream) == -1) return -1;
|
||||
if (hc_cuMemcpyHtoDAsync (hashcat_ctx, device_param->cuda_d_markov_css_buf, mask_ctx->markov_css_buf, device_param->size_markov_css, device_param->cuda_stream) == -1) return -1;
|
||||
}
|
||||
|
||||
if (device_param->is_hip == true)
|
||||
{
|
||||
//for (u32 i = 3; i < 4; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp, i, sizeof (cl_ulong), device_param->kernel_params_mp[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 4; i < 8; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp, i, sizeof (cl_uint), device_param->kernel_params_mp[i]); if (CL_rc == -1) return -1; }
|
||||
|
||||
if (hc_hipMemcpyHtoDAsync (hashcat_ctx, device_param->hip_d_root_css_buf, mask_ctx->root_css_buf, device_param->size_root_css, device_param->hip_stream) == -1) return -1;
|
||||
if (hc_hipMemcpyHtoDAsync (hashcat_ctx, device_param->hip_d_markov_css_buf, mask_ctx->markov_css_buf, device_param->size_markov_css, device_param->hip_stream) == -1) return -1;
|
||||
}
|
||||
|
||||
if (device_param->is_opencl == true)
|
||||
{
|
||||
for (u32 i = 3; i < 4; i++) { if (hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp, i, sizeof (cl_ulong), device_param->kernel_params_mp[i]) == -1) return -1; }
|
||||
for (u32 i = 4; i < 8; i++) { if (hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp, i, sizeof (cl_uint), device_param->kernel_params_mp[i]) == -1) return -1; }
|
||||
|
||||
if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_root_css_buf, CL_FALSE, 0, device_param->size_root_css, mask_ctx->root_css_buf, 0, NULL, NULL) == -1) return -1;
|
||||
if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_markov_css_buf, CL_FALSE, 0, device_param->size_markov_css, mask_ctx->markov_css_buf, 0, NULL, NULL) == -1) return -1;
|
||||
|
||||
@ -12352,7 +12389,7 @@ int backend_session_update_mp (hashcat_ctx_t *hashcat_ctx)
|
||||
int backend_session_update_mp_rl (hashcat_ctx_t *hashcat_ctx, const u32 css_cnt_l, const u32 css_cnt_r)
|
||||
{
|
||||
mask_ctx_t *mask_ctx = hashcat_ctx->mask_ctx;
|
||||
backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx;
|
||||
backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx;
|
||||
user_options_t *user_options = hashcat_ctx->user_options;
|
||||
|
||||
if (backend_ctx->enabled == false) return 0;
|
||||
@ -12364,7 +12401,6 @@ int backend_session_update_mp_rl (hashcat_ctx_t *hashcat_ctx, const u32 css_cnt_
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) continue;
|
||||
|
||||
if (device_param->skipped_warning == true) continue;
|
||||
|
||||
device_param->kernel_params_mp_l_buf64[3] = 0;
|
||||
@ -12376,42 +12412,18 @@ int backend_session_update_mp_rl (hashcat_ctx_t *hashcat_ctx, const u32 css_cnt_
|
||||
|
||||
if (device_param->is_cuda == true)
|
||||
{
|
||||
//for (u32 i = 3; i < 4; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_l, i, sizeof (cl_ulong), device_param->kernel_params_mp_l[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 4; i < 8; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_l, i, sizeof (cl_uint), device_param->kernel_params_mp_l[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 9; i < 9; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_l, i, sizeof (cl_ulong), device_param->kernel_params_mp_l[i]); if (CL_rc == -1) return -1; }
|
||||
|
||||
//for (u32 i = 3; i < 4; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_r, i, sizeof (cl_ulong), device_param->kernel_params_mp_r[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 4; i < 7; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_r, i, sizeof (cl_uint), device_param->kernel_params_mp_r[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 8; i < 8; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_r, i, sizeof (cl_ulong), device_param->kernel_params_mp_r[i]); if (CL_rc == -1) return -1; }
|
||||
|
||||
if (hc_cuMemcpyHtoDAsync (hashcat_ctx, device_param->cuda_d_root_css_buf, mask_ctx->root_css_buf, device_param->size_root_css, device_param->cuda_stream) == -1) return -1;
|
||||
if (hc_cuMemcpyHtoDAsync (hashcat_ctx, device_param->cuda_d_markov_css_buf, mask_ctx->markov_css_buf, device_param->size_markov_css, device_param->cuda_stream) == -1) return -1;
|
||||
}
|
||||
|
||||
if (device_param->is_hip == true)
|
||||
{
|
||||
//for (u32 i = 3; i < 4; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_l, i, sizeof (cl_ulong), device_param->kernel_params_mp_l[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 4; i < 8; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_l, i, sizeof (cl_uint), device_param->kernel_params_mp_l[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 9; i < 9; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_l, i, sizeof (cl_ulong), device_param->kernel_params_mp_l[i]); if (CL_rc == -1) return -1; }
|
||||
|
||||
//for (u32 i = 3; i < 4; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_r, i, sizeof (cl_ulong), device_param->kernel_params_mp_r[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 4; i < 7; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_r, i, sizeof (cl_uint), device_param->kernel_params_mp_r[i]); if (CL_rc == -1) return -1; }
|
||||
//for (u32 i = 8; i < 8; i++) { CL_rc = hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_r, i, sizeof (cl_ulong), device_param->kernel_params_mp_r[i]); if (CL_rc == -1) return -1; }
|
||||
|
||||
if (hc_hipMemcpyHtoDAsync (hashcat_ctx, device_param->hip_d_root_css_buf, mask_ctx->root_css_buf, device_param->size_root_css, device_param->hip_stream) == -1) return -1;
|
||||
if (hc_hipMemcpyHtoDAsync (hashcat_ctx, device_param->hip_d_markov_css_buf, mask_ctx->markov_css_buf, device_param->size_markov_css, device_param->hip_stream) == -1) return -1;
|
||||
}
|
||||
|
||||
if (device_param->is_opencl == true)
|
||||
{
|
||||
for (u32 i = 3; i < 4; i++) { if (hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_l, i, sizeof (cl_ulong), device_param->kernel_params_mp_l[i]) == -1) return -1; }
|
||||
for (u32 i = 4; i < 8; i++) { if (hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_l, i, sizeof (cl_uint), device_param->kernel_params_mp_l[i]) == -1) return -1; }
|
||||
for (u32 i = 9; i < 9; i++) { if (hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_l, i, sizeof (cl_ulong), device_param->kernel_params_mp_l[i]) == -1) return -1; }
|
||||
|
||||
for (u32 i = 3; i < 4; i++) { if (hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_r, i, sizeof (cl_ulong), device_param->kernel_params_mp_r[i]) == -1) return -1; }
|
||||
for (u32 i = 4; i < 7; i++) { if (hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_r, i, sizeof (cl_uint), device_param->kernel_params_mp_r[i]) == -1) return -1; }
|
||||
for (u32 i = 8; i < 8; i++) { if (hc_clSetKernelArg (hashcat_ctx, device_param->opencl_kernel_mp_r, i, sizeof (cl_ulong), device_param->kernel_params_mp_r[i]) == -1) return -1; }
|
||||
|
||||
if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_root_css_buf, CL_FALSE, 0, device_param->size_root_css, mask_ctx->root_css_buf, 0, NULL, NULL) == -1) return -1;
|
||||
if (hc_clEnqueueWriteBuffer (hashcat_ctx, device_param->opencl_command_queue, device_param->opencl_d_markov_css_buf, CL_FALSE, 0, device_param->size_markov_css, mask_ctx->markov_css_buf, 0, NULL, NULL) == -1) return -1;
|
||||
|
||||
|
||||
@ -32,7 +32,6 @@ static u64 get_highest_words_done (const hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) continue;
|
||||
|
||||
if (device_param->skipped_warning == true) continue;
|
||||
|
||||
const u64 words_done = device_param->words_done;
|
||||
@ -54,7 +53,6 @@ static u64 get_lowest_words_done (const hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) continue;
|
||||
|
||||
if (device_param->skipped_warning == true) continue;
|
||||
|
||||
const u64 words_done = device_param->words_done;
|
||||
@ -353,7 +351,6 @@ HC_API_CALL void *thread_calc_stdin (void *p)
|
||||
hc_device_param_t *device_param = backend_ctx->devices_param + thread_param->tid;
|
||||
|
||||
if (device_param->skipped) return NULL;
|
||||
|
||||
if (device_param->skipped_warning == true) return NULL;
|
||||
|
||||
if (device_param->is_cuda == true)
|
||||
@ -1605,7 +1602,6 @@ HC_API_CALL void *thread_calc (void *p)
|
||||
hc_device_param_t *device_param = backend_ctx->devices_param + thread_param->tid;
|
||||
|
||||
if (device_param->skipped) return NULL;
|
||||
|
||||
if (device_param->skipped_warning == true) return NULL;
|
||||
|
||||
if (device_param->is_cuda == true)
|
||||
|
||||
20
src/folder.c
20
src/folder.c
@ -13,6 +13,9 @@
|
||||
|
||||
#if defined (__APPLE__)
|
||||
#include "event.h"
|
||||
#elif defined (__FreeBSD__) || defined (__NetBSD__)
|
||||
#include <sys/param.h>
|
||||
#include <sys/sysctl.h>
|
||||
#endif
|
||||
|
||||
static int get_exec_path (char *exec_path, const size_t exec_path_sz)
|
||||
@ -45,8 +48,6 @@ static int get_exec_path (char *exec_path, const size_t exec_path_sz)
|
||||
|
||||
#elif defined (__FreeBSD__)
|
||||
|
||||
#include <sys/sysctl.h>
|
||||
|
||||
int mib[4];
|
||||
|
||||
mib[0] = CTL_KERN;
|
||||
@ -60,6 +61,21 @@ static int get_exec_path (char *exec_path, const size_t exec_path_sz)
|
||||
|
||||
const size_t len = strlen (exec_path);
|
||||
|
||||
#elif defined (__NetBSD__)
|
||||
|
||||
int mib[4];
|
||||
|
||||
mib[0] = CTL_KERN;
|
||||
mib[1] = KERN_PROC_ARGS;
|
||||
mib[2] = getpid();
|
||||
mib[3] = KERN_PROC_PATHNAME;
|
||||
|
||||
size_t size = exec_path_sz;
|
||||
|
||||
sysctl (mib, 4, exec_path, &size, NULL, 0);
|
||||
|
||||
const size_t len = strlen (exec_path);
|
||||
|
||||
#else
|
||||
#error Your Operating System is not supported or detected
|
||||
#endif
|
||||
|
||||
@ -827,7 +827,38 @@ static int outer_loop (hashcat_ctx_t *hashcat_ctx)
|
||||
|
||||
EVENT (EVENT_BACKEND_SESSION_PRE);
|
||||
|
||||
if (backend_session_begin (hashcat_ctx) == -1) return -1;
|
||||
if (backend_session_begin (hashcat_ctx) == -1)
|
||||
{
|
||||
if (user_options->benchmark == true)
|
||||
{
|
||||
if (user_options->hash_mode_chgd == false)
|
||||
{
|
||||
// finalize backend session
|
||||
|
||||
backend_session_destroy (hashcat_ctx);
|
||||
|
||||
// clean up
|
||||
|
||||
#ifdef WITH_BRAIN
|
||||
brain_ctx_destroy (hashcat_ctx);
|
||||
#endif
|
||||
|
||||
bitmap_ctx_destroy (hashcat_ctx);
|
||||
combinator_ctx_destroy (hashcat_ctx);
|
||||
cpt_ctx_destroy (hashcat_ctx);
|
||||
hashconfig_destroy (hashcat_ctx);
|
||||
hashes_destroy (hashcat_ctx);
|
||||
mask_ctx_destroy (hashcat_ctx);
|
||||
status_progress_destroy (hashcat_ctx);
|
||||
straight_ctx_destroy (hashcat_ctx);
|
||||
wl_data_destroy (hashcat_ctx);
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
EVENT (EVENT_BACKEND_SESSION_POST);
|
||||
|
||||
@ -1560,6 +1591,7 @@ int hashcat_session_execute (hashcat_ctx_t *hashcat_ctx)
|
||||
logfile_ctx_t *logfile_ctx = hashcat_ctx->logfile_ctx;
|
||||
status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
|
||||
user_options_t *user_options = hashcat_ctx->user_options;
|
||||
backend_ctx_t *backend_ctx = hashcat_ctx->backend_ctx;
|
||||
|
||||
// start logfile entry
|
||||
|
||||
@ -1772,6 +1804,17 @@ int hashcat_session_execute (hashcat_ctx_t *hashcat_ctx)
|
||||
if (status_ctx->devices_status == STATUS_CRACKED) rc_final = 0;
|
||||
if (status_ctx->devices_status == STATUS_ERROR) rc_final = -1;
|
||||
}
|
||||
else if (rc_final == -1)
|
||||
{
|
||||
// setup the new negative status code, usefull in test.sh
|
||||
// -2 is marked as used in status_codes.txt
|
||||
if (backend_ctx->runtime_skip_warning == true) rc_final = -3;
|
||||
if (backend_ctx->memory_hit_warning == true) rc_final = -4;
|
||||
if (backend_ctx->kernel_build_warning == true) rc_final = -5;
|
||||
if (backend_ctx->kernel_accel_warnings == true) rc_final = -6;
|
||||
if (backend_ctx->extra_size_warning == true) rc_final = -7;
|
||||
if (backend_ctx->mixed_warnings == true) rc_final = -8;
|
||||
}
|
||||
|
||||
// special case for --stdout
|
||||
|
||||
|
||||
@ -541,7 +541,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
pdf_t *pdf = (pdf_t *) esalt_buf;
|
||||
if (pdf->id_len == 32)
|
||||
{
|
||||
line_len = snprintf (line_buf, line_size, "$pdf$%d*%d*%d*%d*%d*%d*%08x%08x%08x%08x%08x%08x%08x%08x*%d*%08x%08x%08x%08x%08x%08x%08x%08x*%d*%08x%08x%08x%08x%08x%08x%08x%08x*%s",
|
||||
line_len = snprintf (line_buf, line_size, "$pdf$%d*%d*%d*%d*%d*%d*%08x%08x%08x%08x%08x%08x%08x%08x*%d*%08x%08x%08x%08x%08x%08x%08x%08x*%d*%08x%08x%08x%08x%08x%08x%08x%08x%s",
|
||||
pdf->V,
|
||||
pdf->R,
|
||||
128,
|
||||
@ -579,7 +579,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
}
|
||||
else
|
||||
{
|
||||
line_len = snprintf (line_buf, line_size, "$pdf$%d*%d*%d*%d*%d*%d*%08x%08x%08x%08x*%d*%08x%08x%08x%08x%08x%08x%08x%08x*%d*%08x%08x%08x%08x%08x%08x%08x%08x*%s",
|
||||
line_len = snprintf (line_buf, line_size, "$pdf$%d*%d*%d*%d*%d*%d*%08x%08x%08x%08x*%d*%08x%08x%08x%08x%08x%08x%08x%08x*%d*%08x%08x%08x%08x%08x%08x%08x%08x%s",
|
||||
pdf->V,
|
||||
pdf->R,
|
||||
128,
|
||||
|
||||
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;
|
||||
}
|
||||
@ -151,7 +151,6 @@ static int monitor (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) continue;
|
||||
|
||||
if (device_param->skipped_warning == true) continue;
|
||||
|
||||
const int rc_throttle = hm_get_throttle_with_devices_idx (hashcat_ctx, backend_devices_idx);
|
||||
@ -261,7 +260,6 @@ static int monitor (hashcat_ctx_t *hashcat_ctx)
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) continue;
|
||||
|
||||
if (device_param->skipped_warning == true) continue;
|
||||
|
||||
exec_cnt++;
|
||||
|
||||
@ -1219,7 +1219,6 @@ int mask_ctx_update_loop (hashcat_ctx_t *hashcat_ctx)
|
||||
user_options_extra_t *user_options_extra = hashcat_ctx->user_options_extra;
|
||||
user_options_t *user_options = hashcat_ctx->user_options;
|
||||
|
||||
|
||||
if (user_options_extra->attack_kern == ATTACK_KERN_COMBI)
|
||||
{
|
||||
if (user_options->attack_mode == ATTACK_MODE_COMBI)
|
||||
|
||||
@ -900,7 +900,6 @@ HC_API_CALL void *thread_selftest (void *p)
|
||||
hc_device_param_t *device_param = backend_ctx->devices_param + thread_param->tid;
|
||||
|
||||
if (device_param->skipped == true) return NULL;
|
||||
|
||||
if (device_param->skipped_warning == true) return NULL;
|
||||
|
||||
if (device_param->is_cuda == true)
|
||||
|
||||
11
src/status.c
11
src/status.c
@ -1885,6 +1885,7 @@ char *status_get_brain_rx_all (const hashcat_ctx_t *hashcat_ctx)
|
||||
for (int backend_devices_idx = 0; backend_devices_idx < backend_ctx->backend_devices_cnt; backend_devices_idx++)
|
||||
{
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if ((device_param->skipped == false) && (device_param->skipped_warning == false))
|
||||
{
|
||||
brain_rx_all += device_param->brain_link_recv_bytes;
|
||||
@ -1927,6 +1928,7 @@ char *status_get_brain_tx_all (const hashcat_ctx_t *hashcat_ctx)
|
||||
for (int backend_devices_idx = 0; backend_devices_idx < backend_ctx->backend_devices_cnt; backend_devices_idx++)
|
||||
{
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if ((device_param->skipped == false) && (device_param->skipped_warning == false))
|
||||
{
|
||||
brain_tx_all += device_param->brain_link_send_bytes;
|
||||
@ -2024,7 +2026,6 @@ char *status_get_hwmon_dev (const hashcat_ctx_t *hashcat_ctx, const int backend_
|
||||
snprintf (output_buf, HCBUFSIZ_TINY, "N/A");
|
||||
|
||||
if (device_param->skipped == true) return output_buf;
|
||||
|
||||
if (device_param->skipped_warning == true) return output_buf;
|
||||
|
||||
status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
|
||||
@ -2093,7 +2094,6 @@ int status_get_corespeed_dev (const hashcat_ctx_t *hashcat_ctx, const int backen
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) return -1;
|
||||
|
||||
if (device_param->skipped_warning == true) return -1;
|
||||
|
||||
status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
|
||||
@ -2114,7 +2114,6 @@ int status_get_memoryspeed_dev (const hashcat_ctx_t *hashcat_ctx, const int back
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) return -1;
|
||||
|
||||
if (device_param->skipped_warning == true) return -1;
|
||||
|
||||
status_ctx_t *status_ctx = hashcat_ctx->status_ctx;
|
||||
@ -2135,7 +2134,6 @@ u64 status_get_progress_dev (const hashcat_ctx_t *hashcat_ctx, const int backend
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) return 0;
|
||||
|
||||
if (device_param->skipped_warning == true) return 0;
|
||||
|
||||
return device_param->outerloop_left;
|
||||
@ -2148,7 +2146,6 @@ double status_get_runtime_msec_dev (const hashcat_ctx_t *hashcat_ctx, const int
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) return 0;
|
||||
|
||||
if (device_param->skipped_warning == true) return 0;
|
||||
|
||||
return device_param->outerloop_msec;
|
||||
@ -2161,7 +2158,6 @@ int status_get_kernel_accel_dev (const hashcat_ctx_t *hashcat_ctx, const int bac
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) return 0;
|
||||
|
||||
if (device_param->skipped_warning == true) return 0;
|
||||
|
||||
if (device_param->kernel_accel_prev) return device_param->kernel_accel_prev;
|
||||
@ -2176,7 +2172,6 @@ int status_get_kernel_loops_dev (const hashcat_ctx_t *hashcat_ctx, const int bac
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) return 0;
|
||||
|
||||
if (device_param->skipped_warning == true) return 0;
|
||||
|
||||
if (device_param->kernel_loops_prev) return device_param->kernel_loops_prev;
|
||||
@ -2191,7 +2186,6 @@ int status_get_kernel_threads_dev (const hashcat_ctx_t *hashcat_ctx, const int b
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) return 0;
|
||||
|
||||
if (device_param->skipped_warning == true) return 0;
|
||||
|
||||
if (device_param->kernel_threads_prev) return device_param->kernel_threads_prev;
|
||||
@ -2206,7 +2200,6 @@ int status_get_vector_width_dev (const hashcat_ctx_t *hashcat_ctx, const int bac
|
||||
hc_device_param_t *device_param = &backend_ctx->devices_param[backend_devices_idx];
|
||||
|
||||
if (device_param->skipped == true) return 0;
|
||||
|
||||
if (device_param->skipped_warning == true) return 0;
|
||||
|
||||
return device_param->vector_width;
|
||||
|
||||
@ -439,7 +439,7 @@ void SetConsoleWindowSize (const int x)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined (__linux__) || defined (__CYGWIN__)
|
||||
#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__linux__) || defined (__CYGWIN__)
|
||||
static struct termios savemodes;
|
||||
static int havemodes = 0;
|
||||
|
||||
@ -667,7 +667,14 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
|
||||
{
|
||||
if (hashconfig->opts_type & OPTS_TYPE_BINARY_HASHFILE)
|
||||
{
|
||||
event_log_info (hashcat_ctx, " Example.Hash.Format.: hex-encoded");
|
||||
if (hashconfig->opts_type & OPTS_TYPE_BINARY_HASHFILE_OPTIONAL)
|
||||
{
|
||||
event_log_info (hashcat_ctx, " Example.Hash.Format.: hex-encoded");
|
||||
}
|
||||
else
|
||||
{
|
||||
event_log_info (hashcat_ctx, " Example.Hash.Format.: hex-encoded (binary file only)");
|
||||
}
|
||||
event_log_info (hashcat_ctx, " Example.Hash........: %s", hashconfig->st_hash);
|
||||
}
|
||||
else
|
||||
@ -699,6 +706,20 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
|
||||
|
||||
hcfree (tmp_buf);
|
||||
}
|
||||
else if (hashconfig->opts_type & OPTS_TYPE_PT_UPPER)
|
||||
{
|
||||
size_t st_pass_len = strlen (hashconfig->st_pass);
|
||||
|
||||
char *tmp_buf = (char *) hcmalloc (st_pass_len + 1);
|
||||
|
||||
strncpy (tmp_buf, hashconfig->st_pass, st_pass_len);
|
||||
|
||||
uppercase ((u8 *) tmp_buf, st_pass_len);
|
||||
|
||||
event_log_info (hashcat_ctx, " Example.Pass........: %s", tmp_buf);
|
||||
|
||||
hcfree (tmp_buf);
|
||||
}
|
||||
else
|
||||
{
|
||||
event_log_info (hashcat_ctx, " Example.Pass........: %s", hashconfig->st_pass);
|
||||
@ -720,6 +741,23 @@ void hash_info_single (hashcat_ctx_t *hashcat_ctx, user_options_extra_t *user_op
|
||||
event_log_info (hashcat_ctx, " Benchmark.Mask......: N/A");
|
||||
}
|
||||
|
||||
event_log_info (hashcat_ctx, " Autodetect.Enabled..: %s", (hashconfig->opts_type & OPTS_TYPE_AUTODETECT_DISABLE) ? "No" : "Yes");
|
||||
event_log_info (hashcat_ctx, " Self.Test.Enabled...: %s", (hashconfig->opts_type & OPTS_TYPE_SELF_TEST_DISABLE) ? "No" : "Yes");
|
||||
event_log_info (hashcat_ctx, " Potfile.Enabled.....: %s", (hashconfig->opts_type & OPTS_TYPE_POTFILE_NOPASS) ? "No" : "Yes");
|
||||
|
||||
if (hashconfig->opts_type & OPTS_TYPE_PT_ALWAYS_ASCII)
|
||||
{
|
||||
event_log_info (hashcat_ctx, " Plaintext.Encoding..: ASCII only");
|
||||
}
|
||||
else if (hashconfig->opts_type & OPTS_TYPE_PT_ALWAYS_HEXIFY)
|
||||
{
|
||||
event_log_info (hashcat_ctx, " Plaintext.Encoding..: HEX only");
|
||||
}
|
||||
else
|
||||
{
|
||||
event_log_info (hashcat_ctx, " Plaintext.Encoding..: ASCII, HEX");
|
||||
}
|
||||
|
||||
event_log_info (hashcat_ctx, NULL);
|
||||
}
|
||||
|
||||
@ -1175,7 +1213,6 @@ void status_display_machine_readable (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
printf ("%" PRIu64 "\t", (u64) (device_info->hashes_msec_dev * 1000));
|
||||
@ -1191,7 +1228,6 @@ void status_display_machine_readable (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
printf ("%f\t", device_info->exec_msec_dev);
|
||||
@ -1214,7 +1250,6 @@ void status_display_machine_readable (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
const int temp = hm_get_temperature_with_devices_idx (hashcat_ctx, device_id);
|
||||
@ -1232,7 +1267,6 @@ void status_display_machine_readable (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
// ok, little cheat here again...
|
||||
@ -1351,7 +1385,6 @@ void status_display_status_json (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
if (device_num != 0)
|
||||
@ -1784,7 +1817,6 @@ void status_display (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
event_log_info (hashcat_ctx,
|
||||
@ -1901,7 +1933,6 @@ void status_display (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
if (device_info->brain_link_status_dev == BRAIN_LINK_STATUS_CONNECTED)
|
||||
@ -1978,7 +2009,6 @@ void status_display (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
event_log_info (hashcat_ctx,
|
||||
@ -2005,7 +2035,6 @@ void status_display (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
if (device_info->guess_candidates_dev == NULL) continue;
|
||||
@ -2026,7 +2055,6 @@ void status_display (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
if (device_info->hwmon_dev == NULL) continue;
|
||||
@ -2070,7 +2098,6 @@ void status_benchmark_machine_readable (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
event_log_info (hashcat_ctx, "%d:%u:%d:%d:%.2f:%" PRIu64, device_id + 1, hash_mode, device_info->corespeed_dev, device_info->memoryspeed_dev, device_info->exec_msec_dev, (u64) (device_info->hashes_msec_dev_benchmark * 1000));
|
||||
@ -2106,7 +2133,6 @@ void status_benchmark (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
event_log_info (hashcat_ctx,
|
||||
@ -2147,7 +2173,6 @@ void status_speed_machine_readable (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
event_log_info (hashcat_ctx, "%d:%" PRIu64, device_id + 1, (u64) (device_info->hashes_msec_dev_benchmark * 1000));
|
||||
@ -2178,7 +2203,6 @@ void status_speed_json (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
if (device_num != 0)
|
||||
@ -2230,7 +2254,6 @@ void status_speed (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
event_log_info (hashcat_ctx,
|
||||
@ -2267,7 +2290,6 @@ void status_progress_machine_readable (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
event_log_info (hashcat_ctx, "%d:%" PRIu64 ":%0.2f", device_id + 1, device_info->progress_dev, device_info->runtime_msec_dev);
|
||||
@ -2298,7 +2320,6 @@ void status_progress_json (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
if (device_num != 0)
|
||||
@ -2351,7 +2372,6 @@ void status_progress (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
event_log_info (hashcat_ctx,
|
||||
@ -2364,7 +2384,6 @@ void status_progress (hashcat_ctx_t *hashcat_ctx)
|
||||
const device_info_t *device_info = hashcat_status->device_info_buf + device_id;
|
||||
|
||||
if (device_info->skipped_dev == true) continue;
|
||||
|
||||
if (device_info->skipped_warning_dev == true) continue;
|
||||
|
||||
event_log_info (hashcat_ctx,
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
847
tools/test.sh
847
tools/test.sh
File diff suppressed because it is too large
Load Diff
@ -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
|
||||
{
|
||||
|
||||
@ -8,11 +8,9 @@
|
||||
use strict;
|
||||
use warnings;
|
||||
|
||||
use Crypt::ScryptKDF qw (scrypt_hash scrypt_raw);
|
||||
use Crypt::CBC;
|
||||
use MIME::Base64 qw (decode_base64 encode_base64);
|
||||
use Digest::SHA qw (sha512);
|
||||
use Crypt::AuthEnc::GCM;
|
||||
use Crypt::ScryptKDF qw (scrypt_raw);
|
||||
use MIME::Base64 qw (decode_base64 encode_base64);
|
||||
|
||||
sub module_constraints { [[0, 256], [64, 64], [-1, -1], [-1, -1], [-1, -1]] }
|
||||
|
||||
|
||||
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