Added hash-mode 18800 Blockchain, My Wallet, Second Password (SHA256)

pull/1935/head
jsteube 5 years ago
parent 306d40a13a
commit d0d4ce9f8c

@ -0,0 +1,142 @@
/**
* Author......: See docs/credits.txt
* License.....: MIT
*/
#define NEW_SIMD_CODE
#include "inc_vendor.cl"
#include "inc_hash_constants.h"
#include "inc_hash_functions.cl"
#include "inc_types.cl"
#include "inc_common.cl"
#include "inc_simd.cl"
#include "inc_hash_sha256.cl"
#define COMPARE_S "inc_comp_single.cl"
#define COMPARE_M "inc_comp_multi.cl"
typedef struct bsp_tmp
{
u32 hash[8];
} bsp_tmp_t;
__kernel void m18800_init (KERN_ATTR_TMPS (bsp_tmp_t))
{
/**
* base
*/
const u64 gid = get_global_id (0);
if (gid >= gid_max) return;
sha256_ctx_t ctx;
sha256_init (&ctx);
sha256_update_global_swap (&ctx, salt_bufs[salt_pos].salt_buf, salt_bufs[salt_pos].salt_len);
sha256_update_global_swap (&ctx, pws[gid].i, pws[gid].pw_len & 255);
sha256_final (&ctx);
tmps[gid].hash[0] = ctx.h[0];
tmps[gid].hash[1] = ctx.h[1];
tmps[gid].hash[2] = ctx.h[2];
tmps[gid].hash[3] = ctx.h[3];
tmps[gid].hash[4] = ctx.h[4];
tmps[gid].hash[5] = ctx.h[5];
tmps[gid].hash[6] = ctx.h[6];
tmps[gid].hash[7] = ctx.h[7];
}
__kernel void m18800_loop (KERN_ATTR_TMPS (bsp_tmp_t))
{
const u64 gid = get_global_id (0);
if ((gid * VECT_SIZE) >= gid_max) return;
u32x digest[8];
digest[0] = packv (tmps, hash, gid, 0);
digest[1] = packv (tmps, hash, gid, 1);
digest[2] = packv (tmps, hash, gid, 2);
digest[3] = packv (tmps, hash, gid, 3);
digest[4] = packv (tmps, hash, gid, 4);
digest[5] = packv (tmps, hash, gid, 5);
digest[6] = packv (tmps, hash, gid, 6);
digest[7] = packv (tmps, hash, gid, 7);
for (u32 j = 0; j < loop_cnt; j++)
{
u32x w0[4];
u32x w1[4];
u32x w2[4];
u32x w3[4];
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] = 32 * 8;
digest[0] = SHA256M_A;
digest[1] = SHA256M_B;
digest[2] = SHA256M_C;
digest[3] = SHA256M_D;
digest[4] = SHA256M_E;
digest[5] = SHA256M_F;
digest[6] = SHA256M_G;
digest[7] = SHA256M_H;
sha256_transform_vector (w0, w1, w2, w3, digest);
}
unpackv (tmps, hash, gid, 0, digest[0]);
unpackv (tmps, hash, gid, 1, digest[1]);
unpackv (tmps, hash, gid, 2, digest[2]);
unpackv (tmps, hash, gid, 3, digest[3]);
unpackv (tmps, hash, gid, 4, digest[4]);
unpackv (tmps, hash, gid, 5, digest[5]);
unpackv (tmps, hash, gid, 6, digest[6]);
unpackv (tmps, hash, gid, 7, digest[7]);
}
__kernel void m18800_comp (KERN_ATTR_TMPS (bsp_tmp_t))
{
/**
* modifier
*/
const u64 gid = get_global_id (0);
if (gid >= gid_max) return;
const u64 lid = get_local_id (0);
/**
* digest
*/
const u32 r0 = tmps[gid].hash[DGST_R0];
const u32 r1 = tmps[gid].hash[DGST_R1];
const u32 r2 = tmps[gid].hash[DGST_R2];
const u32 r3 = tmps[gid].hash[DGST_R3];
#define il_pos 0
#include COMPARE_M
}

