Skip to content

Commit

Permalink
add keccakx interface
Browse files Browse the repository at this point in the history 
Signed-off-by: Duc Tri Nguyen <[email protected]>

rename to x4

add shake256x4 interface

add shake256x4

add batch getnoise sampling

Signed-off-by: Duc Tri Nguyen <[email protected]>

unroll prf to shake256x4

Signed-off-by: Duc Tri Nguyen <[email protected]>
Signed-off-by: Duc Tri Nguyen <[email protected]>

fix space

Signed-off-by: Duc Tri Nguyen <[email protected]>

assume input pointers are valid, thus, remove conditions.

move memcpy outside of the loop
  • Loading branch information
@cothan
cothan committed Jul 17, 2024
1 parent dde6611 commit 30054f1
Show file tree
Hide file tree
Showing 7 changed files with 523 additions and 41 deletions.
6 changes: 3 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ NISTFLAGS += -Wno-unused-result -O3 -fomit-frame-pointer
RM = /bin/rm

SOURCES = mlkem/kem.c mlkem/indcpa.c mlkem/polyvec.c mlkem/poly.c mlkem/ntt.c mlkem/cbd.c mlkem/reduce.c mlkem/verify.c
SOURCESKECCAK = $(SOURCES) fips202/keccakf1600.c fips202/fips202.c mlkem/symmetric-shake.c
SOURCESKECCAK = $(SOURCES) fips202/keccakf1600.c fips202/fips202.c fips202/fips202x4.c mlkem/symmetric-shake.c
SOURCESKECCAKRANDOM = $(SOURCESKECCAK) randombytes/randombytes.c
SOURCESNISTKATS = $(SOURCESKECCAK) test/nistrng/aes.c test/nistrng/rng.c
SOURCESBENCH = $(SOURCESKECCAKRANDOM) test/hal.c

HEADERS = mlkem/params.h mlkem/kem.h mlkem/indcpa.h mlkem/polyvec.h mlkem/poly.h mlkem/ntt.h mlkem/cbd.h mlkem/reduce.h mlkem/verify.h mlkem/symmetric.h
HEADERSKECCAK = $(HEADERS) fips202/keccakf1600.h fips202/fips202.h
HEADERS = mlkem/params.h mlkem/kem.h mlkem/indcpa.h mlkem/polyvec.h mlkem/poly.h mlkem/ntt.h mlkem/cbd.h mlkem/reduce.c mlkem/verify.h mlkem/symmetric.h
HEADERSKECCAK = $(HEADERS) fips202/keccakf1600.h fips202/fips202.h fips202/fips202x4.h
HEADERSKECCAKRANDOM = $(HEADERSKECCAK) randombytes/randombytes.h
HEADERNISTKATS = $(HEADERSKECCAK) test/nistrng/aes.h test/nistrng/randombytes.h
HEADERSBENCH = $(HEADERSKECCAKRANDOM) test/hal.h
Expand Down
201 changes: 201 additions & 0 deletions fips202/fips202x4.c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
// SPDX-License-Identifier: Apache-2.0
#include <string.h>
#include "fips202x4.h"
#include "fips202.h"
#include "keccakf1600.h"

#define KECCAK_CTX 25

static void keccak_absorb_x4(uint64_t *s, uint32_t r,
const uint8_t *in0,
const uint8_t *in1,
const uint8_t *in2,
const uint8_t *in3,
size_t inlen,
uint8_t p)
{

while (inlen >= r)
{

KeccakF1600_StateXORBytes(s + KECCAK_CTX * 0, in0, 0, r);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 1, in1, 0, r);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 2, in2, 0, r);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 3, in3, 0, r);

KeccakF1600_StatePermute(s + KECCAK_CTX * 0);
KeccakF1600_StatePermute(s + KECCAK_CTX * 1);
KeccakF1600_StatePermute(s + KECCAK_CTX * 2);
KeccakF1600_StatePermute(s + KECCAK_CTX * 3);

in0 += r;
in1 += r;
in2 += r;
in3 += r;
inlen -= r;
}

if (inlen > 0)
{
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 0, in0, 0, inlen);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 1, in1, 0, inlen);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 2, in2, 0, inlen);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 3, in3, 0, inlen);
}

if (inlen == r - 1)
{
p |= 128;
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 0, &p, inlen, 1);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 1, &p, inlen, 1);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 2, &p, inlen, 1);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 3, &p, inlen, 1);
}
else
{
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 0, &p, inlen, 1);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 1, &p, inlen, 1);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 2, &p, inlen, 1);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 3, &p, inlen, 1);
p = 128;
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 0, &p, r - 1, 1);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 1, &p, r - 1, 1);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 2, &p, r - 1, 1);
KeccakF1600_StateXORBytes(s + KECCAK_CTX * 3, &p, r - 1, 1);
}
}

static void keccak_squeezeblocks_x4(uint8_t *out0,
uint8_t *out1,
uint8_t *out2,
uint8_t *out3,
size_t nblocks,
uint64_t *s,
uint32_t r)
{

while (nblocks > 0)
{
KeccakF1600_StatePermute(s + KECCAK_CTX * 0);
KeccakF1600_StatePermute(s + KECCAK_CTX * 1);
KeccakF1600_StatePermute(s + KECCAK_CTX * 2);
KeccakF1600_StatePermute(s + KECCAK_CTX * 3);

KeccakF1600_StateExtractBytes(s + KECCAK_CTX * 0, out0, 0, r);
KeccakF1600_StateExtractBytes(s + KECCAK_CTX * 1, out1, 0, r);
KeccakF1600_StateExtractBytes(s + KECCAK_CTX * 2, out2, 0, r);
KeccakF1600_StateExtractBytes(s + KECCAK_CTX * 3, out3, 0, r);

out0 += r;
out1 += r;
out2 += r;
out3 += r;
nblocks--;
}
}

