arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-22 16:18:09 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3331 from philsmd/p2pkh_use_b58check_enc

Browse Source 
refactoring/simplification: use b58check_enc () when possible
This commit is contained in:
Jens Steube 2022-06-21 16:23:04 +02:00 committed by GitHub
commit b803319c80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/modules/module_28501.c
View File

@ -11,7 +11,6 @@
#include "shared.h" #include "shared.h"
#include "memory.h" #include "memory.h"
#include "emu_inc_hash_sha256.h"
#include "emu_inc_hash_base58.h" #include "emu_inc_hash_base58.h"
static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL; static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL;
@ -122,54 +121,11 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
{ {
u8 *digest = (u8 *) digest_buf; u8 *digest = (u8 *) digest_buf;
u8 bin[64] = { 0 };
// add 00 byte at front indicating BTC PubKey Hash160
for (u32 i = 0; i < 20; i++)
{
bin[i + 1] = digest[i]; // + 1 because we have \x00 at the start
}
// calculate sha256 twice
u32 *bin32 = (u32 *) bin;
sha256_ctx_t ctx;
sha256_init (&ctx);
sha256_update_swap (&ctx, bin32, 21);
sha256_final (&ctx);
u32 data[16] = { 0 };
for (u32 i = 0; i < 8; i++) // 8 * 4 = 32 bytes
{
data[i] = ctx.h[i];
}
sha256_init (&ctx);
sha256_update (&ctx, data, 32);
sha256_final (&ctx);
ctx.h[0] = byte_swap_32 (ctx.h[0]);
// put sha256 after pub key hash160
u8 *hash = &bin[21];
for (u32 i = 0; i < 4; i++)
{
((u8*) hash)[i] = ((u8*) ctx.h)[i];
}
// base58 encode
u32 bufsz = 41;
u8 buf[64] = { 0 }; u8 buf[64] = { 0 };
b58enc (buf, &bufsz, bin, 25); u32 len = 64;
b58check_enc (buf, &len, 0, digest, 20);
return snprintf (line_buf, line_size, "%s", buf); return snprintf (line_buf, line_size, "%s", buf);
} }

50
src/modules/module_28502.c
View File

@ -11,7 +11,6 @@
#include "shared.h" #include "shared.h"
#include "memory.h" #include "memory.h"
#include "emu_inc_hash_sha256.h"
#include "emu_inc_hash_base58.h" #include "emu_inc_hash_base58.h"
static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL; static const u32 ATTACK_EXEC = ATTACK_EXEC_INSIDE_KERNEL;
@ -122,54 +121,11 @@ int module_hash_encode (MAYBE_UNUSED const hashconfig_t *hashconfig, MAYBE_UNUSE
{ {
u8 *digest = (u8 *) digest_buf; u8 *digest = (u8 *) digest_buf;
u8 bin[64] = { 0 };
// add 00 byte at front indicating BTC PubKey Hash160
for (u32 i = 0; i < 20; i++)
{
bin[i + 1] = digest[i]; // + 1 because we have \x00 at the start
}
// calculate sha256 twice
u32 *bin32 = (u32 *) bin;
sha256_ctx_t ctx;
sha256_init (&ctx);
sha256_update_swap (&ctx, bin32, 21);
sha256_final (&ctx);
u32 data[16] = { 0 };
for (u32 i = 0; i < 8; i++) // 8 * 4 = 32 bytes
{
data[i] = ctx.h[i];
}
sha256_init (&ctx);
sha256_update (&ctx, data, 32);
sha256_final (&ctx);
ctx.h[0] = byte_swap_32 (ctx.h[0]);
// put sha256 after pub key hash160
u8 *hash = &bin[21];
for (u32 i = 0; i < 4; i++)
{
((u8*) hash)[i] = ((u8*) ctx.h)[i];
}
// base58 encode
u32 bufsz = 41;
u8 buf[64] = { 0 }; u8 buf[64] = { 0 };
b58enc (buf, &bufsz, bin, 25); u32 len = 64;
b58check_enc (buf, &len, 0, digest, 20);
return snprintf (line_buf, line_size, "%s", buf); return snprintf (line_buf, line_size, "%s", buf);
} }