Skip to content

Commit a1499d8

Browse files
committed
Hoist default C backend into separate functions(mld_poly_chknorm_c)
Signed-off-by: willieyz <willie.zhao@chelpis.com>
1 parent 9a10b14 commit a1499d8

File tree

4 files changed

+114
-31
lines changed

4 files changed

+114
-31
lines changed

mldsa/src/poly.c

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -658,6 +658,48 @@ void mld_polyt0_unpack(mld_poly *r, const uint8_t a[MLDSA_POLYT0_PACKEDBYTES])
658658
(1 << (MLDSA_D - 1)) + 1);
659659
}
660660

661+
MLD_STATIC_TESTABLE uint32_t mld_poly_chknorm_c(const mld_poly *a, int32_t B)
662+
__contract__(
663+
requires(memory_no_alias(a, sizeof(mld_poly)))
664+
requires(0 <= B && B <= MLDSA_Q - REDUCE32_RANGE_MAX)
665+
requires(array_bound(a->coeffs, 0, MLDSA_N, -REDUCE32_RANGE_MAX, REDUCE32_RANGE_MAX))
666+
ensures(return_value == 0 || return_value == 0xFFFFFFFF)
667+
ensures((return_value == 0) == array_abs_bound(a->coeffs, 0, MLDSA_N, B))
668+
)
669+
{
670+
unsigned int i;
671+
uint32_t t = 0;
672+
mld_assert_bound(a->coeffs, MLDSA_N, -REDUCE32_RANGE_MAX, REDUCE32_RANGE_MAX);
673+
for (i = 0; i < MLDSA_N; ++i)
674+
__loop__(
675+
invariant(i <= MLDSA_N)
676+
invariant(t == 0 || t == 0xFFFFFFFF)
677+
invariant((t == 0) == array_abs_bound(a->coeffs, 0, i, B))
678+
)
679+
{
680+
/*
681+
* Since we know that -REDUCE32_RANGE_MAX <= a < REDUCE32_RANGE_MAX,
682+
* and B <= MLDSA_Q - REDUCE32_RANGE_MAX, to check if
683+
* -B < (a mod± MLDSA_Q) < B, it suffices to check if -B < a < B.
684+
*
685+
* We prove this to be true using the following CBMC assertions.
686+
* a ==> b expressed as !a || b to also allow run-time assertion.
687+
*/
688+
mld_assert(a->coeffs[i] < B || a->coeffs[i] - MLDSA_Q <= -B);
689+
mld_assert(a->coeffs[i] > -B || a->coeffs[i] + MLDSA_Q >= B);
690+
691+
/* Reference: Leaks which coefficient violates the bound via a conditional.
692+
* We are more conservative to reduce the number of declassifications in
693+
* constant-time testing.
694+
*/
695+
696+
/* if (abs(a[i]) >= B) */
697+
t |= mld_ct_cmask_neg_i32(B - 1 - mld_ct_abs_i32(a->coeffs[i]));
698+
}
699+
700+
return t;
701+
}
702+
661703
/* Reference: explicitly checks the bound B to be <= (MLDSA_Q - 1) / 8).
662704
* This is unnecessary as it's always a compile-time constant.
663705
* We instead model it as a precondition.
@@ -671,8 +713,6 @@ void mld_polyt0_unpack(mld_poly *r, const uint8_t a[MLDSA_POLYT0_PACKEDBYTES])
671713
MLD_INTERNAL_API
672714
uint32_t mld_poly_chknorm(const mld_poly *a, int32_t B)
673715
{
674-
unsigned int i;
675-
uint32_t t = 0;
676716
mld_assert_bound(a->coeffs, MLDSA_N, -REDUCE32_RANGE_MAX, REDUCE32_RANGE_MAX);
677717
#if defined(MLD_USE_NATIVE_POLY_CHKNORM)
678718
{
@@ -702,34 +742,7 @@ uint32_t mld_poly_chknorm(const mld_poly *a, int32_t B)
702742
}
703743
}
704744
#endif /* MLD_USE_NATIVE_POLY_CHKNORM */
705-
for (i = 0; i < MLDSA_N; ++i)
706-
__loop__(
707-
invariant(i <= MLDSA_N)
708-
invariant(t == 0 || t == 0xFFFFFFFF)
709-
invariant((t == 0) == array_abs_bound(a->coeffs, 0, i, B))
710-
)
711-
{
712-
/*
713-
* Since we know that -REDUCE32_RANGE_MAX <= a < REDUCE32_RANGE_MAX,
714-
* and B <= MLDSA_Q - REDUCE32_RANGE_MAX, to check if
715-
* -B < (a mod± MLDSA_Q) < B, it suffices to check if -B < a < B.
716-
*
717-
* We prove this to be true using the following CBMC assertions.
718-
* a ==> b expressed as !a || b to also allow run-time assertion.
719-
*/
720-
mld_assert(a->coeffs[i] < B || a->coeffs[i] - MLDSA_Q <= -B);
721-
mld_assert(a->coeffs[i] > -B || a->coeffs[i] + MLDSA_Q >= B);
722-
723-
/* Reference: Leaks which coefficient violates the bound via a conditional.
724-
* We are more conservative to reduce the number of declassifications in
725-
* constant-time testing.
726-
*/
727-
728-
/* if (abs(a[i]) >= B) */
729-
t |= mld_ct_cmask_neg_i32(B - 1 - mld_ct_abs_i32(a->coeffs[i]));
730-
}
731-
732-
return t;
745+
return mld_poly_chknorm_c(a, B);
733746
}
734747

