Skip to content

Commit a630caf

Browse files
committed
CBMC: Add contract and proof for polyvecl_add
Resolves #117 Unrolling resulted in too poor performance. The direct proof works, but it requires to workaround the CBMC limitation described in: #102 diffblue/cbmc#8617 Signed-off-by: Matthias J. Kannwischer <[email protected]>
1 parent ea3c70a commit a630caf

File tree

4 files changed

+84
-2
lines changed

4 files changed

+84
-2
lines changed

mldsa/polyvec.c

+9-1
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,16 @@ void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v)
7474
unsigned int i;
7575

7676
for (i = 0; i < MLDSA_L; ++i)
77+
__loop__(
78+
assigns(i, object_whole(w))
79+
invariant(i <= MLDSA_L))
7780
{
78-
poly_add(&w->vec[i], &u->vec[i], &v->vec[i]);
81+
poly t;
82+
poly_add(&t, &u->vec[i], &v->vec[i]);
83+
/* Full struct assignment from local variables to simplify proof */
84+
/* TODO: eliminate once CBMC resolves
85+
* https://github.com/diffblue/cbmc/issues/8617 */
86+
w->vec[i] = t;
7987
}
8088
}
8189

mldsa/polyvec.h

+11-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,17 @@ __contract__(
5555
* - const polyvecl *u: pointer to first summand
5656
* - const polyvecl *v: pointer to second summand
5757
**************************************************/
58-
void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v);
58+
void polyvecl_add(polyvecl *w, const polyvecl *u, const polyvecl *v)
59+
__contract__(
60+
requires(memory_no_alias(w, sizeof(polyvecl)))
61+
requires(memory_no_alias(u, sizeof(polyvecl)))
62+
requires(memory_no_alias(v, sizeof(polyvecl)))
63+
requires(forall(k0, 0, MLDSA_L,
64+
forall(k1, 0, MLDSA_N, (int64_t) u->vec[k0].coeffs[k1] + v->vec[k0].coeffs[k1] <= INT32_MAX)))
65+
requires(forall(k2, 0, MLDSA_L,
66+
forall(k3, 0, MLDSA_N, (int64_t) u->vec[k2].coeffs[k3] + v->vec[k2].coeffs[k3] >= INT32_MIN)))
67+
assigns(memory_slice(w, sizeof(polyvecl)))
68+
);
5969

6070
#define polyvecl_ntt MLD_NAMESPACE(polyvecl_ntt)
6171
/*************************************************

proofs/cbmc/polyvecl_add/Makefile

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

0 commit comments

Comments
 (0)