uint64_t *keccakx_get_lane_state(keccakx4_state *state, size_t index)
{
if (index >= KECCAK_WAY)
{
return NULL;
}

return state->ctx + index * KECCAK_CTX;
}

void shake128x4_absorb(keccakx4_state *state,
const uint8_t *in0,
const uint8_t *in1,
const uint8_t *in2,
const uint8_t *in3,
size_t inlen)
{
memset(state->ctx, 0, sizeof(state->ctx));

keccak_absorb_x4(state->ctx, SHAKE128_RATE, in0, in1, in2, in3, inlen, 0x1F);
}

void shake256x4_absorb(keccakx4_state *state,
const uint8_t *in0,
const uint8_t *in1,
const uint8_t *in2,
const uint8_t *in3,
size_t inlen)
{
memset(state->ctx, 0, sizeof(state->ctx));

keccak_absorb_x4(state->ctx, SHAKE256_RATE, in0, in1, in2, in3, inlen, 0x1F);
}


void shake128x4_squeezeblocks(uint8_t *out0,
uint8_t *out1,
uint8_t *out2,
uint8_t *out3,
size_t nblocks,
keccakx4_state *state)
{
keccak_squeezeblocks_x4(out0, out1, out2, out3, nblocks, state->ctx, SHAKE128_RATE);
}

void shake256x4_squeezeblocks(uint8_t *out0,
uint8_t *out1,
uint8_t *out2,
uint8_t *out3,
size_t nblocks,
keccakx4_state *state)
{
keccak_squeezeblocks_x4(out0, out1, out2, out3, nblocks, state->ctx, SHAKE256_RATE);
}

void shake256x4_squeezeblocks_single(uint8_t *out,
size_t nblocks,
size_t index,
keccakx4_state *state)
{
uint64_t *ctx = keccakx_get_lane_state(state, index);
while (nblocks > 0)
{
KeccakF1600_StatePermute(ctx);
KeccakF1600_StateExtractBytes(ctx, out, 0, SHAKE128_RATE);
out += SHAKE128_RATE;
nblocks--;
}
}

void shake256x4(uint8_t *out0,
uint8_t *out1,
uint8_t *out2,
uint8_t *out3,
size_t outlen,
uint8_t *in0,
uint8_t *in1,
uint8_t *in2,
uint8_t *in3,
size_t inlen)
{
keccakx4_state statex;
size_t nblocks = outlen/SHAKE256_RATE;
uint8_t tmp[KECCAK_WAY][SHAKE256_RATE];

shake256x4_absorb(&statex, in0, in1, in2, in3, inlen);

shake256x4_squeezeblocks(out0, out1, out2, out3, nblocks, &statex);

out0 += nblocks * SHAKE256_RATE;
out1 += nblocks * SHAKE256_RATE;
out2 += nblocks * SHAKE256_RATE;
out3 += nblocks * SHAKE256_RATE;

outlen -= nblocks * SHAKE256_RATE;

if (outlen)
{
shake256x4_squeezeblocks(tmp[0], tmp[1], tmp[2], tmp[3], 1, &statex);
memcpy(out0, tmp[0], outlen);
memcpy(out1, tmp[1], outlen);
memcpy(out2, tmp[2], outlen);
memcpy(out3, tmp[3], outlen);
}
}
66 changes: 66 additions & 0 deletions fips202/fips202x4.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
// SPDX-License-Identifier: Apache-2.0
#ifndef FIPS_202X4_H
#define FIPS_202X4_H

#ifndef KECCAK_WAY
#define KECCAK_WAY 4
#endif

#include <stdint.h>

typedef struct
{
uint64_t ctx[25 * KECCAK_WAY];
} keccakx4_state;

uint64_t *keccakx_get_lane_state(keccakx4_state *state, size_t index);

void shake128x4_absorb(keccakx4_state *state,
const uint8_t *in0,
const uint8_t *in1,
const uint8_t *in2,
const uint8_t *in3,
size_t inlen);

void shake256x4_absorb(keccakx4_state *state,
const uint8_t *in0,
const uint8_t *in1,
const uint8_t *in2,
const uint8_t *in3,
size_t inlen);


void shake128x4_squeezeblocks(uint8_t *out0,
uint8_t *out1,
uint8_t *out2,
uint8_t *out3,
size_t nblocks,
keccakx4_state *state);

void shake256x4_squeezeblocks(uint8_t *out0,
uint8_t *out1,
uint8_t *out2,
uint8_t *out3,
size_t nblocks,
keccakx4_state *state);

/*
* Squeezes a single lane in Keccak 4-way
*/
void shake256x4_squeezeblocks_single(uint8_t *out,
size_t nblocks,
size_t index,
keccakx4_state *state);

void shake256x4(uint8_t *out0,
uint8_t *out1,
uint8_t *out2,
uint8_t *out3,
size_t outlen,
uint8_t *in0,
uint8_t *in1,
uint8_t *in2,
uint8_t *in3,
size_t inlen);

#endif
Loading

0 comments on commit 30054f1

Please sign in to comment.