@ -0,0 +1,253 @@
/**
* Author......: See docs/credits.txt
* License.....: MIT
*/
#include "common.h"
#include "types.h"
#include "modules.h"
#include "bitops.h"
#include "convert.h"
#include "shared.h"
#include "memory.h"
static const u32 ATTACK_EXEC = ATTACK_EXEC_OUTSIDE_KERNEL;
static const u32 DGST_POS0 = 0;
static const u32 DGST_POS1 = 1;
static const u32 DGST_POS2 = 2;
static const u32 DGST_POS3 = 3;
static const u32 DGST_SIZE = DGST_SIZE_4_4;
static const u32 HASH_CATEGORY = HASH_CATEGORY_PASSWORD_MANAGER;
static const char *HASH_NAME = "Blockchain, My Wallet, Second Password (SHA256)";
static const u64 KERN_TYPE = 18800;
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;
static const u32 SALT_TYPE = SALT_TYPE_EMBEDDED;
static const char *ST_PASS = "hashcat";
static const char *ST_HASH = "YnM6WYERjJfhxwepT7zV6odWoEUz1X4esYQb4bQ3KZ7bbZAyOTc1MDM3OTc1NjMyODA0ECcAAD3vFoc=";
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 bsp_tmp
{
u32 hash[8];
} bsp_tmp_t;
typedef struct bsp
{
char signature[3];
u32 digest[8];
u32 salt[4];
u32 iter;
u32 crc32;
} bsp_t;
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 (bsp_tmp_t);
return tmp_size;
}
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 (bsp_t);
return esalt_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)
{
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;
bsp_t *bsp = (bsp_t *) esalt_buf;
token_t token;
token.token_cnt = 1;
token.len_min[0] = 80;
token.len_max[0] = 80;
token.attr[0] = TOKEN_ATTR_VERIFY_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);
u8 tmp_buf[64];
const int tmp_len = base64_decode (base64_to_int, token.buf[0], token.len[0], (u8 *) tmp_buf);
if (tmp_len != 59) return (PARSER_HASH_LENGTH);
memcpy ((char *) &bsp->signature, tmp_buf + 0, 3);
memcpy ((char *) &bsp->digest, tmp_buf + 3, 32);
memcpy ((char *) &bsp->salt, tmp_buf + 35, 16);
memcpy ((char *) &bsp->iter, tmp_buf + 51, 4);
memcpy ((char *) &bsp->crc32, tmp_buf + 55, 4);
// version
if (bsp->signature[0] != 'b') return (PARSER_SIGNATURE_UNMATCHED);
if (bsp->signature[1] != 's') return (PARSER_SIGNATURE_UNMATCHED);
if (bsp->signature[2] != ':') return (PARSER_SIGNATURE_UNMATCHED);
// digest
digest[0] = byte_swap_32 (bsp->digest[0]);
digest[1] = byte_swap_32 (bsp->digest[1]);
digest[2] = byte_swap_32 (bsp->digest[2]);
digest[3] = byte_swap_32 (bsp->digest[3]);
// salt
const u8 *ptr = (const u8 *) bsp->salt;
u8 *uuid = (u8 *) salt->salt_buf;
int uuid_len = 0;
u8_to_hex (ptr[ 0], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[ 1], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[ 2], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[ 3], uuid + uuid_len); uuid_len += 2;
uuid[uuid_len] = '-'; uuid_len += 1;
u8_to_hex (ptr[ 4], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[ 5], uuid + uuid_len); uuid_len += 2;
uuid[uuid_len] = '-'; uuid_len += 1;
u8_to_hex (ptr[ 6], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[ 7], uuid + uuid_len); uuid_len += 2;
uuid[uuid_len] = '-'; uuid_len += 1;
u8_to_hex (ptr[ 8], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[ 9], uuid + uuid_len); uuid_len += 2;
uuid[uuid_len] = '-'; uuid_len += 1;
u8_to_hex (ptr[10], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[11], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[12], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[13], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[14], uuid + uuid_len); uuid_len += 2;
u8_to_hex (ptr[15], uuid + uuid_len); uuid_len += 2;
uuid[uuid_len] = 0;
salt->salt_len = 36;
salt->salt_iter = bsp->iter - 1;
return (PARSER_OK);
}
int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSED const void *digest_buf, MAYBE_UNUSED const salt_t *salt, MAYBE_UNUSED const void *esalt_buf, MAYBE_UNUSED const void *hook_salt_buf, MAYBE_UNUSED const hashinfo_t *hash_info, char *line_buf, MAYBE_UNUSED const int line_size)
{
const bsp_t *bsp = (const bsp_t *) esalt_buf;
u8 tmp_buf[64];
memcpy (tmp_buf + 0, &bsp->signature, 3);
memcpy (tmp_buf + 3, &bsp->digest, 32);
memcpy (tmp_buf + 35, &bsp->salt, 16);
memcpy (tmp_buf + 51, &bsp->iter, 4);
memcpy (tmp_buf + 55, &bsp->crc32, 4);
return base64_encode (int_to_base64, (const u8 *) tmp_buf, 59, (u8 *) line_buf);
}
void module_init (module_ctx_t *module_ctx)
{
module_ctx->module_context_size = MODULE_CONTEXT_SIZE_CURRENT;
module_ctx->module_interface_version = MODULE_INTERFACE_VERSION_CURRENT;
module_ctx->module_attack_exec = module_attack_exec;
module_ctx->module_benchmark_esalt = MODULE_DEFAULT;
module_ctx->module_benchmark_hook_salt = MODULE_DEFAULT;
module_ctx->module_benchmark_mask = MODULE_DEFAULT;
module_ctx->module_benchmark_salt = MODULE_DEFAULT;
module_ctx->module_build_plain_postprocess = MODULE_DEFAULT;
module_ctx->module_deep_comp_kernel = MODULE_DEFAULT;
module_ctx->module_dgst_pos0 = module_dgst_pos0;
module_ctx->module_dgst_pos1 = module_dgst_pos1;
module_ctx->module_dgst_pos2 = module_dgst_pos2;
module_ctx->module_dgst_pos3 = module_dgst_pos3;
module_ctx->module_dgst_size = module_dgst_size;
module_ctx->module_dictstat_disable = MODULE_DEFAULT;
module_ctx->module_esalt_size = module_esalt_size;
module_ctx->module_extra_buffer_size = MODULE_DEFAULT;
module_ctx->module_extra_tmp_size = MODULE_DEFAULT;
module_ctx->module_forced_outfile_format = MODULE_DEFAULT;
module_ctx->module_hash_binary_count = MODULE_DEFAULT;
module_ctx->module_hash_binary_parse = MODULE_DEFAULT;
module_ctx->module_hash_binary_save = MODULE_DEFAULT;
module_ctx->module_hash_decode_outfile = 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 = 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_hlfmt_disable = MODULE_DEFAULT;
module_ctx->module_hook12 = MODULE_DEFAULT;
module_ctx->module_hook23 = MODULE_DEFAULT;
module_ctx->module_hook_salt_size = MODULE_DEFAULT;
module_ctx->module_hook_size = MODULE_DEFAULT;
module_ctx->module_jit_build_options = MODULE_DEFAULT;
module_ctx->module_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_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;
}

