electrum 4/5: improve speed (rm hook)
This commit is contained in:
philsmd
+2
-44
@@ -10,13 +10,9 @@ PRODUCTION_VERSION := v5.1.0
|
||||
ENABLE_BRAIN := 1
|
||||
USE_SYSTEM_LZMA := 0
|
||||
USE_SYSTEM_ZLIB := 0
|
||||
USE_SYSTEM_LIBSECP256K1 := 0
|
||||
USE_SYSTEM_OPENCL := 0
|
||||
USE_SYSTEM_XXHASH := 0
|
||||
|
||||
# NOTE: USE_SYSTEM_LIBSECP256K1 set to 1 can come with a huge performance hit for Electrum 4-5
|
||||
# this is due to the public API (secp256k1.h) not exposing all the faster ECC operations we need
|
||||
|
||||
##
|
||||
## Detect Operating System
|
||||
##
|
||||
@@ -124,12 +120,6 @@ else
|
||||
DEPS_ZLIB_PATH := $(LIBRARY_DEV_ROOT_FOLDER)/
|
||||
endif
|
||||
|
||||
ifeq ($(USE_SYSTEM_LIBSECP256K1),0)
|
||||
DEPS_LIBSECP256K1_PATH := deps/secp256k1/
|
||||
else
|
||||
DEPS_LIBSECP256K1_PATH := $(LIBRARY_DEV_ROOT_FOLDER)/
|
||||
endif
|
||||
|
||||
ifeq ($(USE_SYSTEM_OPENCL),0)
|
||||
DEPS_OPENCL_PATH := deps/OpenCL-Headers
|
||||
else
|
||||
@@ -195,11 +185,6 @@ CFLAGS_ZLIB += -Wno-unused-parameter
|
||||
CFLAGS_ZLIB += -DIOAPI_NO_64
|
||||
endif
|
||||
|
||||
## because LIBSECP256K1 (Electrum 4/5)
|
||||
CFLAGS_LIBSECP256K1 += -Wno-unused-parameter
|
||||
CFLAGS_LIBSECP256K1 += -Wno-unused-function
|
||||
CFLAGS_LIBSECP256K1 += -Wno-nonnull-compare
|
||||
|
||||
ifeq ($(DEBUG),0)
|
||||
CFLAGS += -O2
|
||||
ifneq ($(UNAME),Darwin)
|
||||
@@ -238,24 +223,6 @@ ifeq ($(USE_SYSTEM_ZLIB),1)
|
||||
LFLAGS += -lz
|
||||
endif
|
||||
|
||||
# LIBSECP256K1
|
||||
|
||||
ifeq ($(USE_SYSTEM_LIBSECP256K1),1)
|
||||
LFLAGS += -lsecp256k1
|
||||
CFLAGS_LIBSECP256K1 += -DWITH_LIBSECP256K1
|
||||
|
||||
# NOT working if used only in CFLAGS_LIBSECP256K1 because we need to include secp256k1.h in the module too
|
||||
CFLAGS += -I$(DEPS_LIBSECP256K1_PATH)
|
||||
else
|
||||
CFLAGS_LIBSECP256K1 += -I$(DEPS_LIBSECP256K1_PATH)/src/
|
||||
|
||||
# files in deps/secp256k1/ include "include/secp256k1.h" so we need the parent folder too
|
||||
CFLAGS_LIBSECP256K1 += -I$(DEPS_LIBSECP256K1_PATH)
|
||||
|
||||
# NOT working if used only in CFLAGS_LIBSECP256K1 because we need to include secp256k1.h in the module too
|
||||
CFLAGS += -I$(DEPS_LIBSECP256K1_PATH)/include/
|
||||
endif
|
||||
|
||||
# OpenCL
|
||||
CFLAGS += -I$(DEPS_OPENCL_PATH)
|
||||
|
||||
@@ -333,10 +300,10 @@ endif # MSYS2
|
||||
EMU_OBJS_ALL := emu_general emu_inc_common emu_inc_platform emu_inc_scalar emu_inc_simd
|
||||
EMU_OBJS_ALL += emu_inc_rp emu_inc_rp_optimized
|
||||
EMU_OBJS_ALL += emu_inc_truecrypt_crc32 emu_inc_truecrypt_keyfile emu_inc_truecrypt_xts emu_inc_veracrypt_xts
|
||||
EMU_OBJS_ALL += emu_inc_hash_md4 emu_inc_hash_md5 emu_inc_hash_ripemd160 emu_inc_hash_sha1 emu_inc_hash_sha256 emu_inc_hash_sha384 emu_inc_hash_sha512 emu_inc_hash_streebog256 emu_inc_hash_streebog512
|
||||
EMU_OBJS_ALL += emu_inc_hash_md4 emu_inc_hash_md5 emu_inc_hash_ripemd160 emu_inc_hash_sha1 emu_inc_hash_sha256 emu_inc_hash_sha384 emu_inc_hash_sha512 emu_inc_hash_streebog256 emu_inc_hash_streebog512 emu_inc_ecc_secp256k1
|
||||
EMU_OBJS_ALL += emu_inc_cipher_aes emu_inc_cipher_camellia emu_inc_cipher_des emu_inc_cipher_kuznyechik emu_inc_cipher_serpent emu_inc_cipher_twofish
|
||||
|
||||
OBJS_ALL := affinity autotune backend benchmark bitmap bitops combinator common convert cpt cpu_crc32 debugfile dictstat dispatch dynloader event ext_ADL ext_cuda ext_nvapi ext_nvml ext_nvrtc ext_OpenCL ext_sysfs ext_lzma ext_secp256k1 filehandling folder hashcat hashes hlfmt hwmon induct interface keyboard_layout locking logfile loopback memory monitor mpsp outfile_check outfile pidfile potfile restore rp rp_cpu selftest slow_candidates shared status stdout straight terminal thread timer tuningdb usage user_options wordlist $(EMU_OBJS_ALL)
|
||||
OBJS_ALL := affinity autotune backend benchmark bitmap bitops combinator common convert cpt cpu_crc32 debugfile dictstat dispatch dynloader event ext_ADL ext_cuda ext_nvapi ext_nvml ext_nvrtc ext_OpenCL ext_sysfs ext_lzma filehandling folder hashcat hashes hlfmt hwmon induct interface keyboard_layout locking logfile loopback memory monitor mpsp outfile_check outfile pidfile potfile restore rp rp_cpu selftest slow_candidates shared status stdout straight terminal thread timer tuningdb usage user_options wordlist $(EMU_OBJS_ALL)
|
||||
|
||||
ifeq ($(ENABLE_BRAIN),1)
|
||||
OBJS_ALL += brain
|
||||
@@ -517,9 +484,6 @@ obj/%.NATIVE.o: $(DEPS_ZLIB_PATH)/%.c
|
||||
$(CC) -c $(CFLAGS_NATIVE) $(CFLAGS_ZLIB) $< -o $@ -fpic
|
||||
endif
|
||||
|
||||
obj/ext_secp256k1.NATIVE.o: src/ext_secp256k1.c
|
||||
$(CC) -c $(CFLAGS_NATIVE) $(CFLAGS_LIBSECP256K1) $< -o $@ -fpic
|
||||
|
||||
ifeq ($(USE_SYSTEM_XXHASH),0)
|
||||
ifeq ($(ENABLE_BRAIN),1)
|
||||
obj/%.NATIVE.o: $(DEPS_XXHASH_PATH)/%.c
|
||||
@@ -682,12 +646,6 @@ obj/%.WIN.o: $(DEPS_XXHASH_PATH)/%.c
|
||||
endif
|
||||
endif
|
||||
|
||||
obj/ext_secp256k1.LINUX.o: src/ext_secp256k1.c
|
||||
$(CC_LINUX) $(CFLAGS_CROSS_LINUX) $(CFLAGS_LIBSECP256K1) -c -o $@ $<
|
||||
|
||||
obj/ext_secp256k1.WIN.o: src/ext_secp256k1.c
|
||||
$(CC_WIN) $(CFLAGS_CROSS_WIN) $(CFLAGS_LIBSECP256K1) -c -o $@ $<
|
||||
|
||||
obj/combined.LINUX.a: $(LINUX_OBJS)
|
||||
$(AR_LINUX) rcs $@ $^
|
||||
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
/**
|
||||
* Author......: See docs/credits.txt
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#include "types.h"
|
||||
#include "common.h"
|
||||
#include "emu_general.h"
|
||||
|
||||
#include "inc_vendor.h"
|
||||
#include "inc_platform.h"
|
||||
#include "inc_ecc_secp256k1.cl"
|
||||
|
||||
@@ -1,151 +0,0 @@
|
||||
/**
|
||||
* Author......: See docs/credits.txt
|
||||
* License.....: MIT
|
||||
*/
|
||||
|
||||
#include "types.h"
|
||||
#include "common.h"
|
||||
|
||||
#include "ext_secp256k1.h"
|
||||
|
||||
|
||||
#if !defined (WITH_LIBSECP256K1)
|
||||
|
||||
// some macros needed for secp256k1 header and source code includes:
|
||||
|
||||
// is this a good 64-bit support check ?
|
||||
#if !defined (__LP64__) && !defined (_WIN64) && !defined (__x86_64__)
|
||||
|
||||
#define USE_SCALAR_8X32
|
||||
#define USE_FIELD_10X26
|
||||
|
||||
#else
|
||||
|
||||
#define HAVE___INT128
|
||||
#define USE_ASM_X86_64
|
||||
// doesn't change speed much: #define USE_ECMULT_STATIC_PRECOMPUTATION
|
||||
|
||||
#define USE_SCALAR_4X64
|
||||
#define USE_FIELD_5X52
|
||||
|
||||
#endif
|
||||
|
||||
#define USE_SCALAR_INV_BUILTIN
|
||||
#define USE_FIELD_INV_BUILTIN
|
||||
|
||||
#define ECMULT_WINDOW_SIZE 15
|
||||
#define ECMULT_GEN_PREC_BITS 4
|
||||
|
||||
#define USE_NUM_NONE
|
||||
|
||||
#include "secp256k1.c"
|
||||
|
||||
#endif
|
||||
|
||||
bool hc_secp256k1_pubkey_parse (secp256k1_pubkey *pubkey, u8 *buf, size_t length)
|
||||
{
|
||||
secp256k1_context *t_ctx = secp256k1_context_create (SECP256K1_CONTEXT_NONE);
|
||||
|
||||
if (secp256k1_ec_pubkey_parse (t_ctx, pubkey, buf, length) == 0)
|
||||
{
|
||||
secp256k1_context_destroy (t_ctx);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
secp256k1_context_destroy (t_ctx);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool hc_secp256k1_pubkey_tweak_mul (secp256k1_pubkey *pubkey, u8 *buf, size_t length)
|
||||
{
|
||||
#if !defined (WITH_LIBSECP256K1)
|
||||
|
||||
secp256k1_context *sctx = secp256k1_context_create (SECP256K1_CONTEXT_NONE);
|
||||
|
||||
secp256k1_gej res;
|
||||
secp256k1_ge pt;
|
||||
|
||||
// load the public key and 32 byte scalar:
|
||||
|
||||
secp256k1_pubkey_load (sctx, &pt, pubkey);
|
||||
|
||||
int overflow = 0;
|
||||
|
||||
secp256k1_scalar s;
|
||||
|
||||
secp256k1_scalar_set_b32 (&s, buf, &overflow);
|
||||
|
||||
if (overflow != 0)
|
||||
{
|
||||
secp256k1_scalar_clear (&s);
|
||||
|
||||
secp256k1_context_destroy (sctx);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
if (secp256k1_scalar_is_zero (&s))
|
||||
{
|
||||
secp256k1_scalar_clear (&s);
|
||||
|
||||
secp256k1_context_destroy (sctx);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// main multiply operation:
|
||||
|
||||
const size_t scalar_size = (length - 1) * 8;
|
||||
|
||||
secp256k1_ecmult_const (&res, &pt, &s, scalar_size);
|
||||
secp256k1_ge_set_gej (&pt, &res);
|
||||
secp256k1_fe_normalize (&pt.x);
|
||||
secp256k1_fe_normalize (&pt.y);
|
||||
|
||||
|
||||
// output:
|
||||
|
||||
buf[0] = 0x02 | secp256k1_fe_is_odd (&pt.y);
|
||||
|
||||
secp256k1_fe_get_b32 (buf + 1, &pt.x);
|
||||
|
||||
|
||||
// cleanup:
|
||||
|
||||
secp256k1_scalar_clear (&s);
|
||||
|
||||
secp256k1_context_destroy (sctx);
|
||||
|
||||
#else
|
||||
|
||||
// ATTENTION: this way to multiply was much slower in our tests
|
||||
|
||||
secp256k1_context *sctx = secp256k1_context_create (SECP256K1_CONTEXT_VERIFY);
|
||||
|
||||
|
||||
// main multiply operation:
|
||||
|
||||
if (secp256k1_ec_pubkey_tweak_mul (sctx, pubkey, buf) == 0)
|
||||
{
|
||||
secp256k1_context_destroy (sctx);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// output:
|
||||
|
||||
secp256k1_ec_pubkey_serialize (sctx, buf, &length, pubkey, SECP256K1_EC_COMPRESSED);
|
||||
|
||||
|
||||
// cleanup:
|
||||
|
||||
secp256k1_context_destroy (sctx);
|
||||
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
+23
-112
@@ -10,7 +10,7 @@
|
||||
#include "convert.h"
|
||||
#include "shared.h"
|
||||
#include "memory.h"
|
||||
#include "ext_secp256k1.h"
|
||||
#include "emu_inc_ecc_secp256k1.h"
|
||||
|
||||
static const u32 ATTACK_EXEC = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||
static const u32 DGST_POS0 = 0;
|
||||
@@ -24,8 +24,7 @@ static const u64 KERN_TYPE = 21700;
|
||||
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
||||
| OPTI_TYPE_USES_BITS_64
|
||||
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE
|
||||
| OPTS_TYPE_HOOK23;
|
||||
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 = "$electrum$4*03eae309d8bda5dcbddaae8145469193152763894b7260a6c4ba181b3ac2ed5653*8c594086a64dc87a9c1f8a69f646e31e8d3182c3c722def4427aa20684776ac26092c6f60bf2762e27adfa93fe1e952dcb8d6362224b9a371953aa3a2edb596ce5eb4c0879c4353f2cc515ec6c9e7a6defa26c5df346d18a62e9d40fcc606bc8c34322bf2212f77770a683788db0baf4cb43595c2a27fe5ff8bdcb1fd915bcd725149d8ee8f14c71635fecb04da5dde97584f4581ceb7d907dceed80ae5daa8352dda20b25fd6001e99a96b7cf839a36cd3f5656304e6998c18e03dd2fb720cb41386c52910c9cb83272c3d50f3a6ff362ab8389b0c21c75133c971df0a75b331796371b060b32fe1673f4a041d7ae08bbdeffb45d706eaf65f99573c07972701c97766b4d7a8a03bba0f885eb3845dfd9152286e1de1f93e25ce04c54712509166dda80a84c2d34652f68e6c01e662f8b1cc7c15103a4502c29332a4fdbdda470c875809e15aab3f2fcb061ee96992ad7e8ab9da88203e35f47d6e88b07a13b0e70ef76de3be20dc06facbddc1e47206b16b44573f57396265116b4d243e77d1c98bc2b28aa3ec0f8d959764a54ecdd03d8360ff2823577fe2183e618aac15b30c1d20986841e3d83c0bfabcedb7c27ddc436eb7113db927e0beae7522b04566631a090b214660152a4f4a90e19356e66ee7309a0671b2e7bfde82667538d193fc7e397442052c6c611b6bf0a04f629a1dc7fa9eb44bfad1bfc6a0bce9f0564c3b483737e447720b7fd038c9a961a25e9594b76bf8c8071c83fcacd689c7469f698ee4aee4d4f626a73e21ce4967e705e4d83e1145b4260330367d8341c84723a1b02567ffbab26aac3afd1079887b4391f05d09780fc65f8b4f68cd51391c06593919d7eafd0775f83045b8f5c2e59cef902ff500654ea29b7623c7594ab2cc0e05ffe3f10abc46c9c5dac824673c307dcbff5bc5f3774141ff99f6a34ec4dd8a58d154a1c72636a2422b8fafdef399dec350d2b91947448582d52291f2261d264d29399ae3c92dc61769a49224af9e7c98d74190f93eb49a44db7587c1a2afb5e1a4bec5cdeb8ad2aac9728d5ae95600c52e9f063c11cdb32b7c1d8435ce76fcf1fa562bd38f14bf6c303c70fb373d951b8a691ab793f12c0f3336d6191378bccaed32923bba81868148f029e3d5712a2fb9f610997549710716db37f7400690c8dfbed12ff0a683d8e4d0079b380e2fd856eeafb8c6eedfac8fb54dacd6bd8a96e9f8d23ea87252c1a7c2b53efc6e6aa1f0cc30fbaaf68ee7d46666afc15856669cd9baebf9397ff9f322cce5285e68a985f3b6aadce5e8f14e9f9dd16764bc4e9f62168aa265d8634ab706ed40b0809023f141c36717bd6ccef9ec6aa6bfd2d00bda9375c2fee9ebba49590a166*1b0997cf64bb2c2ff88cb87bcacd9729d404bd46db18117c20d94e67c946fedc";
|
||||
@@ -47,6 +46,8 @@ const char *module_st_pass (MAYBE_UNUSED const hashconfig_t *hashconfig,
|
||||
|
||||
typedef struct electrum
|
||||
{
|
||||
secp256k1_t coords;
|
||||
|
||||
u32 data_buf[4096];
|
||||
u32 data_len;
|
||||
|
||||
@@ -62,102 +63,8 @@ typedef struct electrum_tmp
|
||||
|
||||
} electrum_tmp_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
u32 ukey[8];
|
||||
|
||||
u32 pubkey[9]; // 32 + 1 bytes (for sign of the curve point)
|
||||
|
||||
u32 hook_success;
|
||||
|
||||
} electrum_hook_t;
|
||||
|
||||
typedef struct electrum_hook_salt
|
||||
{
|
||||
u8 ephemeral_pubkey_raw[33];
|
||||
|
||||
secp256k1_pubkey ephemeral_pubkey_struct;
|
||||
|
||||
} electrum_hook_salt_t;
|
||||
|
||||
static const char *SIGNATURE_ELECTRUM = "$electrum$4*";
|
||||
|
||||
#define M21700_MAX_ACCEL 16
|
||||
#define M21700_MAX_THREADS 64
|
||||
|
||||
u32 module_kernel_accel_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 kernel_accel_max = (user_options->kernel_accel_chgd == true) ? user_options->kernel_accel : M21700_MAX_ACCEL;
|
||||
|
||||
return kernel_accel_max;
|
||||
}
|
||||
|
||||
u32 module_kernel_threads_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 kernel_threads_max = (user_options->kernel_threads_chgd == true) ? user_options->kernel_threads : M21700_MAX_THREADS;
|
||||
|
||||
return kernel_threads_max;
|
||||
}
|
||||
|
||||
void module_hook23 (hc_device_param_t *device_param, const void *hook_salts_buf, const u32 salt_pos, const u64 pw_pos)
|
||||
{
|
||||
electrum_hook_t *hook_items = (electrum_hook_t *) device_param->hooks_buf;
|
||||
|
||||
electrum_hook_salt_t *electrums = (electrum_hook_salt_t *) hook_salts_buf;
|
||||
electrum_hook_salt_t *electrum = &electrums[salt_pos];
|
||||
|
||||
// we need to copy it because the secp256k1_ec_pubkey_tweak_mul () function has side effects
|
||||
|
||||
secp256k1_pubkey ephemeral_pubkey = electrum->ephemeral_pubkey_struct; // shallow copy is safe !
|
||||
|
||||
// this hook data needs to be updated (the "hook_success" variable):
|
||||
|
||||
electrum_hook_t *hook_item = &hook_items[pw_pos];
|
||||
|
||||
hook_item->hook_success = 0;
|
||||
|
||||
u32 *hook_pubkey = hook_item->pubkey;
|
||||
|
||||
hook_pubkey[0] = hook_item->ukey[0];
|
||||
hook_pubkey[1] = hook_item->ukey[1];
|
||||
hook_pubkey[2] = hook_item->ukey[2];
|
||||
hook_pubkey[3] = hook_item->ukey[3];
|
||||
hook_pubkey[4] = hook_item->ukey[4];
|
||||
hook_pubkey[5] = hook_item->ukey[5];
|
||||
hook_pubkey[6] = hook_item->ukey[6];
|
||||
hook_pubkey[7] = hook_item->ukey[7];
|
||||
hook_pubkey[8] = 0;
|
||||
|
||||
/*
|
||||
* Start with Elliptic Curve Cryptography (ECC)
|
||||
*/
|
||||
|
||||
const size_t length = 33; // NOT a bug (32 + 1 for the sign)
|
||||
|
||||
bool multiply_success = hc_secp256k1_pubkey_tweak_mul (&ephemeral_pubkey, (u8 *) hook_pubkey, length);
|
||||
|
||||
if (multiply_success == false) return;
|
||||
|
||||
// in this case hook_success set to 1 doesn't mean that we've cracked it, but just that there were
|
||||
// no problems detected by secp256k1_ec_pubkey_tweak_mul ()
|
||||
|
||||
hook_item->hook_success = 1;
|
||||
}
|
||||
|
||||
u64 module_hook_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 hook_size = (const u64) sizeof (electrum_hook_t);
|
||||
|
||||
return hook_size;
|
||||
}
|
||||
|
||||
u64 module_hook_salt_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 hook_salt_size = (const u64) sizeof (electrum_hook_salt_t);
|
||||
|
||||
return hook_salt_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 (electrum_t);
|
||||
@@ -194,8 +101,6 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
|
||||
electrum_t *esalt = (electrum_t *) esalt_buf;
|
||||
|
||||
electrum_hook_salt_t *hook = (electrum_hook_salt_t *) hook_salt_buf;
|
||||
|
||||
token_t token;
|
||||
|
||||
token.token_cnt = 4;
|
||||
@@ -245,16 +150,20 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
|
||||
// ephemeral pubkey:
|
||||
|
||||
u32 ephemeral_pubkey[9] = { 0 };
|
||||
|
||||
u8 *ephemeral_pubkey_ptr = (u8 *) ephemeral_pubkey;
|
||||
|
||||
for (u32 i = 0, j = 0; j < 66; i += 1, j += 2)
|
||||
{
|
||||
hook->ephemeral_pubkey_raw[i] = hex_to_u8 (ephemeral_pos + j);
|
||||
ephemeral_pubkey_ptr[i] = hex_to_u8 (ephemeral_pos + j);
|
||||
}
|
||||
|
||||
size_t length = 33;
|
||||
secp256k1_t *coords = &esalt->coords;
|
||||
|
||||
bool parse_success = hc_secp256k1_pubkey_parse (&hook->ephemeral_pubkey_struct, hook->ephemeral_pubkey_raw, length);
|
||||
u32 parse_success = parse_public (coords, ephemeral_pubkey);
|
||||
|
||||
if (parse_success == false) return (PARSER_SALT_VALUE);
|
||||
if (parse_success != 0) return (PARSER_SALT_VALUE);
|
||||
|
||||
// data buf:
|
||||
|
||||
@@ -296,17 +205,19 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
|
||||
electrum_t *esalt = (electrum_t *) esalt_buf;
|
||||
|
||||
electrum_hook_salt_t *hook = (electrum_hook_salt_t *) hook_salt_buf;
|
||||
|
||||
// ephemeral pubkey:
|
||||
|
||||
char ephemeral[66 + 1];
|
||||
|
||||
memset (ephemeral, 0, sizeof (ephemeral));
|
||||
|
||||
for (u32 i = 0, j = 0; i < 33; i += 1, j += 2)
|
||||
u8 type = 0x02 | (esalt->coords.xy[8] & 1); // odd or even y coordinate
|
||||
|
||||
snprintf (ephemeral, 66 + 1, "%02x", type);
|
||||
|
||||
for (int i = 31, j = 2; i >= 0; i -= 1, j += 2)
|
||||
{
|
||||
const u8 *ptr = (const u8 *) hook->ephemeral_pubkey_raw;
|
||||
const u8 *ptr = (const u8 *) esalt->coords.xy;
|
||||
|
||||
snprintf (ephemeral + j, 66 + 1 - j, "%02x", ptr[i]);
|
||||
}
|
||||
@@ -383,16 +294,16 @@ void module_init (module_ctx_t *module_ctx)
|
||||
module_ctx->module_hashes_count_max = MODULE_DEFAULT;
|
||||
module_ctx->module_hlfmt_disable = MODULE_DEFAULT;
|
||||
module_ctx->module_hook12 = MODULE_DEFAULT;
|
||||
module_ctx->module_hook23 = module_hook23;
|
||||
module_ctx->module_hook_salt_size = module_hook_salt_size;
|
||||
module_ctx->module_hook_size = module_hook_size;
|
||||
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_kernel_accel_max;
|
||||
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_kernel_threads_max;
|
||||
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;
|
||||
|
||||
+41
-267
@@ -10,11 +10,7 @@
|
||||
#include "convert.h"
|
||||
#include "shared.h"
|
||||
#include "memory.h"
|
||||
#include "emu_inc_hash_sha512.h"
|
||||
#include "emu_inc_hash_sha256.h"
|
||||
#include "emu_inc_cipher_aes.h"
|
||||
#include "ext_secp256k1.h"
|
||||
#include "zlib.h"
|
||||
#include "emu_inc_ecc_secp256k1.h"
|
||||
|
||||
static const u32 ATTACK_EXEC = ATTACK_EXEC_OUTSIDE_KERNEL;
|
||||
static const u32 DGST_POS0 = 0;
|
||||
@@ -28,8 +24,7 @@ static const u64 KERN_TYPE = 21800;
|
||||
static const u32 OPTI_TYPE = OPTI_TYPE_ZERO_BYTE
|
||||
| OPTI_TYPE_USES_BITS_64
|
||||
| OPTI_TYPE_SLOW_HASH_SIMD_LOOP;
|
||||
static const u64 OPTS_TYPE = OPTS_TYPE_PT_GENERATE_LE
|
||||
| OPTS_TYPE_HOOK23;
|
||||
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 = "$electrum$5*02170fee7c35f1ef3b229edc90fbd0793b688a0d6f41137a97aab2343d315cce16*94cf72d8f5d774932b414a3344984859e43721268d2eb35fa531de5a2fc7024b463c730a54f4f46229dd9fede5034b19ac415c2916e9c16b02094f845795df0c397ff76d597886b1f9e014ad1a8f64a3f617d9900aa645b3ba86f16ce542251fc22c41d93fa6bc118be96d9582917e19d2a299743331804cfc7ce2c035367b4cbcfb70adfb1e10a0f2795769f2165d8fd13daa8b45eeac495b5b63e91a87f63b42e483f84a881e49adecacf6519cb564694b42dd9fe80fcbc6cdb63cf5ae33f35255266f5c2524dd93d3cc15eba0f2ccdc3c109cc2d7e8f711b8b440f168caf8b005e8bcdfe694148e94a04d2a738f09349a96600bd8e8edae793b26ebae231022f24e96cb158db141ac40400a9e9ef099e673cfe017281537c57f82fb45c62bdb64462235a6eefb594961d5eb2c46537958e4d04250804c6e9f343ab7a0db07af6b8a9d1a6c5cfcd311b8fb8383ac9ed9d98d427d526c2f517fc97473bd87cb59899bd0e8fb8c57fa0f7e0d53daa57c972cf92764af4b1725a5fb8f504b663ec519731929b3caaa793d8ee74293eee27d0e208a60e26290bc546e6fa9ed865076e13febfea249729218c1b5752e912055fbf993fbac5df2cca2b37c5e0f9c30789858ceeb3c482a8db123966775aeed2eee2fc34efb160d164929f51589bff748ca773f38978bff3508d5a7591fb2d2795df983504a788071f469d78c88fd7899cabbc5804f458653d0206b82771a59522e1fa794d7de1536c51a437f5d6df5efd6654678e5794ca429b5752e1103340ed80786f1e9da7f5b39af628b2212e4d88cd36b8a7136d50a6b6e275ab406ba7c57cc70d77d01c4c16e9363901164fa92dc9e9b99219d5376f24862e775968605001e71b000e2c7123b4b43f3ca40db17efd729388782e46e64d43ccb947db4eb1473ff1a3836b74fe312cd1a33b73b8b8d80c087088932277773c329f2f66a01d6b3fc1e651c56959ebbed7b14a21b977f3acdedf1a0d98d519a74b50c39b3052d840106da4145345d86ec0461cddafacc2a4f0dd646457ad05bf04dcbcc80516a5c5ed14d2d639a70e77b686f19cbfb63f546d81ae19cc8ba35cce3f3b5b9602df25b678e14411fecec87b8347f5047513df415c6b1a3d39871a6bcb0f67d9cf8311596deae45fd1d84a04fd58f1fd55c5156b7309af09094c99a53674809cb87a45f95a2d69f9997a38085519cb4e056f9efd56672a2c1fe927d5ea8eec25b8aff6e56f9a2310f1a481daf407b8adf16201da267c59973920fd21bb087b88123ef98709839d6a3ee34efb8ccd5c15ed0e46cff3172682769531164b66c8689c35a26299dd26d09233d1f64f9667474141cf9c6a6de7f2bc52c3bb44cfe679ff4b912c06df406283836b3581773cb76d375304f46239da5996594a8d03b14c02f1b35a432dc44a96331242ae31174*33a7ee59d6d17ed1ee99dc0a71771227e6f3734b17ba36eb589bdced56244135";
|
||||
@@ -49,6 +44,14 @@ u32 module_salt_type (MAYBE_UNUSED const hashconfig_t *hashconfig,
|
||||
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 electrum
|
||||
{
|
||||
secp256k1_t coords;
|
||||
|
||||
u32 data_buf[256];
|
||||
|
||||
} electrum_t;
|
||||
|
||||
typedef struct electrum_tmp
|
||||
{
|
||||
u64 ipad[8];
|
||||
@@ -59,250 +62,13 @@ typedef struct electrum_tmp
|
||||
|
||||
} electrum_tmp_t;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
u32 ukey[8];
|
||||
|
||||
u32 hook_success;
|
||||
|
||||
} electrum_hook_t;
|
||||
|
||||
typedef struct electrum_hook_salt
|
||||
{
|
||||
u32 data_buf[256];
|
||||
|
||||
u8 ephemeral_pubkey_raw[33];
|
||||
|
||||
secp256k1_pubkey ephemeral_pubkey_struct;
|
||||
|
||||
} electrum_hook_salt_t;
|
||||
|
||||
static const char *SIGNATURE_ELECTRUM = "$electrum$5*";
|
||||
|
||||
#define M21800_MAX_ACCEL 16
|
||||
#define M21800_MAX_THREADS 64
|
||||
|
||||
u32 module_kernel_accel_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)
|
||||
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 u32 kernel_accel_max = (user_options->kernel_accel_chgd == true) ? user_options->kernel_accel : M21800_MAX_ACCEL;
|
||||
const u64 esalt_size = (const u64) sizeof (electrum_t);
|
||||
|
||||
return kernel_accel_max;
|
||||
}
|
||||
|
||||
u32 module_kernel_threads_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 kernel_threads_max = (user_options->kernel_threads_chgd == true) ? user_options->kernel_threads : M21800_MAX_THREADS;
|
||||
|
||||
return kernel_threads_max;
|
||||
}
|
||||
|
||||
void module_hook23 (hc_device_param_t *device_param, const void *hook_salts_buf, const u32 salt_pos, const u64 pw_pos)
|
||||
{
|
||||
electrum_hook_t *hook_items = (electrum_hook_t *) device_param->hooks_buf;
|
||||
|
||||
electrum_hook_salt_t *electrums = (electrum_hook_salt_t *) hook_salts_buf;
|
||||
electrum_hook_salt_t *electrum = &electrums[salt_pos];
|
||||
|
||||
u32 *data_buf = electrum->data_buf;
|
||||
|
||||
// we need to copy it because the secp256k1_ec_pubkey_tweak_mul () function has side effects
|
||||
|
||||
secp256k1_pubkey ephemeral_pubkey = electrum->ephemeral_pubkey_struct; // shallow copy is safe !
|
||||
|
||||
// this hook data needs to be updated (the "hook_success" variable):
|
||||
|
||||
electrum_hook_t *hook_item = &hook_items[pw_pos];
|
||||
|
||||
hook_item->hook_success = 0;
|
||||
|
||||
u32 ukey[9]; // (32 + 1) + 3 = 9 * 4 = 36 bytes (+1 for holding the "sign" of the curve point)
|
||||
|
||||
ukey[0] = hook_item->ukey[0];
|
||||
ukey[1] = hook_item->ukey[1];
|
||||
ukey[2] = hook_item->ukey[2];
|
||||
ukey[3] = hook_item->ukey[3];
|
||||
ukey[4] = hook_item->ukey[4];
|
||||
ukey[5] = hook_item->ukey[5];
|
||||
ukey[6] = hook_item->ukey[6];
|
||||
ukey[7] = hook_item->ukey[7];
|
||||
ukey[8] = 0;
|
||||
|
||||
/*
|
||||
* Start with Elliptic Curve Cryptography (ECC)
|
||||
*/
|
||||
|
||||
u8 *tmp_buf = (u8 *) ukey;
|
||||
|
||||
const size_t length = 33; // NOT a bug (32 + 1 for the sign)
|
||||
|
||||
bool multiply_success = hc_secp256k1_pubkey_tweak_mul (&ephemeral_pubkey, tmp_buf, length);
|
||||
|
||||
if (multiply_success == false) return;
|
||||
|
||||
u32 input[64] = { 0 };
|
||||
|
||||
memcpy (input, tmp_buf, length);
|
||||
|
||||
sha512_ctx_t sha512_ctx;
|
||||
|
||||
sha512_init (&sha512_ctx);
|
||||
sha512_update_swap (&sha512_ctx, input, length);
|
||||
sha512_final (&sha512_ctx);
|
||||
|
||||
// ... now we have the result in sha512_ctx.h[0]...sha512_ctx.h[7]
|
||||
|
||||
u32 iv[4];
|
||||
|
||||
iv[0] = v32b_from_v64 (sha512_ctx.h[0]);
|
||||
iv[1] = v32a_from_v64 (sha512_ctx.h[0]);
|
||||
iv[2] = v32b_from_v64 (sha512_ctx.h[1]);
|
||||
iv[3] = v32a_from_v64 (sha512_ctx.h[1]);
|
||||
|
||||
iv[0] = byte_swap_32 (iv[0]);
|
||||
iv[1] = byte_swap_32 (iv[1]);
|
||||
iv[2] = byte_swap_32 (iv[2]);
|
||||
iv[3] = byte_swap_32 (iv[3]);
|
||||
|
||||
u32 key[4];
|
||||
|
||||
key[0] = v32b_from_v64 (sha512_ctx.h[2]);
|
||||
key[1] = v32a_from_v64 (sha512_ctx.h[2]);
|
||||
key[2] = v32b_from_v64 (sha512_ctx.h[3]);
|
||||
key[3] = v32a_from_v64 (sha512_ctx.h[3]);
|
||||
|
||||
key[0] = byte_swap_32 (key[0]);
|
||||
key[1] = byte_swap_32 (key[1]);
|
||||
key[2] = byte_swap_32 (key[2]);
|
||||
key[3] = byte_swap_32 (key[3]);
|
||||
|
||||
// init AES
|
||||
|
||||
AES_KEY aes_key;
|
||||
|
||||
memset (&aes_key, 0, sizeof (aes_key));
|
||||
|
||||
aes128_set_decrypt_key (aes_key.rdk, key, (u32 *) te0, (u32 *) te1, (u32 *) te2, (u32 *) te3, (u32 *) td0, (u32 *) td1, (u32 *) td2, (u32 *) td3);
|
||||
|
||||
int aes_len = 1024; // in my tests (very few) it also worked with only 128 input bytes !
|
||||
// int aes_len = 128;
|
||||
|
||||
u32 data[4];
|
||||
u32 out[4];
|
||||
|
||||
u32 out_full[256]; // 1024 / 4
|
||||
|
||||
// we need to run it at least once:
|
||||
|
||||
data[0] = data_buf[0];
|
||||
data[1] = data_buf[1];
|
||||
data[2] = data_buf[2];
|
||||
data[3] = data_buf[3];
|
||||
|
||||
aes128_decrypt (aes_key.rdk, data, out, (u32 *) td0, (u32 *) td1, (u32 *) td2, (u32 *) td3, (u32 *) td4);
|
||||
|
||||
out[0] ^= iv[0];
|
||||
|
||||
// early reject
|
||||
|
||||
if ((out[0] & 0x0007ffff) != 0x00059c78) return;
|
||||
|
||||
out[1] ^= iv[1];
|
||||
out[2] ^= iv[2];
|
||||
out[3] ^= iv[3];
|
||||
|
||||
out_full[0] = out[0];
|
||||
out_full[1] = out[1];
|
||||
out_full[2] = out[2];
|
||||
out_full[3] = out[3];
|
||||
|
||||
iv[0] = data[0];
|
||||
iv[1] = data[1];
|
||||
iv[2] = data[2];
|
||||
iv[3] = data[3];
|
||||
|
||||
// for aes_len > 16 we need to loop
|
||||
|
||||
for (int i = 16, j = 4; i < aes_len; i += 16, j += 4)
|
||||
{
|
||||
data[0] = data_buf[j + 0];
|
||||
data[1] = data_buf[j + 1];
|
||||
data[2] = data_buf[j + 2];
|
||||
data[3] = data_buf[j + 3];
|
||||
|
||||
aes128_decrypt (aes_key.rdk, data, out, (u32 *) td0, (u32 *) td1, (u32 *) td2, (u32 *) td3, (u32 *) td4);
|
||||
|
||||
out[0] ^= iv[0];
|
||||
out[1] ^= iv[1];
|
||||
out[2] ^= iv[2];
|
||||
out[3] ^= iv[3];
|
||||
|
||||
iv[0] = data[0];
|
||||
iv[1] = data[1];
|
||||
iv[2] = data[2];
|
||||
iv[3] = data[3];
|
||||
|
||||
out_full[j + 0] = out[0];
|
||||
out_full[j + 1] = out[1];
|
||||
out_full[j + 2] = out[2];
|
||||
out_full[j + 3] = out[3];
|
||||
}
|
||||
|
||||
// decompress with zlib:
|
||||
|
||||
size_t compressed_data_len = aes_len;
|
||||
u8 *compressed_data = (u8 *) out_full;
|
||||
|
||||
size_t decompressed_data_len = 16; // we do NOT need more than the first bytes for validation
|
||||
u8 *decompressed_data = (unsigned char *) hcmalloc (decompressed_data_len);
|
||||
|
||||
z_stream inf;
|
||||
|
||||
inf.zalloc = Z_NULL;
|
||||
inf.zfree = Z_NULL;
|
||||
inf.opaque = Z_NULL;
|
||||
|
||||
inf.next_in = compressed_data;
|
||||
inf.avail_in = compressed_data_len;
|
||||
|
||||
inf.next_out = decompressed_data;
|
||||
inf.avail_out = decompressed_data_len;
|
||||
|
||||
// inflate:
|
||||
|
||||
inflateInit2 (&inf, MAX_WBITS);
|
||||
|
||||
int zlib_ret = inflate (&inf, Z_NO_FLUSH);
|
||||
|
||||
inflateEnd (&inf);
|
||||
|
||||
if ((zlib_ret != Z_OK) && (zlib_ret != Z_STREAM_END))
|
||||
{
|
||||
hcfree (decompressed_data);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if ((memcmp (decompressed_data, "{\n \"", 7) == 0) ||
|
||||
(memcmp (decompressed_data, "{\r\n \"", 8) == 0))
|
||||
{
|
||||
hook_item->hook_success = 1;
|
||||
}
|
||||
|
||||
hcfree (decompressed_data);
|
||||
}
|
||||
|
||||
u64 module_hook_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 hook_size = (const u64) sizeof (electrum_hook_t);
|
||||
|
||||
return hook_size;
|
||||
}
|
||||
|
||||
u64 module_hook_salt_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 hook_salt_size = (const u64) sizeof (electrum_hook_salt_t);
|
||||
|
||||
return hook_salt_size;
|
||||
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)
|
||||
@@ -332,7 +98,7 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
{
|
||||
u32 *digest = (u32 *) digest_buf;
|
||||
|
||||
electrum_hook_salt_t *electrum = (electrum_hook_salt_t *) hook_salt_buf;
|
||||
electrum_t *esalt = (electrum_t *) esalt_buf;
|
||||
|
||||
token_t token;
|
||||
|
||||
@@ -377,20 +143,24 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
|
||||
// ephemeral pubkey:
|
||||
|
||||
u32 ephemeral_pubkey[9] = { 0 };
|
||||
|
||||
u8 *ephemeral_pubkey_ptr = (u8 *) ephemeral_pubkey;
|
||||
|
||||
for (u32 i = 0, j = 0; j < 66; i += 1, j += 2)
|
||||
{
|
||||
electrum->ephemeral_pubkey_raw[i] = hex_to_u8 (ephemeral_pos + j);
|
||||
ephemeral_pubkey_ptr[i] = hex_to_u8 (ephemeral_pos + j);
|
||||
}
|
||||
|
||||
size_t length = 33;
|
||||
secp256k1_t *coords = &esalt->coords;
|
||||
|
||||
bool parse_success = hc_secp256k1_pubkey_parse (&electrum->ephemeral_pubkey_struct, electrum->ephemeral_pubkey_raw, length);
|
||||
u32 parse_success = parse_public (coords, ephemeral_pubkey);
|
||||
|
||||
if (parse_success == false) return (PARSER_SALT_VALUE);
|
||||
if (parse_success != 0) return (PARSER_SALT_VALUE);
|
||||
|
||||
// data buf:
|
||||
|
||||
u8* data_buf_ptr = (u8 *) electrum->data_buf;
|
||||
u8* data_buf_ptr = (u8 *) esalt->data_buf;
|
||||
|
||||
for (u32 i = 0, j = 0; j < 2048; i += 1, j += 2)
|
||||
{
|
||||
@@ -408,10 +178,10 @@ int module_hash_decode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
|
||||
// fake salt
|
||||
|
||||
salt->salt_buf[0] = electrum->data_buf[0];
|
||||
salt->salt_buf[1] = electrum->data_buf[1];
|
||||
salt->salt_buf[2] = electrum->data_buf[2];
|
||||
salt->salt_buf[3] = electrum->data_buf[3];
|
||||
salt->salt_buf[0] = esalt->data_buf[0];
|
||||
salt->salt_buf[1] = esalt->data_buf[1];
|
||||
salt->salt_buf[2] = esalt->data_buf[2];
|
||||
salt->salt_buf[3] = esalt->data_buf[3];
|
||||
|
||||
salt->salt_len = 16;
|
||||
|
||||
@@ -424,7 +194,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
{
|
||||
u32 *digest = (u32 *) digest_buf;
|
||||
|
||||
electrum_hook_salt_t *electrum = (electrum_hook_salt_t *) hook_salt_buf;
|
||||
electrum_t *esalt = (electrum_t *) esalt_buf;
|
||||
|
||||
// ephemeral pubkey:
|
||||
|
||||
@@ -432,9 +202,13 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
|
||||
memset (ephemeral, 0, sizeof (ephemeral));
|
||||
|
||||
for (u32 i = 0, j = 0; i < 33; i += 1, j += 2)
|
||||
u8 type = 0x02 | (esalt->coords.xy[8] & 1); // odd or even y coordinate
|
||||
|
||||
snprintf (ephemeral, 66 + 1, "%02x", type);
|
||||
|
||||
for (int i = 31, j = 2; i >= 0; i -= 1, j += 2)
|
||||
{
|
||||
const u8 *ptr = (const u8 *) electrum->ephemeral_pubkey_raw;
|
||||
const u8 *ptr = (const u8 *) esalt->coords.xy;
|
||||
|
||||
snprintf (ephemeral + j, 66 + 1 - j, "%02x", ptr[i]);
|
||||
}
|
||||
@@ -447,7 +221,7 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
|
||||
|
||||
for (u32 i = 0, j = 0; i < 1024; i += 1, j += 2)
|
||||
{
|
||||
const u8 *ptr = (const u8 *) electrum->data_buf;
|
||||
const u8 *ptr = (const u8 *) esalt->data_buf;
|
||||
|
||||
snprintf (data_buf + j, 2048 + 1 - j, "%02x", ptr[i]);
|
||||
}
|
||||
@@ -490,7 +264,7 @@ void module_init (module_ctx_t *module_ctx)
|
||||
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_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;
|
||||
@@ -511,16 +285,16 @@ void module_init (module_ctx_t *module_ctx)
|
||||
module_ctx->module_hashes_count_max = MODULE_DEFAULT;
|
||||
module_ctx->module_hlfmt_disable = MODULE_DEFAULT;
|
||||
module_ctx->module_hook12 = MODULE_DEFAULT;
|
||||
module_ctx->module_hook23 = module_hook23;
|
||||
module_ctx->module_hook_salt_size = module_hook_salt_size;
|
||||
module_ctx->module_hook_size = module_hook_size;
|
||||
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_kernel_accel_max;
|
||||
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_kernel_threads_max;
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user