Merge pull request #1120 from pq-code-package/namespace-zetas

Namespacing: zetas -> mlk_zetas

Author: hanno-becker

mlkem/src/poly.c

@@ -266,8 +266,8 @@ void mlk_poly_mulcache_compute(mlk_poly_mulcache *x, const mlk_poly *a)
     invariant(i <= MLKEM_N / 4)
     invariant(array_abs_bound(x->coeffs, 0, 2 * i, MLKEM_Q)))
   {
-    x->coeffs[2 * i + 0] = mlk_fqmul(a->coeffs[4 * i + 1], zetas[64 + i]);
-    x->coeffs[2 * i + 1] = mlk_fqmul(a->coeffs[4 * i + 3], -zetas[64 + i]);
+    x->coeffs[2 * i + 0] = mlk_fqmul(a->coeffs[4 * i + 1], mlk_zetas[64 + i]);
+    x->coeffs[2 * i + 1] = mlk_fqmul(a->coeffs[4 * i + 3], -mlk_zetas[64 + i]);
   }
 
   /*
@@ -378,7 +378,7 @@ __contract__(
     invariant(array_abs_bound(r, 0, start, layer * MLKEM_Q + MLKEM_Q))
     invariant(array_abs_bound(r, start, MLKEM_N, layer * MLKEM_Q)))
   {
-    int16_t zeta = zetas[k++];
+    int16_t zeta = mlk_zetas[k++];
     mlk_ntt_butterfly_block(r, zeta, start, len, layer * MLKEM_Q);
   }
 }
@@ -449,7 +449,7 @@ __contract__(
     invariant(2 * len * k + start == 2 * MLKEM_N - 2 * len))
   {
     unsigned j;
-    int16_t zeta = zetas[k--];
+    int16_t zeta = mlk_zetas[k--];
     for (j = start; j < start + len; j++)
     __loop__(
       invariant(start <= j && j <= start + len)

mlkem/src/zetas.inc

@@ -15,7 +15,7 @@
  * Table of zeta values used in the reference NTT and inverse NTT.
  * See autogen for details.
  */
-static MLK_ALIGN const int16_t zetas[128] = {
+static MLK_ALIGN const int16_t mlk_zetas[128] = {
     -1044, -758,  -359,  -1517, 1493,  1422,  287,   202,  -171,  622,   1577,
     182,   962,   -1202, -1474, 1468,  573,   -1325, 264,  383,   -829,  1458,
     -1602, -130,  -681,  1017,  732,   608,   -1542, 411,  -205,  -1571, 1223,

scripts/autogen

@@ -519,7 +519,7 @@ def gen_c_zeta_file(dry_run=False):
         yield " * Table of zeta values used in the reference NTT and inverse NTT."
         yield " * See autogen for details."
         yield " */"
-        yield "static MLK_ALIGN const int16_t zetas[128] = {"
+        yield "static MLK_ALIGN const int16_t mlk_zetas[128] = {"
         yield from map(lambda t: str(t) + ",", gen_c_zetas())
         yield "};"
         yield ""