arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-25 17:38:23 +00:00
Code Issues Releases Wiki Activity

Merge branch 'hashcat:master' into sm3

Browse Source
This commit is contained in:
Zgzorx 2023-02-20 13:59:07 +01:00 committed by GitHub
commit c85d817192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 225 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
OpenCL/m31000_a1-optimized.cl
View File

@ -91,6 +91,8 @@ KERNEL_FQ void m31000_m04 (KERN_ATTR_BASIC ())
u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1];
@ -100,6 +102,14 @@ KERNEL_FQ void m31000_m04 (KERN_ATTR_BASIC ())
w1[1] = wordl1[1] | wordr1[1];
w1[2] = wordl1[2] | wordr1[2];
w1[3] = wordl1[3] | wordr1[3];
w2[0] = wordl2[0] | wordr2[0];
w2[1] = wordl2[1] | wordr2[1];
w2[2] = wordl2[2] | wordr2[2];
w2[3] = wordl2[3] | wordr2[3];
w3[0] = wordl3[0] | wordr3[0];
w3[1] = wordl3[1] | wordr3[1];
w3[2] = wordl3[2] | wordr3[2];
w3[3] = wordl3[3] | wordr3[3];
u32x m[16];
@ -111,14 +121,14 @@ KERNEL_FQ void m31000_m04 (KERN_ATTR_BASIC ())
m[ 5] = w1[1];
m[ 6] = w1[2];
m[ 7] = w1[3];
m[ 8] = 0;
m[ 9] = 0;
m[10] = 0;
m[11] = 0;
m[12] = 0;
m[13] = 0;
m[14] = 0;
m[15] = 0;
m[ 8] = w2[0];
m[ 9] = w2[1];
m[10] = w2[2];
m[11] = w2[3];
m[12] = w3[0];
m[13] = w3[1];
m[14] = w3[2];
m[15] = w3[3];
u32x h[8];
@ -239,6 +249,8 @@ KERNEL_FQ void m31000_s04 (KERN_ATTR_BASIC ())
u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
w0[0] = wordl0[0] | wordr0[0];
w0[1] = wordl0[1] | wordr0[1];
@ -248,6 +260,14 @@ KERNEL_FQ void m31000_s04 (KERN_ATTR_BASIC ())
w1[1] = wordl1[1] | wordr1[1];
w1[2] = wordl1[2] | wordr1[2];
w1[3] = wordl1[3] | wordr1[3];
w2[0] = wordl2[0] | wordr2[0];
w2[1] = wordl2[1] | wordr2[1];
w2[2] = wordl2[2] | wordr2[2];
w2[3] = wordl2[3] | wordr2[3];
w3[0] = wordl3[0] | wordr3[0];
w3[1] = wordl3[1] | wordr3[1];
w3[2] = wordl3[2] | wordr3[2];
w3[3] = wordl3[3] | wordr3[3];
u32x m[16];
@ -259,14 +279,15 @@ KERNEL_FQ void m31000_s04 (KERN_ATTR_BASIC ())
m[ 5] = w1[1];
m[ 6] = w1[2];
m[ 7] = w1[3];
m[ 8] = 0;
m[ 9] = 0;
m[10] = 0;
m[11] = 0;
m[12] = 0;
m[13] = 0;
m[14] = 0;
m[15] = 0;
m[ 8] = w2[0];
m[ 9] = w2[1];
m[10] = w2[2];
m[11] = w2[3];
m[12] = w3[0];
m[13] = w3[1];
m[14] = w3[2];
m[15] = w3[3];
u32x h[8];

88
OpenCL/m31000_a3-optimized.cl
View File

