Skip to content

Commit 2cd2d61

Browse files
committed
Fix pos reset, fix linting errors
Signed-off-by: Brendan Moran <[email protected]>
1 parent 786152e commit 2cd2d61

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

mldsa/sign.c

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ int crypto_sign_keypair(uint8_t *pk, uint8_t *sk)
231231
return result;
232232
}
233233

234-
static void shake256_absorb_with_residual(
235-
keccak_state *state, const uint8_t *in, size_t inlen,
236-
uint8_t *residual, size_t *pos)
234+
static void shake256_absorb_with_residual(keccak_state *state,
235+
const uint8_t *in, size_t inlen,
236+
uint8_t *residual, size_t *pos)
237237
__contract__(
238238
requires(0 <= *pos && pos <= 8)
239239
requires(memory_no_alias(state, sizeof(uint64_t) * MLD_KECCAK_LANES))
@@ -245,24 +245,30 @@ __contract__(
245245
)
246246
{
247247
size_t nb;
248-
if(in){
249-
if (*pos) {
248+
if (in)
249+
{
250+
if (*pos)
251+
{
250252
nb = inlen < 8 - *pos ? inlen : 8 - *pos;
251253
memcpy(residual + *pos, in, nb);
252254
inlen -= nb;
253255
in += nb;
254256
*pos += nb;
255-
if (*pos == 8) {
257+
if (*pos == 8)
258+
{
256259
shake256_absorb(state, residual, 8U);
260+
*pos = 0;
257261
}
258262
}
259263
nb = inlen & ~7UL;
260-
if (nb) {
264+
if (nb)
265+
{
261266
shake256_absorb(state, in, nb);
262267
in += nb;
263268
inlen -= nb;
264269
}
265-
if (inlen) {
270+
if (inlen)
271+
{
266272
memcpy(residual, in, inlen);
267273
*pos = inlen;
268274
}
@@ -308,12 +314,13 @@ __contract__(
308314
{
309315
keccak_state state;
310316
uint8_t buf[8];
311-
size_t pos=0;
317+
size_t pos = 0;
312318
shake256_init(&state);
313319
shake256_absorb_with_residual(&state, in1, in1len, buf, &pos);
314320
shake256_absorb_with_residual(&state, in2, in2len, buf, &pos);
315321
shake256_absorb_with_residual(&state, in3, in3len, buf, &pos);
316-
if(pos) {
322+
if (pos)
323+
{
317324
shake256_absorb(&state, buf, pos);
318325
}
319326
mld_shake256_finalize(&state);

0 commit comments

Comments
 (0)