@ -0,0 +1,85 @@
#!/usr/bin/env perl
##
## Author......: See docs/credits.txt
## License.....: MIT
##
use strict;
use warnings;
use Digest::CRC qw (crc32);
use Digest::SHA qw (sha256);
use MIME::Base64 qw (encode_base64 decode_base64);
sub module_constraints { [[0, 255], [16, 16], [-1, -1], [-1, -1], [-1, -1]] }
sub module_generate_hash
{
my $word = shift;
my $salt = shift;
my $iter = shift // 10000;
# salt to UUID conversion
my $UUID = unpack ("H*", substr ($salt, 0, 4)) . '-' .
unpack ("H*", substr ($salt, 4, 2)) . '-' .
unpack ("H*", substr ($salt, 6, 2)) . '-' .
unpack ("H*", substr ($salt, 8, 2)) . '-' .
unpack ("H*", substr ($salt, 10, 6));
my $digest = sha256 ($UUID . $word);
print unpack ("H*", $digest). "\n";
for (my $i = 0; $i < $iter - 1; $i++)
{
$digest = sha256 ($digest);
}
print unpack ("H*", $digest). "\n";
my $data = "bs:" . $digest . $salt . pack ("L<", $iter);
# add the crc32 checksum at the end (4 bytes)
$data .= pack ("L<", crc32 ($data));
my $base64_data = encode_base64 ($data, '');
return $base64_data;
}
sub module_verify_hash
{
my $line = shift;
my ($hash, $word) = split (':', $line);
return unless defined $hash;
return unless defined $word;
return unless length ($hash) == 80;
my $bin_string = decode_base64 ($hash);
return unless substr ($bin_string, 0, 3) eq "bs:";
# crc32 (data corruption) check:
return unless pack ("L<", crc32 (substr ($bin_string, 0, 55))) eq substr ($bin_string, 55, 4);
my $digest = substr ($bin_string, 3, 32);
my $salt = substr ($bin_string, 35, 16);
my $iter_str = substr ($bin_string, 51, 4);
my $iter = unpack ("L<", $iter_str);
my $word_packed = pack_if_HEX_notation ($word);
my $new_hash = module_generate_hash ($word_packed, $salt, $iter);
return ($new_hash, $word);
}
1;
Loading…
Cancel
Save