QPQ-AG/libsodium
12
0
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2026-08-25 08:37:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

XOF: don't absorb/squeeze bytes one by one

Browse Source
This commit is contained in:
Frank Denis
2025-11-18 11:46:34 +01:00
parent 9f94ff30f9
commit ca3acebf8f
4 changed files with 84 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsodium/crypto_xof/shake128/ref/shake128_ref.c
+21 -8
View File
@@ -27,20 +27,26 @@ shake128_ref_init(shake128_state_internal *state)
int
shake128_ref_update(shake128_state_internal *state, const unsigned char *in, size_t inlen)
{
size_t i;
size_t consumed = 0;
size_t chunk_size;
if (state->phase != SHAKE128_PHASE_ABSORBING) {
state->phase = SHAKE128_PHASE_ABSORBING;
state->offset = 0;
}
for (i = 0; i < inlen; i++) {
while (consumed < inlen) {
if (state->offset == SHAKE128_RATE) {
crypto_core_keccak1600_permute_24(state->state);
state->offset = 0;
}
crypto_core_keccak1600_xor_bytes(state->state, &in[i], state->offset, 1);
state->offset++;
chunk_size = SHAKE128_RATE - state->offset;
if (chunk_size > inlen - consumed) {
chunk_size = inlen - consumed;
}
crypto_core_keccak1600_xor_bytes(state->state, &in[consumed], state->offset, chunk_size);
state->offset += chunk_size;
consumed += chunk_size;
}
return 0;
@@ -73,19 +79,26 @@ shake128_finalize(shake128_state_internal *state)
int
shake128_ref_squeeze(shake128_state_internal *state, unsigned char *out, size_t outlen)
{
size_t i;
size_t extracted = 0;
size_t chunk_size;
if (state->phase == SHAKE128_PHASE_ABSORBING) {
shake128_finalize(state);
}
for (i = 0; i < outlen; i++) {
while (extracted < outlen) {
if (state->offset == SHAKE128_RATE) {
crypto_core_keccak1600_permute_24(state->state);
state->offset = 0;
}
crypto_core_keccak1600_extract_bytes(state->state, &out[i], state->offset, 1);
state->offset++;
chunk_size = SHAKE128_RATE - state->offset;
if (chunk_size > outlen - extracted) {
chunk_size = outlen - extracted;
}
crypto_core_keccak1600_extract_bytes(state->state, &out[extracted], state->offset,
chunk_size);
state->offset += chunk_size;
extracted += chunk_size;
}
return 0;
src/libsodium/crypto_xof/shake256/ref/shake256_ref.c
+21 -8
View File
@@ -27,20 +27,26 @@ shake256_ref_init(shake256_state_internal *state)
int
shake256_ref_update(shake256_state_internal *state, const unsigned char *in, size_t inlen)
{
size_t i;
size_t consumed = 0;
size_t chunk_size;
if (state->phase != SHAKE256_PHASE_ABSORBING) {
state->phase = SHAKE256_PHASE_ABSORBING;
state->offset = 0;
}
for (i = 0; i < inlen; i++) {
while (consumed < inlen) {
if (state->offset == SHAKE256_RATE) {
crypto_core_keccak1600_permute_24(state->state);
state->offset = 0;
}
crypto_core_keccak1600_xor_bytes(state->state, &in[i], state->offset, 1);
state->offset++;
chunk_size = SHAKE256_RATE - state->offset;
if (chunk_size > inlen - consumed) {
chunk_size = inlen - consumed;
}
crypto_core_keccak1600_xor_bytes(state->state, &in[consumed], state->offset, chunk_size);
state->offset += chunk_size;
consumed += chunk_size;
}
return 0;
@@ -73,19 +79,26 @@ shake256_finalize(shake256_state_internal *state)
int
shake256_ref_squeeze(shake256_state_internal *state, unsigned char *out, size_t outlen)
{
size_t i;
size_t extracted = 0;
size_t chunk_size;
if (state->phase == SHAKE256_PHASE_ABSORBING) {
shake256_finalize(state);
}
for (i = 0; i < outlen; i++) {
while (extracted < outlen) {
if (state->offset == SHAKE256_RATE) {
crypto_core_keccak1600_permute_24(state->state);
state->offset = 0;
}
crypto_core_keccak1600_extract_bytes(state->state, &out[i], state->offset, 1);
state->offset++;
chunk_size = SHAKE256_RATE - state->offset;
if (chunk_size > outlen - extracted) {
chunk_size = outlen - extracted;
}
crypto_core_keccak1600_extract_bytes(state->state, &out[extracted], state->offset,
chunk_size);
state->offset += chunk_size;
extracted += chunk_size;
}
return 0;
src/libsodium/crypto_xof/turboshake128/ref/turboshake128_ref.c
+21 -8
View File
@@ -27,20 +27,26 @@ turboshake128_ref_init(turboshake128_state_internal *state)
int
turboshake128_ref_update(turboshake128_state_internal *state, const unsigned char *in, size_t inlen)
{
size_t i;
size_t consumed = 0;
size_t chunk_size;
if (state->phase != TURBOSHAKE128_PHASE_ABSORBING) {
state->phase = TURBOSHAKE128_PHASE_ABSORBING;
state->offset = 0;
}
for (i = 0; i < inlen; i++) {
while (consumed < inlen) {
if (state->offset == TURBOSHAKE128_RATE) {
crypto_core_keccak1600_permute_12(state->state);
state->offset = 0;
}
crypto_core_keccak1600_xor_bytes(state->state, &in[i], state->offset, 1);
state->offset++;
chunk_size = TURBOSHAKE128_RATE - state->offset;
if (chunk_size > inlen - consumed) {
chunk_size = inlen - consumed;
}
crypto_core_keccak1600_xor_bytes(state->state, &in[consumed], state->offset, chunk_size);
state->offset += chunk_size;
consumed += chunk_size;
}
return 0;
@@ -73,19 +79,26 @@ turboshake128_finalize(turboshake128_state_internal *state)
int
turboshake128_ref_squeeze(turboshake128_state_internal *state, unsigned char *out, size_t outlen)
{
size_t i;
size_t extracted = 0;
size_t chunk_size;
if (state->phase == TURBOSHAKE128_PHASE_ABSORBING) {
turboshake128_finalize(state);
}
for (i = 0; i < outlen; i++) {
while (extracted < outlen) {
if (state->offset == TURBOSHAKE128_RATE) {
crypto_core_keccak1600_permute_12(state->state);
state->offset = 0;
}
crypto_core_keccak1600_extract_bytes(state->state, &out[i], state->offset, 1);
state->offset++;
chunk_size = TURBOSHAKE128_RATE - state->offset;
if (chunk_size > outlen - extracted) {
chunk_size = outlen - extracted;
}
crypto_core_keccak1600_extract_bytes(state->state, &out[extracted], state->offset,
chunk_size);
state->offset += chunk_size;
extracted += chunk_size;
}
return 0;
src/libsodium/crypto_xof/turboshake256/ref/turboshake256_ref.c
+21 -8
View File
@@ -27,20 +27,26 @@ turboshake256_ref_init(turboshake256_state_internal *state)
int
turboshake256_ref_update(turboshake256_state_internal *state, const unsigned char *in, size_t inlen)
{
size_t i;
size_t consumed = 0;
size_t chunk_size;
if (state->phase != TURBOSHAKE256_PHASE_ABSORBING) {
state->phase = TURBOSHAKE256_PHASE_ABSORBING;
state->offset = 0;
}
for (i = 0; i < inlen; i++) {
while (consumed < inlen) {
if (state->offset == TURBOSHAKE256_RATE) {
crypto_core_keccak1600_permute_12(state->state);
state->offset = 0;
}
crypto_core_keccak1600_xor_bytes(state->state, &in[i], state->offset, 1);
state->offset++;
chunk_size = TURBOSHAKE256_RATE - state->offset;
if (chunk_size > inlen - consumed) {
chunk_size = inlen - consumed;
}
crypto_core_keccak1600_xor_bytes(state->state, &in[consumed], state->offset, chunk_size);
state->offset += chunk_size;
consumed += chunk_size;
}
return 0;
@@ -73,19 +79,26 @@ turboshake256_finalize(turboshake256_state_internal *state)
int
turboshake256_ref_squeeze(turboshake256_state_internal *state, unsigned char *out, size_t outlen)
{
size_t i;
size_t extracted = 0;
size_t chunk_size;
if (state->phase == TURBOSHAKE256_PHASE_ABSORBING) {
turboshake256_finalize(state);
}
for (i = 0; i < outlen; i++) {
while (extracted < outlen) {
if (state->offset == TURBOSHAKE256_RATE) {
crypto_core_keccak1600_permute_12(state->state);
state->offset = 0;
}
crypto_core_keccak1600_extract_bytes(state->state, &out[i], state->offset, 1);
state->offset++;
chunk_size = TURBOSHAKE256_RATE - state->offset;
if (chunk_size > outlen - extracted) {
chunk_size = outlen - extracted;
}
crypto_core_keccak1600_extract_bytes(state->state, &out[extracted], state->offset,
chunk_size);
state->offset += chunk_size;
extracted += chunk_size;
}
return 0;