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

Prevent allocating for a 'next' tree on top layer

Browse Source
This commit is contained in:
Joost Rijneveld 2016-02-01 17:21:09 +01:00
parent 8cbbfe0f05
commit 719cb467df
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/test_xmssmt_fast.c
View File

@ -31,17 +31,18 @@ int main()
unsigned int tree_h = h / d; unsigned int tree_h = h / d;
// stack needs to be larger than regular (H-K-1), since we re-use for 'next' // stack needs to be larger than regular (H-K-1), since we re-use for 'next'
unsigned char stack[2*d * (tree_h + 1)*n]; unsigned char stack[(2*d-1) * (tree_h + 1)*n];
unsigned char stacklevels[2*d * (tree_h + 1)*n]; unsigned char stacklevels[(2*d-1) * (tree_h + 1)*n];
unsigned char auth[2*d * tree_h*n]; unsigned char auth[(2*d-1) * tree_h*n];
unsigned char keep[2*d * (tree_h >> 1)*n]; unsigned char keep[(2*d-1) * (tree_h >> 1)*n];
treehash_inst treehash[2*d * (tree_h-k)]; treehash_inst treehash[(2*d-1) * (tree_h-k)];
unsigned char th_nodes[2*d * (tree_h-k)*n]; unsigned char th_nodes[(2*d-1) * (tree_h-k)*n];
unsigned char retain[2*d * ((1 << k) - k - 1)*n]; unsigned char retain[(2*d-1) * ((1 << k) - k - 1)*n];
unsigned char wots_sigs[d * params->xmss_par.wots_par.keysize]; unsigned char wots_sigs[d * params->xmss_par.wots_par.keysize];
bds_state states[2*d]; // first d are 'regular' states, second d are 'next' // first d are 'regular' states, second d are 'next'; top tree has no 'next'
bds_state states[2*d-1];
for (i = 0; i < 2*d; i++) { for (i = 0; i < 2*d-1; i++) {
for(j=0;j<tree_h-k;j++) for(j=0;j<tree_h-k;j++)
treehash[i*(tree_h-k) + j].node = th_nodes + (i*(tree_h-k) + j) * n; treehash[i*(tree_h-k) + j].node = th_nodes + (i*(tree_h-k) + j) * n;
xmss_set_bds_state(states + i, xmss_set_bds_state(states + i,

2
xmss_fast.c
View File

@ -983,7 +983,7 @@ int xmssmt_sign(unsigned char *sk, bds_state *states, unsigned char *wots_sigs,
} }
} }
} }
else { else if (idx < (1UL << h) - 1) {
memcpy(&tmp, states+params->d + i, sizeof(bds_state)); memcpy(&tmp, states+params->d + i, sizeof(bds_state));
memcpy(states+params->d + i, states + i, sizeof(bds_state)); memcpy(states+params->d + i, states + i, sizeof(bds_state));
memcpy(states + i, &tmp, sizeof(bds_state)); memcpy(states + i, &tmp, sizeof(bds_state));