Fix directory naming

Author: bremoran

mldsa/fips202/keccakf1600.c

@@ -49,15 +49,15 @@ void mld_keccakf1600_extract_bytes(uint64_t *state, unsigned char *data,
   {
     data[i] = state_ptr[i];
   }
-#else  /* MLD_SYS_LITTLE_ENDIAN */
+#else  /* !MLD_USE_FIPS202_X1_NATIVE && MLD_SYS_LITTLE_ENDIAN */
   unsigned i;
   /* Portable version */
   for (i = 0; i < length; i++)
   __loop__(invariant(i <= length))
   {
     data[i] = (state[(offset + i) >> 3] >> (8 * ((offset + i) & 0x07))) & 0xFF;
   }
-#endif /* !MLD_SYS_LITTLE_ENDIAN */
+#endif /* !MLD_USE_FIPS202_X1_NATIVE && !MLD_SYS_LITTLE_ENDIAN */
 }
 
 void mld_keccakf1600_xor_bytes(uint64_t *state, const unsigned char *data,
@@ -73,7 +73,7 @@ void mld_keccakf1600_xor_bytes(uint64_t *state, const unsigned char *data,
   {
     state_ptr[i] ^= data[i];
   }
-#else  /* MLD_SYS_LITTLE_ENDIAN */
+#else  /* !MLD_USE_FIPS202_X1_NATIVE && MLD_SYS_LITTLE_ENDIAN */
   unsigned i;
   /* Portable version */
   for (i = 0; i < length; i++)
@@ -82,7 +82,7 @@ void mld_keccakf1600_xor_bytes(uint64_t *state, const unsigned char *data,
     state[(offset + i) >> 3] ^= (uint64_t)data[i]
                                 << (8 * ((offset + i) & 0x07));
   }
-#endif /* !MLD_SYS_LITTLE_ENDIAN */
+#endif /* !MLD_USE_FIPS202_X1_NATIVE && !MLD_SYS_LITTLE_ENDIAN */
 }
 
 void mld_keccakf1600x4_extract_bytes(uint64_t *state, unsigned char *data0,
@@ -93,7 +93,7 @@ void mld_keccakf1600x4_extract_bytes(uint64_t *state, unsigned char *data0,
 #if defined(MLD_USE_FIPS202_X4_XOR_NATIVE)
   mld_keccakf1600_extract_bytes_x4_native(state, data0, data1, data2, data3,
                                           offset, length);
-#else  /* MLD_USE_FIPS202_X4_XOR_NATIVE */
+#else
   mld_keccakf1600_extract_bytes(state + MLD_KECCAK_LANES * 0, data0, offset,
                                 length);
   mld_keccakf1600_extract_bytes(state + MLD_KECCAK_LANES * 1, data1, offset,
@@ -102,7 +102,7 @@ void mld_keccakf1600x4_extract_bytes(uint64_t *state, unsigned char *data0,
                                 length);
   mld_keccakf1600_extract_bytes(state + MLD_KECCAK_LANES * 3, data3, offset,
                                 length);
-#endif /* !MLD_USE_FIPS202_X4_NATIVE && !MLD_USE_FIPS202_X2_NATIVE */
+#endif /* !MLD_USE_FIPS202_X4_XOR_NATIVE */
 }
 
 void mld_keccakf1600x4_xor_bytes(uint64_t *state, const unsigned char *data0,
@@ -114,7 +114,7 @@ void mld_keccakf1600x4_xor_bytes(uint64_t *state, const unsigned char *data0,
 #if defined(MLD_USE_FIPS202_X4_XOR_NATIVE)
   mld_keccakf1600_xor_bytes_x4_native(state, data0, data1, data2, data3, offset,
                                       length);
-#else  /* MLD_USE_FIPS202_X4_XOR_NATIVE */
+#else
   mld_keccakf1600_xor_bytes(state + MLD_KECCAK_LANES * 0, data0, offset,
                             length);
   mld_keccakf1600_xor_bytes(state + MLD_KECCAK_LANES * 1, data1, offset,
@@ -123,7 +123,7 @@ void mld_keccakf1600x4_xor_bytes(uint64_t *state, const unsigned char *data0,
                             length);
   mld_keccakf1600_xor_bytes(state + MLD_KECCAK_LANES * 3, data3, offset,
                             length);
-#endif /* MLD_USE_FIPS202_X4_XOR_NATIVE */
+#endif /* !MLD_USE_FIPS202_X4_XOR_NATIVE */
 }
 
 void mld_keccakf1600x4_permute(uint64_t *state)

mldsa/fips202/native/armv8.1-m/auto.h renamed to mldsa/fips202/native/armv8.1_m/auto.h

@@ -4,10 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
  */
 
-#ifndef MLD_FIPS202_NATIVE_ARMV81M_AUTO_H
-#define MLD_FIPS202_NATIVE_ARMV81M_AUTO_H
+#ifndef MLD_FIPS202_NATIVE_ARMV8_1_M_AUTO_H
+#define MLD_FIPS202_NATIVE_ARMV8_1_M_AUTO_H
 /* Default FIPS202 assembly profile for ARMV81M systems */
 
 #include "x4_v8m_mve.h"
 
-#endif /* !MLD_FIPS202_NATIVE_ARMV81M_AUTO_H */
+#endif /* !MLD_FIPS202_NATIVE_ARMV8_1_M_AUTO_H */

mldsa/fips202/native/armv8.1-m/src/bit_interleave_4x_opt.S renamed to mldsa/fips202/native/armv8.1_m/src/bit_interleave_4x_opt.S

@@ -1,7 +1,7 @@
-///
-/// Copyright (c) 2025 Arm Limited
-/// SPDX-License-Identifier: Apache-2.0 OR MIT OR ISC
-///
+/*
+ * Copyright (c) 2025 Arm Limited
+ * SPDX-License-Identifier: Apache-2.0 OR MIT OR ISC
+ */
 
 #include <arm_mve.h>
 #include <stddef.h>

mldsa/fips202/native/armv8.1-m/src/keccakf1600_adomnicai_m4_opt_m7.S renamed to mldsa/fips202/native/armv8.1_m/src/keccakf1600_adomnicai_m4_opt_m7.S

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
  */
 
-#ifndef MLD_FIPS202_NATIVE_ARMV81M_X4_V8A_SCALAR_H
-#define MLD_FIPS202_NATIVE_ARMV81M_X4_V8A_SCALAR_H
+#ifndef MLD_FIPS202_NATIVE_ARMV8_1_M_X4_V8M_MVE_H
+#define MLD_FIPS202_NATIVE_ARMV8_1_M_X4_V8M_MVE_H
 
 /* Part of backend API */
 #define MLD_USE_FIPS202_X1_NATIVE
@@ -83,4 +83,4 @@ static MLD_INLINE void mld_keccakf1600_extract_bytes_x4_native(
 
 #endif /* !__ASSEMBLER__ */
 
-#endif /* !MLD_FIPS202_NATIVE_ARMV81M_X4_V8A_SCALAR_H */
+#endif /* !MLD_FIPS202_NATIVE_ARMV8_1_M_X4_V8M_MVE_H */

mldsa/fips202/native/armv8.1-m/src/mve-keccak-4x.c renamed to mldsa/fips202/native/armv8.1_m/src/mve-keccak-4x.c

@@ -17,7 +17,7 @@
 #endif
 
 #if defined(MLD_SYS_ARMV81M)
-#include "armv8.1-m/auto.h"
+#include "armv8.1_m/auto.h"
 #endif
 
 #if defined(MLD_SYS_X86_64) && defined(MLD_SYS_X86_64_AVX2)

mldsa/fips202/native/armv8.1-m/src/mve-keccak-4x_opt_m55.S renamed to mldsa/fips202/native/armv8.1_m/src/mve-keccak-4x_opt_m55.S

@@ -4,7 +4,7 @@
 
 FIPS202_SRCS = $(wildcard mldsa/fips202/*.c)
 ifeq ($(OPT),1)
-	FIPS202_SRCS += $(wildcard mldsa/fips202/native/aarch64/src/*.S) $(wildcard mldsa/fips202/native/aarch64/src/*.c) $(wildcard mldsa/fips202/native/x86_64/src/*.c) $(wildcard mldsa/fips202/native/armv8.1-m/src/*.[csS])
+	FIPS202_SRCS += $(wildcard mldsa/fips202/native/aarch64/src/*.S) $(wildcard mldsa/fips202/native/aarch64/src/*.c) $(wildcard mldsa/fips202/native/x86_64/src/*.c) $(wildcard mldsa/fips202/native/armv8.1_m/src/*.[csS])
 endif