Remove redundant address changes

This commit is contained in:
Joost Rijneveld 2016-02-05 15:30:00 +01:00
parent e2f1cee548
commit 951848fe89

View File

@ -812,9 +812,6 @@ int xmssmt_keypair(unsigned char *pk, unsigned char *sk, bds_state *states, unsi
SET_LAYER_ADDRESS(addr, 0); SET_LAYER_ADDRESS(addr, 0);
// Set up state and compute wots signatures for all but topmost tree root // Set up state and compute wots signatures for all but topmost tree root
for (i = 0; i < params->d - 1; i++) { for (i = 0; i < params->d - 1; i++) {
SET_LAYER_ADDRESS(addr, i);
SET_TREE_ADDRESS(addr, 0);
SET_OTS_ADDRESS(addr, 0);
// Compute seed for OTS key pair // Compute seed for OTS key pair
treehash_setup(pk, params->xmss_par.h, 0, states + i, sk+params->index_len, &(params->xmss_par), pk+n, addr); treehash_setup(pk, params->xmss_par.h, 0, states + i, sk+params->index_len, &(params->xmss_par), pk+n, addr);
SET_LAYER_ADDRESS(addr, (i+1)); SET_LAYER_ADDRESS(addr, (i+1));
@ -946,7 +943,6 @@ int xmssmt_sign(unsigned char *sk, bds_state *states, unsigned char *wots_sigs,
updates = (tree_h - k) >> 1; updates = (tree_h - k) >> 1;
SET_LAYER_ADDRESS(addr, 0);
SET_TREE_ADDRESS(addr, (idx_tree + 1)); SET_TREE_ADDRESS(addr, (idx_tree + 1));
// mandatory update for NEXT_0 (does not count towards h-k/2) if NEXT_0 exists // mandatory update for NEXT_0 (does not count towards h-k/2) if NEXT_0 exists
if ((1 + idx_tree) * (1 << tree_h) + idx_leaf < (1UL << h)) { if ((1 + idx_tree) * (1 << tree_h) + idx_leaf < (1UL << h)) {