kris/xmss-KAT-generator
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unify keypair and seed_keypair

Browse Source
This commit is contained in:
Joost Rijneveld 2020-05-25 13:04:02 +02:00
parent 27f2f6eb45
commit feed976315
No known key found for this signature in database
GPG Key ID: A4FE39CF49CBC553
3 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/vectors.c
View File

@ -45,7 +45,7 @@ int vectors_xmss(uint32_t oid, int mt) {
seed[i] = i; seed[i] = i;
} }
xmssmt_core_keypair2(&params, pk, sk, seed); xmssmt_core_seed_keypair(&params, pk, sk, seed);
ull_to_bytes(sk, params.index_bytes, 1 << (params.full_height - 1)); ull_to_bytes(sk, params.index_bytes, 1 << (params.full_height - 1));

29
xmss_core.c
View File

@ -131,9 +131,9 @@ int xmss_core_sign(const xmss_params *params,
* Format sk: [(ceil(h/8) bit) index || SK_SEED || SK_PRF || root || PUB_SEED] * Format sk: [(ceil(h/8) bit) index || SK_SEED || SK_PRF || root || PUB_SEED]
* Format pk: [root || PUB_SEED] omitting algorithm OID. * Format pk: [root || PUB_SEED] omitting algorithm OID.
*/ */
int xmssmt_core_keypair2(const xmss_params *params, int xmssmt_core_seed_keypair(const xmss_params *params,
unsigned char *pk, unsigned char *sk, unsigned char *pk, unsigned char *sk,
unsigned char *seed) unsigned char *seed)
{ {
/* We do not need the auth path in key generation, but it simplifies the /* We do not need the auth path in key generation, but it simplifies the
code to have just one treehash routine that computes both root and path code to have just one treehash routine that computes both root and path
@ -168,27 +168,10 @@ int xmssmt_core_keypair2(const xmss_params *params,
int xmssmt_core_keypair(const xmss_params *params, int xmssmt_core_keypair(const xmss_params *params,
unsigned char *pk, unsigned char *sk) unsigned char *pk, unsigned char *sk)
{ {
/* We do not need the auth path in key generation, but it simplifies the unsigned char seed[3 * params->n];
code to have just one treehash routine that computes both root and path
in one function. */
unsigned char auth_path[params->tree_height * params->n];
uint32_t top_tree_addr[8] = {0};
set_layer_addr(top_tree_addr, params->d - 1);
/* Initialize index to 0. */ randombytes(seed, 3 * params->n);
memset(sk, 0, params->index_bytes); xmssmt_core_seed_keypair(params, pk, sk, seed);
sk += params->index_bytes;
/* Initialize SK_SEED and SK_PRF. */
randombytes(sk, 2 * params->n);
/* Initialize PUB_SEED. */
randombytes(sk + 3 * params->n, params->n);
memcpy(pk + params->n, sk + 3*params->n, params->n);
/* Compute root node of the top-most subtree. */
treehash(params, pk, auth_path, sk, pk + params->n, 0, top_tree_addr);
memcpy(sk + 2*params->n, pk, params->n);
return 0; return 0;
} }

6
xmss_core.h
View File

@ -52,9 +52,9 @@ int xmssmt_core_keypair(const xmss_params *params,
* Format sk: [(ceil(h/8) bit) index || SK_SEED || SK_PRF || root || PUB_SEED] * Format sk: [(ceil(h/8) bit) index || SK_SEED || SK_PRF || root || PUB_SEED]
* Format pk: [root || PUB_SEED] omitting algorithm OID. * Format pk: [root || PUB_SEED] omitting algorithm OID.
*/ */
int xmssmt_core_keypair2(const xmss_params *params, int xmssmt_core_seed_keypair(const xmss_params *params,
unsigned char *pk, unsigned char *sk, unsigned char *pk, unsigned char *sk,
unsigned char *seed); unsigned char *seed);
/** /**
* Signs a message. Returns an array containing the signature followed by the * Signs a message. Returns an array containing the signature followed by the