Skip to content

Commit dd33c2f

Browse files
committed
adjustments for the external CI
- the spec relies on Array8 which is was ignored.
1 parent 0d26251 commit dd33c2f

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
.vscode
22
venv
33

4-
proof/extraction/*.ec
5-
proof/common/
4+
proof/extraction/*.ec

proof/Makefile

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ extract: extraction/XMSS_IMPL.ec
2121

2222
# --------------------------------------------------------------------------------------------------
2323

24-
common/Array8.ec: | common/
25-
printf "from Jasmin require import JArray.\n\nclone export PolyArray as Array8 with op size <- 8.\n" > $@
26-
2724
extraction/XMSS_IMPL.ec: ../ref-jasmin/xmss/xmss.jinc | common/
2825
printf "from XMSS require \"params/params-xmssmt-sha2_20_2_256.jinc\"" > tmp
2926
cat $< >> tmp
@@ -34,27 +31,27 @@ extraction/XMSS_IMPL.ec: ../ref-jasmin/xmss/xmss.jinc | common/
3431

3532
# --------------------------------------------------------------------------------------------------
3633

37-
check_xmss_common_spec: common/Array8.ec
34+
check_xmss_common_spec:
3835
$(ECRUNTEST) config/tests.config common-spec
3936

40-
check_xmss_spec: common/Array8.ec
37+
check_xmss_spec:
4138
$(ECRUNTEST) config/tests.config xmss-spec
4239

43-
check_xmss_mt_spec: common/Array8.ec
40+
check_xmss_mt_spec:
4441
$(ECRUNTEST) config/tests.config xmss-mt-spec
4542

4643
# FIXME: This is currently not checked
47-
check_xmss_spec_extra: common/Array8.ec
44+
check_xmss_spec_extra:
4845
$(ECRUNTEST) config/tests.config xmss-spec-extra
4946

50-
check_spec: common/Array8.ec check_xmss_common_spec check_xmss_spec check_xmss_mt_spec
47+
check_spec: check_xmss_common_spec check_xmss_spec check_xmss_mt_spec
5148

5249
check_extraction: extraction/XMSS_IMPL.ec
5350
$(ECRUNTEST) config/tests.config extraction
5451

5552
################################### correctness proof ##############################################
5653

57-
check_correctness_proof: extraction/XMSS_IMPL.ec common/Array8.ec
54+
check_correctness_proof: extraction/XMSS_IMPL.ec
5855
$(ECRUNTEST) config/tests.config correctness
5956

6057
####################################################################################################
@@ -67,7 +64,7 @@ check_security_proof:
6764
####################################################################################################
6865

6966
# FIXME: This would currently be subsumed by the xmss-spec-extra target, if activated
70-
check_xmss_xmssmt_proof: common/Array8.ec
67+
check_xmss_xmssmt_proof:
7168
$(EASYCRYPT) $(EC_FLAGS) spec/extra/XMSS_vs_XMSS_MT.ec
7269

7370
check_proofs: check_xmss_xmssmt_proof check_correctness_proof check_security_proof
@@ -100,6 +97,3 @@ distclean:
10097
extraction/:
10198
mkdir -p $@
10299

103-
104-
common/:
105-
mkdir -p $@

proof/common/Array8.ec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
from Jasmin require import JArray.
2+
3+
clone export PolyArray as Array8 with op size <- 8.

proof/spec/extra/SpecSecurity.ec

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import Params Types XMSS_Types Hash WOTS Address LTree BaseW.
77

88
(* Get checksum from XMXX_Checksum and then plug those results
99
here *)
10+
11+
(*
1012
clone import XMSS_TW as XMSS_ABSTRACT with
1113
type mseed <- nbytes,
1214
op dmseed <- (dmap ((dlist W8.dword n)) NBytes.insubd),
@@ -81,3 +83,4 @@ equiv ver_eq : XMSS_TW(FakeRO).verify ~ XMSS_PRF.verify : pkrel pk{1} pk{2} /\ =
8183
proc.
8284
admitted.
8385
86+
*)

0 commit comments

Comments
 (0)