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.
72 lines
2.8 KiB
C
72 lines
2.8 KiB
C
/* Based on the public domain implementation in
|
|
* crypto_hash/sha512/ref/ from http://bench.cr.yp.to/supercop.html
|
|
* by D. J. Bernstein */
|
|
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
#include <string.h>
|
|
|
|
#include "sha2.h"
|
|
#include "sha256.h"
|
|
#include "utils.h"
|
|
|
|
/*
|
|
* Compresses an address to a 22-byte sequence.
|
|
* This reduces the number of required SHA256 compression calls, as the last
|
|
* block of input is padded with at least 65 bits.
|
|
*/
|
|
void PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_compress_address(unsigned char *out, const uint32_t addr[8]) {
|
|
PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_ull_to_bytes(out, 1, addr[0]); /* drop 3 bytes of the layer field */
|
|
PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_ull_to_bytes(out + 1, 4, addr[2]); /* drop the highest tree address word */
|
|
PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_ull_to_bytes(out + 5, 4, addr[3]);
|
|
PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_ull_to_bytes(out + 9, 1, addr[4]); /* drop 3 bytes of the type field */
|
|
PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_ull_to_bytes(out + 10, 4, addr[5]);
|
|
PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_ull_to_bytes(out + 14, 4, addr[6]);
|
|
PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_ull_to_bytes(out + 18, 4, addr[7]);
|
|
}
|
|
|
|
/**
|
|
* Requires 'input_plus_four_bytes' to have 'inlen' + 4 bytes, so that the last
|
|
* four bytes can be used for the counter. Typically 'input' is merely a seed.
|
|
* Outputs outlen number of bytes
|
|
*/
|
|
void PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_mgf1(
|
|
unsigned char *out, unsigned long outlen,
|
|
unsigned char *input_plus_four_bytes, unsigned long inlen) {
|
|
unsigned char outbuf[SPX_SHA256_OUTPUT_BYTES];
|
|
unsigned long i;
|
|
|
|
/* While we can fit in at least another full block of SHA256 output.. */
|
|
for (i = 0; (i + 1)*SPX_SHA256_OUTPUT_BYTES <= outlen; i++) {
|
|
PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_ull_to_bytes(input_plus_four_bytes + inlen, 4, i);
|
|
sha256(out, input_plus_four_bytes, inlen + 4);
|
|
out += SPX_SHA256_OUTPUT_BYTES;
|
|
}
|
|
/* Until we cannot anymore, and we fill the remainder. */
|
|
if (outlen > i * SPX_SHA256_OUTPUT_BYTES) {
|
|
PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_ull_to_bytes(input_plus_four_bytes + inlen, 4, i);
|
|
sha256(outbuf, input_plus_four_bytes, inlen + 4);
|
|
memcpy(out, outbuf, outlen - i * SPX_SHA256_OUTPUT_BYTES);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
* Absorb the constant pub_seed using one round of the compression function
|
|
* This initializes state_seeded, which can then be reused in thash
|
|
**/
|
|
void PQCLEAN_SPHINCSSHA256256SSIMPLE_CLEAN_seed_state(sha256ctx *state_seeded, const unsigned char *pub_seed) {
|
|
uint8_t block[SPX_SHA256_BLOCK_BYTES];
|
|
size_t i;
|
|
|
|
for (i = 0; i < SPX_N; ++i) {
|
|
block[i] = pub_seed[i];
|
|
}
|
|
for (i = SPX_N; i < SPX_SHA256_BLOCK_BYTES; ++i) {
|
|
block[i] = 0;
|
|
}
|
|
|
|
sha256_inc_init(state_seeded);
|
|
sha256_inc_blocks(state_seeded, block, 1);
|
|
}
|