@ -31,36 +31,24 @@ DECLSPEC void m31000m (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTO
const u32x w0r = words_buf_r[il_pos / VECT_SIZE];
const u32x w0x = w0l | w0r;
u32x w0[4];
u32x w1[4];
w0[0] = w0x;
w0[1] = w[ 1];
w0[2] = w[ 2];
w0[3] = w[ 3];
w1[0] = w[ 4];
w1[1] = w[ 5];
w1[2] = w[ 6];
w1[3] = w[ 7];
u32x m[16];
m[ 0] = w0[0];
m[ 1] = w0[1];
m[ 2] = w0[2];
m[ 3] = w0[3];
m[ 4] = w1[0];
m[ 5] = w1[1];
m[ 6] = w1[2];
m[ 7] = w1[3];
m[ 8] = 0;
m[ 9] = 0;
m[10] = 0;
m[11] = 0;
m[12] = 0;
m[13] = 0;
m[14] = 0;
m[15] = 0;
m[ 0] = w0x;
m[ 1] = w[ 1];
m[ 2] = w[ 2];
m[ 3] = w[ 3];
m[ 4] = w[ 4];
m[ 5] = w[ 5];
m[ 6] = w[ 6];
m[ 7] = w[ 7];
m[ 8] = w[ 8];
m[ 9] = w[ 9];
m[10] = w[10];
m[11] = w[11];
m[12] = w[12];
m[13] = w[13];
m[14] = w[14];
m[15] = w[15];
u32x h[8];
@ -113,36 +101,24 @@ DECLSPEC void m31000s (PRIVATE_AS u32 *w, const u32 pw_len, KERN_ATTR_FUNC_VECTO
const u32x w0r = words_buf_r[il_pos / VECT_SIZE];
const u32x w0x = w0l | w0r;
u32x w0[4];
u32x w1[4];
w0[0] = w0x;
w0[1] = w[ 1];
w0[2] = w[ 2];
w0[3] = w[ 3];
w1[0] = w[ 4];
w1[1] = w[ 5];
w1[2] = w[ 6];
w1[3] = w[ 7];
u32x m[16];
m[ 0] = w0[0];
m[ 1] = w0[1];
m[ 2] = w0[2];
m[ 3] = w0[3];
m[ 4] = w1[0];
m[ 5] = w1[1];
m[ 6] = w1[2];
m[ 7] = w1[3];
m[ 8] = 0;
m[ 9] = 0;
m[10] = 0;
m[11] = 0;
m[12] = 0;
m[13] = 0;
m[14] = 0;
m[15] = 0;
m[ 0] = w0x;
m[ 1] = w[ 1];
m[ 2] = w[ 2];
m[ 3] = w[ 3];
m[ 4] = w[ 4];
m[ 5] = w[ 5];
m[ 6] = w[ 6];
m[ 7] = w[ 7];
m[ 8] = w[ 8];
m[ 9] = w[ 9];
m[10] = w[10];
m[11] = w[11];
m[12] = w[12];
m[13] = w[13];
m[14] = w[14];
m[15] = w[15];
u32x h[8];

11
docs/changes.txt
View File

@ -9,12 +9,13 @@
- Added hash-mode: Bitcoin raw private key (P2PKH)
- Added hash-mode: Bitcoin raw private key (P2SH(P2WPKH))
- Added hash-mode: Bitcoin raw private key (P2WPKH, Bech32)
- Added hash-mode: ENCsecurity Datavault (PBKDF2/no keychain)
- Added hash-mode: ENCsecurity Datavault (PBKDF2/keychain)
- Added hash-mode: ENCsecurity Datavault (MD5/no keychain)
- Added hash-mode: ENCsecurity Datavault (MD5/keychain)
- Added hash-mode: DANE RFC7929/RFC8162 SHA2-256
- Added hash-mode: BLAKE2s-256
- Added hash-mode: Dahua NVR/DVR/HVR (md5($salt1.strtoupper(md5($salt2.$pass))))
- Added hash-mode: DANE RFC7929/RFC8162 SHA2-256
- Added hash-mode: ENCsecurity Datavault (MD5/keychain)
- Added hash-mode: ENCsecurity Datavault (MD5/no keychain)
- Added hash-mode: ENCsecurity Datavault (PBKDF2/keychain)
- Added hash-mode: ENCsecurity Datavault (PBKDF2/no keychain)
- Added hash-mode: GPG (AES-128/AES-256 (SHA-1($pass)))
- Added hash-mode: GPG (AES-128/AES-256 (SHA-512($pass)))
- Added hash-mode: HMAC-RIPEMD160 (key = $pass)

1
include/types.h
View File

@ -2101,6 +2101,7 @@ typedef struct outfile_ctx
u32 outfile_format;
bool outfile_autohex;
bool is_fifo;
char *filename;

123
src/modules/module_31000.c
View File

@ -19,81 +19,29 @@ static const u32 DGST_SIZE = DGST_SIZE_4_8;
static const u32 HASH_CATEGORY = HASH_CATEGORY_RAW_HASH;
static const char *HASH_NAME = "BLAKE2s-256";
static const u64 KERN_TYPE = 31000;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE | OPTI_TYPE_USES_BITS_32 | OPTI_TYPE_RAW_HASH;
static const u64 OPTS_TYPE = OPTS_TYPE_STOCK_MODULE | OPTS_TYPE_PT_GENERATE_LE;
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
| OPTI_TYPE_USES_BITS_32
| OPTI_TYPE_RAW_HASH;
static const u64 OPTS_TYPE = OPTS_TYPE_STOCK_MODULE
| OPTS_TYPE_PT_GENERATE_LE;
static const u32 SALT_TYPE = SALT_TYPE_NONE;
static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "$BLAKE2$2c719b484789ad5f6fc1739012182169b25484af156adc91d4f64f72400e574a";
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;
}
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; }
static const char *SIGNATURE_BLAKE2S = "$BLAKE2$";
@ -109,15 +57,16 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUS
token.signatures_buf[0] = SIGNATURE_BLAKE2S;
token.len[0] = 8;
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH | TOKEN_ATTR_VERIFY_SIGNATURE;
token.attr[0] = TOKEN_ATTR_FIXED_LENGTH
| TOKEN_ATTR_VERIFY_SIGNATURE;
token.len[1] = 64;
token.attr[1] = TOKEN_ATTR_FIXED_LENGTH | TOKEN_ATTR_VERIFY_HEX;
token.attr[1] = TOKEN_ATTR_FIXED_LENGTH
| TOKEN_ATTR_VERIFY_HEX;
const int rc_tokenizer = input_tokenizer ((const u8 *) line_buf, line_len, &token);
if (rc_tokenizer != PARSER_OK)
return (rc_tokenizer);
if (rc_tokenizer != PARSER_OK) return (rc_tokenizer);
const u8 *hash_pos = token.buf[1];
@ -146,22 +95,14 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t * hashconfig, MAYBE_UNUS
memcpy (out_buf, SIGNATURE_BLAKE2S, out_len);
u32_to_hex (digest[0], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[1], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[2], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[3], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[4], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[5], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[6], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[7], out_buf + out_len);
out_len += 8;
u32_to_hex (digest[0], out_buf + out_len); out_len += 8;
u32_to_hex (digest[1], out_buf + out_len); out_len += 8;
u32_to_hex (digest[2], out_buf + out_len); out_len += 8;
u32_to_hex (digest[3], out_buf + out_len); out_len += 8;
u32_to_hex (digest[4], out_buf + out_len); out_len += 8;
u32_to_hex (digest[5], out_buf + out_len); out_len += 8;
u32_to_hex (digest[6], out_buf + out_len); out_len += 8;
u32_to_hex (digest[7], out_buf + out_len); out_len += 8;
return out_len;
}

