mldsa_native.h: Add PCT-aware MLD_TOTAL_ALLOC constants

Split KEYPAIR allocation constants into _NO_PCT and _PCT variants to
accurately reflect memory usage with and without pairwise consistency
testing (PCT). MLD_TOTAL_ALLOC_*_KEYPAIR now automatically selects
the appropriate value based on MLD_CONFIG_KEYGEN_PCT.

For legacy configs, assume PCT is enabled (conservative).

Also correct REDUCE_RAM KEYPAIR values which were previously using
PCT values unconditionally.

The default alloc test config no longer enables PCT; PCT is tested
via config-variations.

Signed-off-by: Matthias J. Kannwischer <matthias@kannwischer.eu>

Author: mkannwischer

mldsa/mldsa_native.h

@@ -827,33 +827,52 @@ int MLD_API_NAMESPACE(pk_from_sk)(
  */
 /* check-magic: off */
 #if defined(MLD_API_LEGACY_CONFIG) || !defined(MLD_CONFIG_REDUCE_RAM)
-#define MLD_TOTAL_ALLOC_44_KEYPAIR 56640
+#define MLD_TOTAL_ALLOC_44_KEYPAIR_NO_PCT 45248
+#define MLD_TOTAL_ALLOC_44_KEYPAIR_PCT 56640
 #define MLD_TOTAL_ALLOC_44_SIGN 52896
 #define MLD_TOTAL_ALLOC_44_VERIFY 38816
-#define MLD_TOTAL_ALLOC_65_KEYPAIR 85856
+#define MLD_TOTAL_ALLOC_65_KEYPAIR_NO_PCT 71872
+#define MLD_TOTAL_ALLOC_65_KEYPAIR_PCT 85856
 #define MLD_TOTAL_ALLOC_65_SIGN 80576
 #define MLD_TOTAL_ALLOC_65_VERIFY 62432
-#define MLD_TOTAL_ALLOC_87_KEYPAIR 130816
+#define MLD_TOTAL_ALLOC_87_KEYPAIR_NO_PCT 112832
+#define MLD_TOTAL_ALLOC_87_KEYPAIR_PCT 130816
 #define MLD_TOTAL_ALLOC_87_SIGN 123584
 #define MLD_TOTAL_ALLOC_87_VERIFY 99552
 #else /* MLD_API_LEGACY_CONFIG || !MLD_CONFIG_REDUCE_RAM */
-#define MLD_TOTAL_ALLOC_44_KEYPAIR 36192
+#define MLD_TOTAL_ALLOC_44_KEYPAIR_NO_PCT 32992
+#define MLD_TOTAL_ALLOC_44_KEYPAIR_PCT 36192
 #define MLD_TOTAL_ALLOC_44_SIGN 32448
 #define MLD_TOTAL_ALLOC_44_VERIFY 26560
-#define MLD_TOTAL_ALLOC_65_KEYPAIR 50048
+#define MLD_TOTAL_ALLOC_65_KEYPAIR_NO_PCT 46304
+#define MLD_TOTAL_ALLOC_65_KEYPAIR_PCT 50048
 #define MLD_TOTAL_ALLOC_65_SIGN 44768
 #define MLD_TOTAL_ALLOC_65_VERIFY 36864
-#define MLD_TOTAL_ALLOC_87_KEYPAIR 66336
+#define MLD_TOTAL_ALLOC_87_KEYPAIR_NO_PCT 62688
+#define MLD_TOTAL_ALLOC_87_KEYPAIR_PCT 66336
 #define MLD_TOTAL_ALLOC_87_SIGN 59104
 #define MLD_TOTAL_ALLOC_87_VERIFY 49408
 #endif /* !(MLD_API_LEGACY_CONFIG || !MLD_CONFIG_REDUCE_RAM) */
 /* check-magic: on */
 
+/*
+ * MLD_TOTAL_ALLOC_*_KEYPAIR adapts based on MLD_CONFIG_KEYGEN_PCT.
+ * For legacy config, we don't know which options are used, so assume
+ * the worst case (PCT enabled).
+ */
+#if defined(MLD_API_LEGACY_CONFIG) || defined(MLD_CONFIG_KEYGEN_PCT)
+#define MLD_TOTAL_ALLOC_44_KEYPAIR MLD_TOTAL_ALLOC_44_KEYPAIR_PCT
+#define MLD_TOTAL_ALLOC_65_KEYPAIR MLD_TOTAL_ALLOC_65_KEYPAIR_PCT
+#define MLD_TOTAL_ALLOC_87_KEYPAIR MLD_TOTAL_ALLOC_87_KEYPAIR_PCT
+#else
+#define MLD_TOTAL_ALLOC_44_KEYPAIR MLD_TOTAL_ALLOC_44_KEYPAIR_NO_PCT
+#define MLD_TOTAL_ALLOC_65_KEYPAIR MLD_TOTAL_ALLOC_65_KEYPAIR_NO_PCT
+#define MLD_TOTAL_ALLOC_87_KEYPAIR MLD_TOTAL_ALLOC_87_KEYPAIR_NO_PCT
+#endif
+
 /*
  * `MLD_MAX_TOTAL_ALLOC_{KEYPAIR,SIGN,VERIFY}` is the maximum across all
  * parameter sets for each operation.
- * `MLD_MAX_TOTAL_ALLOC` is the maximum across all parameter sets and
- * operations.
  */
 #define MLD_MAX_TOTAL_ALLOC_KEYPAIR MLD_TOTAL_ALLOC_87_KEYPAIR
 #define MLD_MAX_TOTAL_ALLOC_SIGN MLD_TOTAL_ALLOC_87_SIGN

test/configs/configs.yml

@@ -409,11 +409,6 @@ configs:
     description: "Using custom allocation that can be made fail at specific invocation"
     defines:
       MLD_CONFIG_NAMESPACE_PREFIX: mld
-      MLD_CONFIG_KEYGEN_PCT:
-        content: |
-          #if !defined(MLD_CONFIG_KEYGEN_PCT)
-          #define MLD_CONFIG_KEYGEN_PCT
-          #endif
       MLD_CONFIG_CUSTOM_ALLOC_FREE:
         content: |
           #define MLD_CONFIG_CUSTOM_ALLOC_FREE

test/configs/test_alloc_config.h

@@ -31,7 +31,6 @@
  * This configuration differs from the default mldsa/mldsa_native_config.h in
  * the following places:
  *   - MLD_CONFIG_NAMESPACE_PREFIX
- *   - MLD_CONFIG_KEYGEN_PCT
  *   - MLD_CONFIG_CUSTOM_ALLOC_FREE
  */
 
@@ -630,10 +629,7 @@ void custom_free(void *p, size_t sz, const char *file, int line,
  *              key generation.
  *
  *****************************************************************************/
-#if !defined(MLD_CONFIG_KEYGEN_PCT)
-#define MLD_CONFIG_KEYGEN_PCT
-#endif
-
+/* #define MLD_CONFIG_KEYGEN_PCT */
 
 /******************************************************************************
  * Name:        MLD_CONFIG_KEYGEN_PCT_BREAKAGE_TEST

test/src/test_alloc.c

@@ -17,6 +17,9 @@
  * Level-dependent allocation limit macros.
  * These expand to the right MLD_TOTAL_ALLOC_{44,65,87}_* constant
  * based on MLD_CONFIG_API_PARAMETER_SET.
+ *
+ * Note: MLD_TOTAL_ALLOC_*_KEYPAIR in the header automatically adapts
+ * based on MLD_CONFIG_KEYGEN_PCT.
  */
 #define MLD_TOTAL_ALLOC_KEYPAIR__(LVL) MLD_TOTAL_ALLOC_##LVL##_KEYPAIR
 #define MLD_TOTAL_ALLOC_KEYPAIR_(LVL) MLD_TOTAL_ALLOC_KEYPAIR__(LVL)
@@ -644,6 +647,7 @@ int main(void)
   /*
    * For parameter set 87, also check that the high watermarks match
    * the MLD_MAX_TOTAL_ALLOC_* constants (which are defined as the 87 values).
+   * MLD_MAX_TOTAL_ALLOC_KEYPAIR adapts based on MLD_CONFIG_KEYGEN_PCT.
    */
 #if MLD_CONFIG_API_PARAMETER_SET == 87
   CHECK_ALLOC_MATCH(global_bump_high_mark_keypair, MLD_MAX_TOTAL_ALLOC_KEYPAIR);