mirror/mkp224o
1
0
Fork 0
mirror of https://github.com/cathugger/mkp224o.git synced 2025-12-05 21:27:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

use union to ensure better alignment

Browse Source
This commit is contained in:
cathugger
2017-09-27 22:04:41 +03:00
parent 9e9468b453
commit 5a310272f7
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
main.c
View File

@@ -287,8 +287,15 @@ static void addseed(u8 *seed)
static void *dowork(void *task) static void *dowork(void *task)
{ {
u8 pubonion[pkprefixlen + PUBLIC_LEN + 32]; union pubonionunion {
u8 * const pk = &pubonion[pkprefixlen]; u8 raw[pkprefixlen + PUBLIC_LEN + 32];
struct {
u64 prefix[4];
u64 key[4];
u64 hash[4];
} ;
} pubonion;
u8 * const pk = &pubonion.raw[pkprefixlen];
u8 secret[skprefixlen + SECRET_LEN]; u8 secret[skprefixlen + SECRET_LEN];
u8 * const sk = &secret[skprefixlen]; u8 * const sk = &secret[skprefixlen];
u8 seed[SEED_LEN]; u8 seed[SEED_LEN];
@@ -297,8 +304,8 @@ static void *dowork(void *task)
char *sname; char *sname;
memcpy(secret,skprefix,skprefixlen); memcpy(secret,skprefix,skprefixlen);
memcpy(pubonion,pkprefix,pkprefixlen); memcpy(pubonion.raw,pkprefix,pkprefixlen);
pubonion[pkprefixlen + PUBLIC_LEN + 2] = 0x03; // version pubonion.raw[pkprefixlen + PUBLIC_LEN + 2] = 0x03; // version
memcpy(hashsrc,checksumstr,checksumstrlen); memcpy(hashsrc,checksumstr,checksumstrlen);
hashsrc[checksumstrlen + PUBLIC_LEN] = 0x03; // version hashsrc[checksumstrlen + PUBLIC_LEN] = 0x03; // version
@@ -317,11 +324,11 @@ again:
ed25519_pubkey(pk,sk); ed25519_pubkey(pk,sk);
FILTERFOR(i) { FILTERFOR(i) {
if (unlikely(MATCHFILTER(i,pk))) { if (unlikely(MATCHFILTER(i,pk))) {
memcpy(&hashsrc[checksumstrlen], &pubonion[pkprefixlen], PUBLIC_LEN); memcpy(&hashsrc[checksumstrlen],pk,PUBLIC_LEN);
FIPS202_SHA3_256(hashsrc, sizeof(hashsrc), &pubonion[pkprefixlen + PUBLIC_LEN]); FIPS202_SHA3_256(hashsrc,sizeof(hashsrc),&pk[PUBLIC_LEN]);
pubonion[pkprefixlen + PUBLIC_LEN + 2] = 0x03; // version pk[PUBLIC_LEN + 2] = 0x03; // version
strcpy(base32_to(&sname[direndpos], pk, PUBONION_LEN), ".onion"); strcpy(base32_to(&sname[direndpos],pk,PUBONION_LEN), ".onion");
onionready(sname, secret, pubonion); onionready(sname, secret, pubonion.raw);
goto initseed; goto initseed;
} }
} }
@@ -348,8 +355,15 @@ static void addu64toscalar32(u8 *dst, u64 v)
static void *dofastwork(void *task) static void *dofastwork(void *task)
{ {
u8 pubonion[pkprefixlen + PUBLIC_LEN + 32]; union pubonionunion {
u8 * const pk = &pubonion[pkprefixlen]; u8 raw[pkprefixlen + PUBLIC_LEN + 32];
struct {
u64 prefix[4];
u64 key[4];
u64 hash[4];
} ;
} pubonion;
u8 * const pk = &pubonion.raw[pkprefixlen];
u8 secret[skprefixlen + SECRET_LEN]; u8 secret[skprefixlen + SECRET_LEN];
u8 * const sk = &secret[skprefixlen]; u8 * const sk = &secret[skprefixlen];
u8 seed[SEED_LEN]; u8 seed[SEED_LEN];
@@ -360,8 +374,8 @@ static void *dofastwork(void *task)
char *sname; char *sname;
memcpy(secret, skprefix, skprefixlen); memcpy(secret, skprefix, skprefixlen);
memcpy(pubonion, pkprefix, pkprefixlen); memcpy(pubonion.raw, pkprefix, pkprefixlen);
pubonion[pkprefixlen + PUBLIC_LEN + 2] = 0x03; // version pubonion.raw[pkprefixlen + PUBLIC_LEN + 2] = 0x03; // version
memcpy(hashsrc, checksumstr, checksumstrlen); memcpy(hashsrc, checksumstr, checksumstrlen);
hashsrc[checksumstrlen + PUBLIC_LEN] = 0x03; // version hashsrc[checksumstrlen + PUBLIC_LEN] = 0x03; // version
@@ -401,7 +415,7 @@ initseed:
FIPS202_SHA3_256(hashsrc,sizeof(hashsrc),&pk[PUBLIC_LEN]); FIPS202_SHA3_256(hashsrc,sizeof(hashsrc),&pk[PUBLIC_LEN]);
// full name // full name
strcpy(base32_to(&sname[direndpos],pk,PUBONION_LEN),".onion"); strcpy(base32_to(&sname[direndpos],pk,PUBONION_LEN),".onion");
onionready(sname,secret,pubonion); onionready(sname,secret,pubonion.raw);
// don't reuse same seed // don't reuse same seed
goto initseed; goto initseed;
} }