735748
#else /* !MLD_CONFIG_MULTILEVEL_NO_SHARED */

proofs/cbmc/poly_chknorm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
2020
PROJECT_SOURCES += $(SRCDIR)/mldsa/src/poly.c
2121

2222
CHECK_FUNCTION_CONTRACTS=$(MLD_NAMESPACE)poly_chknorm
23-
USE_FUNCTION_CONTRACTS=mld_ct_abs_i32 mld_ct_cmask_neg_i32
23+
USE_FUNCTION_CONTRACTS=mld_poly_chknorm_c
2424
APPLY_LOOP_CONTRACTS=on
2525
USE_DYNAMIC_FRAMES=1
2626

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Copyright (c) The mldsa-native project authors
2+
# SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
3+
4+
include ../Makefile_params.common
5+
6+
HARNESS_ENTRY = harness
7+
HARNESS_FILE =poly_chknorm_c_harness
8+
9+
# This should be a unique identifier for this proof, and will appear on the
10+
# Litani dashboard. It can be human-readable and contain spaces if you wish.
11+
PROOF_UID = poly_chknorm_c
12+
13+
DEFINES +=
14+
INCLUDES +=
15+
16+
REMOVE_FUNCTION_BODY +=
17+
UNWINDSET +=
18+
19+
PROOF_SOURCES += $(PROOFDIR)/$(HARNESS_FILE).c
20+
PROJECT_SOURCES += $(SRCDIR)/mldsa/src/poly.c
21+
22+
CHECK_FUNCTION_CONTRACTS=mld_poly_chknorm_c
23+
USE_FUNCTION_CONTRACTS=mld_ct_abs_i32 mld_ct_cmask_neg_i32
24+
APPLY_LOOP_CONTRACTS=on
25+
USE_DYNAMIC_FRAMES=1
26+
27+
# Disable any setting of EXTERNAL_SAT_SOLVER, and choose SMT backend instead
28+
EXTERNAL_SAT_SOLVER=
29+
CBMCFLAGS=--smt2
30+
31+
FUNCTION_NAME = mld_poly_chknorm_c
32+
33+
# If this proof is found to consume huge amounts of RAM, you can set the
34+
# EXPENSIVE variable. With new enough versions of the proof tools, this will
35+
# restrict the number of EXPENSIVE CBMC jobs running at once. See the
36+
# documentation in Makefile.common under the "Job Pools" heading for details.
37+
# EXPENSIVE = true
38+
39+
# This function is large enough to need...
40+
CBMC_OBJECT_BITS = 8
41+
42+
# If you require access to a file-local ("static") function or object to conduct
43+
# your proof, set the following (and do not include the original source file
44+
# ("mldsa/poly.c") in PROJECT_SOURCES).
45+
# REWRITTEN_SOURCES = $(PROOFDIR)/<__SOURCE_FILE_BASENAME__>.i
46+
# include ../Makefile.common
47+
# $(PROOFDIR)/<__SOURCE_FILE_BASENAME__>.i_SOURCE = $(SRCDIR)/mldsa/src/poly.c
48+
# $(PROOFDIR)/<__SOURCE_FILE_BASENAME__>.i_FUNCTIONS = foo bar
49+
# $(PROOFDIR)/<__SOURCE_FILE_BASENAME__>.i_OBJECTS = baz
50+
# Care is required with variables on the left-hand side: REWRITTEN_SOURCES must
51+
# be set before including Makefile.common, but any use of variables on the
52+
# left-hand side requires those variables to be defined. Hence, _SOURCE,
53+
# _FUNCTIONS, _OBJECTS is set after including Makefile.common.
54+
55+
include ../Makefile.common
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright (c) The mldsa-native project authors
2+
// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
3+
4+
#include "poly_kl.h"
5+
6+
// Prototype for the function under test
7+
uint32_t mld_poly_chknorm_c(mld_poly *a, int32_t B);
8+
9+
void harness(void)
10+
{
11+
mld_poly *a;
12+
uint32_t r;
13+
int32_t B;
14+
r = mld_poly_chknorm_c(a, B);
15+
}

0 commit comments

Comments
 (0)