Skip to content

Commit d45104c

Browse files
bremoranbremoran
committed
Fix C90 compliance
Signed-off-by: Brendan Moran <[email protected]>
1 parent 942c132 commit d45104c

File tree

7 files changed

+279
-135
lines changed

7 files changed

+279
-135
lines changed

‎mldsa/fips202/keccakf1600.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
void mld_keccakf1600_extract_bytes(uint64_t *state, unsigned char *data,
4040
unsigned offset, unsigned length)
4141
{
42-
#if defined(MLD_USE_FIPS202_X1_NATIVE)
42+
#if defined(MLD_USE_FIPS202_X1_XOR_NATIVE)
4343
mld_keccakf1600_extract_bytes_native(state, data, offset, length);
4444
#elif defined(MLD_SYS_LITTLE_ENDIAN)
4545
unsigned i;
@@ -49,21 +49,21 @@ void mld_keccakf1600_extract_bytes(uint64_t *state, unsigned char *data,
4949
{
5050
data[i] = state_ptr[i];
5151
}
52-
#else /* !MLD_USE_FIPS202_X1_NATIVE && MLD_SYS_LITTLE_ENDIAN */
52+
#else /* !MLD_USE_FIPS202_X1_XOR_NATIVE && MLD_SYS_LITTLE_ENDIAN */
5353
unsigned i;
5454
/* Portable version */
5555
for (i = 0; i < length; i++)
5656
__loop__(invariant(i <= length))
5757
{
5858
data[i] = (state[(offset + i) >> 3] >> (8 * ((offset + i) & 0x07))) & 0xFF;
5959
}
60-
#endif /* !MLD_USE_FIPS202_X1_NATIVE && !MLD_SYS_LITTLE_ENDIAN */
60+
#endif /* !MLD_USE_FIPS202_X1_XOR_NATIVE && !MLD_SYS_LITTLE_ENDIAN */
6161
}
6262

6363
void mld_keccakf1600_xor_bytes(uint64_t *state, const unsigned char *data,
6464
unsigned offset, unsigned length)
6565
{
66-
#if defined(MLD_USE_FIPS202_X1_NATIVE)
66+
#if defined(MLD_USE_FIPS202_X1_XOR_NATIVE)
6767
mld_keccakf1600_xor_bytes_native(state, data, offset, length);
6868
#elif defined(MLD_SYS_LITTLE_ENDIAN)
6969
unsigned i;
@@ -73,7 +73,7 @@ void mld_keccakf1600_xor_bytes(uint64_t *state, const unsigned char *data,
7373
{
7474
state_ptr[i] ^= data[i];
7575
}
76-
#else /* !MLD_USE_FIPS202_X1_NATIVE && MLD_SYS_LITTLE_ENDIAN */
76+
#else /* !MLD_USE_FIPS202_X1_XOR_NATIVE && MLD_SYS_LITTLE_ENDIAN */
7777
unsigned i;
7878
/* Portable version */
7979
for (i = 0; i < length; i++)
@@ -82,7 +82,7 @@ void mld_keccakf1600_xor_bytes(uint64_t *state, const unsigned char *data,
8282
state[(offset + i) >> 3] ^= (uint64_t)data[i]
8383
<< (8 * ((offset + i) & 0x07));
8484
}
85-
#endif /* !MLD_USE_FIPS202_X1_NATIVE && !MLD_SYS_LITTLE_ENDIAN */
85+
#endif /* !MLD_USE_FIPS202_X1_XOR_NATIVE && !MLD_SYS_LITTLE_ENDIAN */
8686
}
8787

8888
void mld_keccakf1600x4_extract_bytes(uint64_t *state, unsigned char *data0,

‎mldsa/fips202/native/armv8.1_m/src/bit_interleave_4x_opt.S‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
///
2-
/// Copyright (c) 2025 Arm Limited
3-
/// SPDX-License-Identifier: Apache-2.0 OR MIT OR ISC
4-
///
1+
/*
2+
* Copyright (c) 2025 Arm Limited
3+
* SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
4+
*/
5+
6+
#include "../../../../common.h"
7+
#if defined(MLD_FIPS202_ARMV81M_NEED_X4) && \
8+
!defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
59

610
.thumb
711
.syntax unified
@@ -382,6 +386,8 @@ KeccakF1600x4_LoadBytesInLane:
382386
vpop {d8 - d11}
383387
pop {r4-r11, pc}
384388

389+
#endif /* MLD_FIPS202_ARMV81M_NEED_X4 && \
390+
MLD_CONFIG_MULTILEVEL_NO_SHARED */
385391

386392

387393

‎mldsa/fips202/native/armv8.1_m/src/keccakf1600_adomnicai_m4_opt_m7.S‎

Lines changed: 25 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
@
2-
@ Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni,
3-
@ Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby
4-
@ denoted as "the implementer".
5-
@ Additional optimizations by Alexandre Adomnicai.
6-
@
7-
@ For more information, feedback or questions, please refer to our websites:
8-
@ http:// keccak.noekeon.org/
9-
@ http:// keyak.noekeon.org/
10-
@ http:// ketje.noekeon.org/
11-
@
12-
@ To the extent possible under law, the implementer has waived all copyright
13-
@ and related or neighboring rights to the source code in this file.
14-
@ http:// creativecommons.org/publicdomain/zero/1.0/
15-
@
16-
17-
@ WARNING: These functions work only on little endian CPU with@ ARMv7m architecture (ARM Cortex-M3, ...).
18-
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0 OR MIT OR ISC OR CC0
3+
* Implementation by the Keccak, Keyak and Ketje Teams, namely, Guido Bertoni,
4+
* Joan Daemen, Michaël Peeters, Gilles Van Assche and Ronny Van Keer, hereby
5+
* denoted as "the implementer".
6+
* Additional optimizations by Alexandre Adomnicai.
7+
*
8+
* For more information, feedback or questions, please refer to our websites:
9+
* http:// keccak.noekeon.org/
10+
* http:// keyak.noekeon.org/
11+
* http:// ketje.noekeon.org/
12+
*
13+
* To the extent possible under law, the implementer has waived all copyright
14+
* and related or neighboring rights to the source code in this file.
15+
* http:// creativecommons.org/publicdomain/zero/1.0/
16+
*
17+
* WARNING: These functions work only on little endian CPU with@ ARMv7m architecture (ARM Cortex-M3, ...).
18+
*/
19+
20+
#include "../../../../common.h"
21+
#if defined(MLD_FIPS202_ARMV81M_NEED_X1) && \
22+
!defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
1923

2024
.thumb
2125
.syntax unified
@@ -3999,3 +4003,6 @@ KeccakF1600_StatePermute_RoundLoop:
39994003
pop { r4 - r12, pc }
40004004

40014005
.size KeccakF1600_StatePermute_adomnicai_m4_opt_m7, .-KeccakF1600_StatePermute_adomnicai_m4_opt_m7
4006+
4007+
#endif /* MLD_FIPS202_ARMV81M_NEED_X1 && \
4008+
MLD_CONFIG_MULTILEVEL_NO_SHARED */

‎mldsa/fips202/native/armv8.1_m/src/mve-keccak-4x.c‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
* check-magic: on
55
*/
66

7+
#include "../../../../common.h"
8+
#if defined(MLD_FIPS202_ARMV81M_NEED_X4) && \
9+
!defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
10+
711
#include <arm_mve.h>
812
#include <stddef.h>
913
#include <stdio.h>
@@ -174,3 +178,9 @@ void KeccakF1600x4_StateExtract_bytes(void *state, unsigned char *data0,
174178
extract_bytes_in_lane(state, data0, data1, data2, data3, offset, length);
175179
}
176180
}
181+
#else /* MLD_FIPS202_ARMV81M_NEED_X4 && \
182+
MLD_CONFIG_MULTILEVEL_NO_SHARED */
183+
MLD_EMPTY_CU(fips202_armv8_1_m_mve_keccak_4x)
184+
185+
#endif /* !(MLD_FIPS202_ARMV81M_NEED_X4 && \
186+
MLD_CONFIG_MULTILEVEL_NO_SHARED) */

‎mldsa/fips202/native/armv8.1_m/src/mve-keccak-4x_opt_m55.S‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1+
/*
2+
* Copyright (c) The mldsa-native project authors
3+
* Copyright (c) 2025 Arm Limited
4+
* SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
5+
*/
16

2-
///
3-
/// Copyright (c) 2025 Arm Limited
4-
/// SPDX-License-Identifier: Apache-2.0 OR MIT OR ISC
5-
///
7+
// Author: Brendan Moran <[email protected]>
8+
// Author: Matthias Kannwischer <[email protected]>
9+
10+
#include "../../../../common.h"
11+
#if defined(MLD_FIPS202_ARMV81M_NEED_X4) && \
12+
!defined(MLD_CONFIG_MULTILEVEL_NO_SHARED)
613

714
.thumb
815
.syntax unified
@@ -1638,3 +1645,6 @@ roundend:
16381645

16391646
vpop {d8-d15}
16401647
ldmia.w sp!, {r3,r4,r5,r6,r7,r8,r9,r10,r11,r12, pc}
1648+
1649+
#endif /* MLD_FIPS202_ARMV81M_NEED_X4 && \
1650+
MLD_CONFIG_MULTILEVEL_NO_SHARED */

‎mldsa/fips202/native/armv8.1_m/x4_v8m_mve.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
#define MLD_USE_FIPS202_X1_XOR_NATIVE
1313
#define MLD_USE_FIPS202_X4_NATIVE
1414
#define MLD_USE_FIPS202_X4_XOR_NATIVE
15+
/* Guard for assembly file */
16+
#define MLD_FIPS202_ARMV81M_NEED_X1
17+
#define MLD_FIPS202_ARMV81M_NEED_X4
1518

1619

1720
#if !defined(__ASSEMBLER__)

0 commit comments

Comments
 (0)