Skip to content

Commit aa57a15

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

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
@@ -208,9 +208,9 @@ int crypto_sign_keypair(uint8_t *pk, uint8_t *sk)
208208
return result;
209209
}
210210

211-
static void shake256_absorb_with_residual(
212-
keccak_state *state, const uint8_t *in, size_t inlen,
213-
uint8_t *residual, size_t *pos)
211+
static void shake256_absorb_with_residual(keccak_state *state,
212+
const uint8_t *in, size_t inlen,
213+
uint8_t *residual, size_t *pos)
214214
__contract__(
215215
requires(0 <= *pos && pos <= 8)
216216
requires(memory_no_alias(state, sizeof(uint64_t) * MLD_KECCAK_LANES))
@@ -222,24 +222,30 @@ __contract__(
222222
)
223223
{
224224
size_t nb;
225-
if(in){
226-
if (*pos) {
225+
if (in)
226+
{
227+
if (*pos)
228+
{
227229
nb = inlen < 8 - *pos ? inlen : 8 - *pos;
228230
memcpy(residual + *pos, in, nb);
229231
inlen -= nb;
230232
in += nb;
231233
*pos += nb;
232-
if (*pos == 8) {
234+
if (*pos == 8)
235+
{
233236
shake256_absorb(state, residual, 8U);
237+
*pos = 0;
234238
}
235239
}
236240
nb = inlen & ~7UL;
237-
if (nb) {
241+
if (nb)
242+
{
238243
shake256_absorb(state, in, nb);
239244
in += nb;
240245
inlen -= nb;
241246
}
242-
if (inlen) {
247+
if (inlen)
248+
{
243249
memcpy(residual, in, inlen);
244250
*pos = inlen;
245251
}
@@ -282,12 +288,13 @@ __contract__(
282288
{
283289
keccak_state state;
284290
uint8_t buf[8];
285-
size_t pos=0;
291+
size_t pos = 0;
286292
shake256_init(&state);
287293
shake256_absorb_with_residual(&state, in1, in1len, buf, &pos);
288294
shake256_absorb_with_residual(&state, in2, in2len, buf, &pos);
289295
shake256_absorb_with_residual(&state, in3, in3len, buf, &pos);
290-
if(pos) {
296+
if (pos)
297+
{
291298
shake256_absorb(&state, buf, pos);
292299
}
293300
shake256_finalize(&state);

0 commit comments

Comments
 (0)