17
src/outfile.c
View File

@ -503,6 +503,7 @@ int outfile_init (hashcat_ctx_t *hashcat_ctx)
outfile_ctx->filename = user_options->outfile;
outfile_ctx->outfile_format = user_options->outfile_format;
outfile_ctx->outfile_autohex = user_options->outfile_autohex;
outfile_ctx->is_fifo = hc_path_is_fifo (outfile_ctx->filename);
return 0;
}
@ -511,6 +512,13 @@ void outfile_destroy (hashcat_ctx_t *hashcat_ctx)
{
outfile_ctx_t *outfile_ctx = hashcat_ctx->outfile_ctx;
if (outfile_ctx->is_fifo == true && outfile_ctx->fp.pfp != NULL)
{
hc_unlockfile (&outfile_ctx->fp);
hc_fclose (&outfile_ctx->fp);
}
memset (outfile_ctx, 0, sizeof (outfile_ctx_t));
}
@ -520,6 +528,8 @@ int outfile_write_open (hashcat_ctx_t *hashcat_ctx)
if (outfile_ctx->filename == NULL) return 0;
if (outfile_ctx->is_fifo == false || outfile_ctx->fp.pfp == NULL)
{
if (hc_fopen (&outfile_ctx->fp, outfile_ctx->filename, "ab") == false)
{
event_log_error (hashcat_ctx, "%s: %s", outfile_ctx->filename, strerror (errno));
@ -535,6 +545,7 @@ int outfile_write_open (hashcat_ctx_t *hashcat_ctx)
return -1;
}
}
return 0;
}
@ -545,6 +556,12 @@ void outfile_write_close (hashcat_ctx_t *hashcat_ctx)
if (outfile_ctx->fp.pfp == NULL) return;
if (outfile_ctx->is_fifo == true)
{
hc_fflush (&outfile_ctx->fp);
return;
}
hc_unlockfile (&outfile_ctx->fp);
hc_fclose (&outfile_ctx->fp);