mldsa_native.h: Remove MLD_MAX_TOTAL_ALLOC constants

Remove MLD_MAX_TOTAL_ALLOC and MLD_MAX_TOTAL_ALLOC_{KEYPAIR,SIGN,VERIFY}
constants. These exposed the maximum allocation across all security
levels even in single-level builds, which was confusing. Users should
instead use the explicitly security-level-labeled constants such as
MLD_TOTAL_ALLOC_87_KEYPAIR.

The per-level MLD_TOTAL_ALLOC_{44,65,87}_{KEYPAIR,SIGN,VERIFY} and
aggregate MLD_TOTAL_ALLOC_{44,65,87} constants remain available.

Signed-off-by: Matthias J. Kannwischer <[email protected]>

Author: mkannwischer

mldsa/mldsa_native.S

@@ -177,10 +177,6 @@
 #undef MLD_ERR_RNG_FAIL
 #undef MLD_H
 #undef MLD_MAX3_
-#undef MLD_MAX_TOTAL_ALLOC
-#undef MLD_MAX_TOTAL_ALLOC_KEYPAIR
-#undef MLD_MAX_TOTAL_ALLOC_SIGN
-#undef MLD_MAX_TOTAL_ALLOC_VERIFY
 #undef MLD_PREHASH_NONE
 #undef MLD_PREHASH_SHA2_224
 #undef MLD_PREHASH_SHA2_256

mldsa/mldsa_native.c

@@ -173,10 +173,6 @@
 #undef MLD_ERR_RNG_FAIL
 #undef MLD_H
 #undef MLD_MAX3_
-#undef MLD_MAX_TOTAL_ALLOC
-#undef MLD_MAX_TOTAL_ALLOC_KEYPAIR
-#undef MLD_MAX_TOTAL_ALLOC_SIGN
-#undef MLD_MAX_TOTAL_ALLOC_VERIFY
 #undef MLD_PREHASH_NONE
 #undef MLD_PREHASH_SHA2_224
 #undef MLD_PREHASH_SHA2_256

mldsa/mldsa_native.h

@@ -945,22 +945,12 @@ int MLD_API_NAMESPACE(pk_from_sk)(
 #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.
- */
-#define MLD_MAX_TOTAL_ALLOC_KEYPAIR MLD_TOTAL_ALLOC_87_KEYPAIR
-#define MLD_MAX_TOTAL_ALLOC_SIGN MLD_TOTAL_ALLOC_87_SIGN
-#define MLD_MAX_TOTAL_ALLOC_VERIFY MLD_TOTAL_ALLOC_87_VERIFY
-
 #define MLD_MAX3_(a, b, c) \
   ((a) > (b) ? ((a) > (c) ? (a) : (c)) : ((b) > (c) ? (b) : (c)))
 
 /*
  * `MLD_TOTAL_ALLOC_{44,65,87}` is the maximum across all operations for each
  * parameter set.
- * `MLD_MAX_TOTAL_ALLOC` is the maximum across all parameter sets and
- * operations.
  */
 #define MLD_TOTAL_ALLOC_44                                       \
   MLD_MAX3_(MLD_TOTAL_ALLOC_44_KEYPAIR, MLD_TOTAL_ALLOC_44_SIGN, \
@@ -972,6 +962,4 @@ int MLD_API_NAMESPACE(pk_from_sk)(
   MLD_MAX3_(MLD_TOTAL_ALLOC_87_KEYPAIR, MLD_TOTAL_ALLOC_87_SIGN, \
             MLD_TOTAL_ALLOC_87_VERIFY)
 
-#define MLD_MAX_TOTAL_ALLOC MLD_TOTAL_ALLOC_87
-
 #endif /* !MLD_H */

test/src/test_alloc.c

@@ -666,17 +666,5 @@ int main(void)
   CHECK_ALLOC_MATCH(ctx.global_high_mark_verify, MLD_TOTAL_ALLOC_VERIFY);
   CHECK_ALLOC_MATCH(ctx.global_high_mark, MLD_TOTAL_ALLOC);
 
-  /*
-   * 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(ctx.global_high_mark_keypair, MLD_MAX_TOTAL_ALLOC_KEYPAIR);
-  CHECK_ALLOC_MATCH(ctx.global_high_mark_sign, MLD_MAX_TOTAL_ALLOC_SIGN);
-  CHECK_ALLOC_MATCH(ctx.global_high_mark_verify, MLD_MAX_TOTAL_ALLOC_VERIFY);
-  CHECK_ALLOC_MATCH(ctx.global_high_mark, MLD_MAX_TOTAL_ALLOC);
-#endif /* MLD_CONFIG_API_PARAMETER_SET == 87 */
-
   return 0;
 }