aa4611a4d1
This PR sacrifices passing some extra arguments to get rid of the global state. * Haraka needs state in all hash calls, this results in changes to the hash functions specified in `hash.h`. The extra pointers passed would not be necessary for SHA256 or SHAKE256. * SHAKE256 did not have global state, but uniformity in the implementations requires us to pass around the new state context anyway. Otherwise, @joostrijneveld's SPHINCS+ generator doesn't really work anymore). We introduce a new header file called `primitive.h` which defines the required state type for the generic functions. I did not go into replacing _all_ occurrences of state variables by the new `hash_state` macro.
96 lines
3.3 KiB
C
96 lines
3.3 KiB
C
#include <stdint.h>
|
|
#include <string.h>
|
|
|
|
#include "address.h"
|
|
#include "params.h"
|
|
#include "primitive.h"
|
|
#include "thash.h"
|
|
|
|
#include "haraka.h"
|
|
|
|
/**
|
|
* Takes an array of inblocks concatenated arrays of SPX_N bytes.
|
|
*/
|
|
static void PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_thash(
|
|
unsigned char *out, unsigned char *buf,
|
|
const unsigned char *in, unsigned int inblocks,
|
|
const unsigned char *pub_seed, uint32_t addr[8],
|
|
hash_state *state_seeded) {
|
|
|
|
unsigned char *bitmask = buf + SPX_ADDR_BYTES;
|
|
unsigned char outbuf[32];
|
|
unsigned char buf_tmp[64];
|
|
unsigned int i;
|
|
|
|
(void)pub_seed; /* Suppress an 'unused parameter' warning. */
|
|
(void)state_seeded; /* TODO this should be fed into haraka */
|
|
|
|
if (inblocks == 1) {
|
|
/* F function */
|
|
/* Since SPX_N may be smaller than 32, we need a temporary buffer. */
|
|
memset(buf_tmp, 0, 64);
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_addr_to_bytes(buf_tmp, addr);
|
|
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_haraka256(outbuf, buf_tmp, state_seeded);
|
|
for (i = 0; i < inblocks * SPX_N; i++) {
|
|
buf_tmp[SPX_ADDR_BYTES + i] = in[i] ^ outbuf[i];
|
|
}
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_haraka512(outbuf, buf_tmp, state_seeded);
|
|
memcpy(out, outbuf, SPX_N);
|
|
} else {
|
|
/* All other tweakable hashes*/
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_addr_to_bytes(buf, addr);
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_haraka_S(
|
|
bitmask, inblocks * SPX_N, buf, SPX_ADDR_BYTES, state_seeded);
|
|
|
|
for (i = 0; i < inblocks * SPX_N; i++) {
|
|
buf[SPX_ADDR_BYTES + i] = in[i] ^ bitmask[i];
|
|
}
|
|
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_haraka_S(
|
|
out, SPX_N, buf, SPX_ADDR_BYTES + inblocks * SPX_N, state_seeded);
|
|
}
|
|
}
|
|
|
|
/* The wrappers below ensure that we use fixed-size buffers on the stack */
|
|
|
|
void PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_thash_1(
|
|
unsigned char *out, const unsigned char *in,
|
|
const unsigned char *pub_seed, uint32_t addr[8],
|
|
hash_state *state_seeded) {
|
|
|
|
unsigned char buf[SPX_ADDR_BYTES + 1 * SPX_N];
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_thash(
|
|
out, buf, in, 1, pub_seed, addr, state_seeded);
|
|
}
|
|
|
|
void PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_thash_2(
|
|
unsigned char *out, const unsigned char *in,
|
|
const unsigned char *pub_seed, uint32_t addr[8],
|
|
hash_state *state_seeded) {
|
|
|
|
unsigned char buf[SPX_ADDR_BYTES + 2 * SPX_N];
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_thash(
|
|
out, buf, in, 2, pub_seed, addr, state_seeded);
|
|
}
|
|
|
|
void PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_thash_WOTS_LEN(
|
|
unsigned char *out, const unsigned char *in,
|
|
const unsigned char *pub_seed, uint32_t addr[8],
|
|
hash_state *state_seeded) {
|
|
|
|
unsigned char buf[SPX_ADDR_BYTES + SPX_WOTS_LEN * SPX_N];
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_thash(
|
|
out, buf, in, SPX_WOTS_LEN, pub_seed, addr, state_seeded);
|
|
}
|
|
|
|
void PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_thash_FORS_TREES(
|
|
unsigned char *out, const unsigned char *in,
|
|
const unsigned char *pub_seed, uint32_t addr[8],
|
|
hash_state *state_seeded) {
|
|
|
|
unsigned char buf[SPX_ADDR_BYTES + SPX_FORS_TREES * SPX_N];
|
|
PQCLEAN_SPHINCSHARAKA256FROBUST_CLEAN_thash(
|
|
out, buf, in, SPX_FORS_TREES, pub_seed, addr, state_seeded);
|
|
}
|