Skip to content

Commit d00867d

Browse files
authored
Merge pull request #323 from pq-code-package/remove-nistkat
Remove the NISTKAT test
2 parents e5a68c6 + 7860091 commit d00867d

File tree

15 files changed

+19
-1254
lines changed

15 files changed

+19
-1254
lines changed

.github/actions/functest/action.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ inputs:
3939
kat:
4040
description: Determine whether to run kat test or not
4141
default: "true"
42-
nistkat:
43-
description: Determine whether to run nistkat test or not
44-
default: "true"
4542
acvp:
4643
description: Determine whether to run acvp test or not
4744
default: "true"
@@ -58,7 +55,6 @@ runs:
5855
echo MODE="${{ inputs.cross_prefix == '' && 'native' || 'cross' }}" >> $GITHUB_ENV
5956
echo FUNC="${{ inputs.func == 'true' && 'func' || 'no-func' }}" >> $GITHUB_ENV
6057
echo KAT="${{ inputs.kat == 'true' && 'kat' || 'no-kat' }}" >> $GITHUB_ENV
61-
echo NISTKAT="${{ inputs.nistkat == 'true' && 'nistkat' || 'no-nistkat' }}" >> $GITHUB_ENV
6258
echo ACVP="${{ inputs.acvp == 'true' && 'acvp' || 'no-acvp' }}" >> $GITHUB_ENV
6359
echo EXAMPLES="${{ inputs.examples == 'true' && 'examples' || 'no-examples' }}" >> $GITHUB_ENV
6460
- name: Setup nix
@@ -91,11 +87,11 @@ runs:
9187
- $(python3 --version)
9288
- $(${{ inputs.cross_prefix }}${CC} --version | grep -m1 "")
9389
EOF
94-
- name: ${{ env.MODE }} ${{ inputs.opt }} tests (${{ env.FUNC }}, ${{ env.KAT }}, ${{ env.NISTKAT }}, ${{ env.EXAMPLES }})
90+
- name: ${{ env.MODE }} ${{ inputs.opt }} tests (${{ env.FUNC }}, ${{ env.KAT }}, ${{ env.EXAMPLES }})
9591
shell: ${{ env.SHELL }}
9692
run: |
9793
make clean
98-
./scripts/tests all --exec-wrapper="${{ inputs.exec_wrapper }}" --cross-prefix="${{ inputs.cross_prefix }}" --cflags="${{ inputs.cflags }}" --opt=${{ inputs.opt }} --${{ env.FUNC }} --${{ env.KAT }} --${{ env.NISTKAT }} --${{ env.ACVP }} --${{ env.EXAMPLES }} -v
94+
./scripts/tests all --exec-wrapper="${{ inputs.exec_wrapper }}" --cross-prefix="${{ inputs.cross_prefix }}" --cflags="${{ inputs.cflags }}" --opt=${{ inputs.opt }} --${{ env.FUNC }} --${{ env.KAT }} --${{ env.ACVP }} --${{ env.EXAMPLES }} -v
9995
- name: Post ${{ env.MODE }} Tests
10096
shell: ${{ env.SHELL }}
10197
if: success() || failure()

.github/actions/multi-functest/action.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ inputs:
3636
kat:
3737
description: Determine whether to run kat test or not
3838
default: "true"
39-
nistkat:
40-
description: Determine whether to run nistkat test or not
41-
default: "true"
4239
acvp:
4340
description: Determine whether to run acvp test or not
4441
default: "true"
@@ -61,7 +58,6 @@ runs:
6158
opt: ${{ inputs.opt }}
6259
func: ${{ inputs.func }}
6360
kat: ${{ inputs.kat }}
64-
nistkat: ${{ inputs.nistkat }}
6561
acvp: ${{ inputs.acvp }}
6662
examples: ${{ inputs.examples }}
6763
- name: Cross x86_64 Tests
@@ -79,7 +75,6 @@ runs:
7975
opt: ${{ inputs.opt }}
8076
func: ${{ inputs.func }}
8177
kat: ${{ inputs.kat }}
82-
nistkat: ${{ inputs.nistkat }}
8378
acvp: ${{ inputs.acvp }}
8479
examples: ${{ inputs.examples }}
8580
- name: Cross aarch64 Tests
@@ -97,7 +92,6 @@ runs:
9792
opt: ${{ inputs.opt }}
9893
func: ${{ inputs.func }}
9994
kat: ${{ inputs.kat }}
100-
nistkat: ${{ inputs.nistkat }}
10195
acvp: ${{ inputs.acvp }}
10296
examples: ${{ inputs.examples }}
10397
- name: Cross ppc64le Tests
@@ -115,7 +109,6 @@ runs:
115109
opt: ${{ inputs.opt }}
116110
func: ${{ inputs.func }}
117111
kat: ${{ inputs.kat }}
118-
nistkat: ${{ inputs.nistkat }}
119112
acvp: ${{ inputs.acvp }}
120113
examples: ${{ inputs.examples }}
121114
- name: Cross aarch64_be Tests
@@ -133,7 +126,6 @@ runs:
133126
opt: ${{ inputs.opt }}
134127
func: ${{ inputs.func }}
135128
kat: ${{ inputs.kat }}
136-
nistkat: ${{ inputs.nistkat }}
137129
acvp: ${{ inputs.acvp }}
138130
examples: ${{ inputs.examples }}
139131
- name: Cross riscv64 Tests
@@ -151,6 +143,5 @@ runs:
151143
opt: ${{ inputs.opt }}
152144
func: ${{ inputs.func }}
153145
kat: ${{ inputs.kat }}
154-
nistkat: ${{ inputs.nistkat }}
155146
acvp: ${{ inputs.acvp }}
156147
examples: ${{ inputs.examples }}

.github/workflows/cbmc.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ jobs:
2626
verbose: true
2727
functest: true
2828
kattest: false
29-
nistkattest: false
3029
acvptest: false
3130
cbmc: true
3231
cbmc_mldsa_mode: 2
@@ -49,7 +48,6 @@ jobs:
4948
verbose: true
5049
functest: true
5150
kattest: false
52-
nistkattest: false
5351
acvptest: false
5452
cbmc: true
5553
cbmc_mldsa_mode: 3
@@ -72,7 +70,6 @@ jobs:
7270
verbose: true
7371
functest: true
7472
kattest: false
75-
nistkattest: false
7673
acvptest: false
7774
cbmc: true
7875
cbmc_mldsa_mode: 5

.github/workflows/ci.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ jobs:
248248
gh_token: ${{ secrets.GITHUB_TOKEN }}
249249
compile_mode: native
250250
func: true
251-
nistkat: false
252251
kat: false
253252
acvp: false
254253
examples: ${{ matrix.compiler.examples }}
@@ -262,7 +261,6 @@ jobs:
262261
gh_token: ${{ secrets.GITHUB_TOKEN }}
263262
compile_mode: native
264263
func: true
265-
nistkat: false
266264
kat: false
267265
acvp: false
268266
examples: ${{ matrix.compiler.examples }}
@@ -276,7 +274,6 @@ jobs:
276274
gh_token: ${{ secrets.GITHUB_TOKEN }}
277275
compile_mode: native
278276
func: true
279-
nistkat: false
280277
kat: false
281278
acvp: false
282279
examples: ${{ matrix.compiler.examples }}
@@ -290,7 +287,6 @@ jobs:
290287
gh_token: ${{ secrets.GITHUB_TOKEN }}
291288
compile_mode: native
292289
func: true
293-
nistkat: false
294290
kat: false
295291
acvp: false
296292
examples: ${{ matrix.compiler.examples }}
@@ -305,7 +301,6 @@ jobs:
305301
gh_token: ${{ secrets.GITHUB_TOKEN }}
306302
compile_mode: native
307303
func: true
308-
nistkat: false
309304
kat: false
310305
acvp: false
311306
examples: ${{ matrix.compiler.examples }}
@@ -320,7 +315,6 @@ jobs:
320315
gh_token: ${{ secrets.GITHUB_TOKEN }}
321316
compile_mode: native
322317
func: true
323-
nistkat: false
324318
kat: false
325319
acvp: false
326320
examples: ${{ matrix.compiler.examples }}

.github/workflows/ci_ec2_reusable.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ on:
4646
kattest:
4747
type: boolean
4848
default: true
49-
nistkattest:
50-
type: boolean
51-
default: true
5249
acvptest:
5350
type: boolean
5451
default: true
@@ -170,7 +167,6 @@ jobs:
170167
opt: ${{ inputs.opt }}
171168
func: ${{ inputs.functest }}
172169
kat: ${{ inputs.kattest }}
173-
nistkat: ${{ inputs.nistkattest }}
174170
acvp: ${{ inputs.acvptest }}
175171
- name: CBMC
176172
if: ${{ inputs.cbmc && (success() || failure()) }}

LICENSE

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -36,75 +36,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
3636
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
3737
SOFTWARE.
3838

39-
Licenses for support code
40-
-------------------------
41-
42-
The code in test/nistrng/rng.c is derived from code provided by NIST
43-
and governed by the following terms of use:
44-
45-
```
46-
NIST-developed software is provided by NIST as a public service. You may
47-
use, copy, and distribute copies of the software in any medium, provided
48-
that you keep intact this entire notice. You may improve, modify, and
49-
create derivative works of the software or any portion of the software, and
50-
you may copy and distribute such modifications or works. Modified works
51-
should carry a notice stating that you changed the software and should note
52-
the date and nature of any such change. Please explicitly acknowledge the
53-
National Institute of Standards and Technology as the source of the
54-
software.
55-
56-
NIST-developed software is expressly provided "AS IS." NIST MAKES NO
57-
WARRANTY OF ANY KIND, EXPRESS, IMPLIED, IN FACT, OR ARISING BY OPERATION OF
58-
LAW, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTY OF
59-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
60-
DATA ACCURACY. NIST NEITHER REPRESENTS NOR WARRANTS THAT THE OPERATION OF
61-
THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE, OR THAT ANY DEFECTS WILL
62-
BE CORRECTED. NIST DOES NOT WARRANT OR MAKE ANY REPRESENTATIONS REGARDING
63-
THE USE OF THE SOFTWARE OR THE RESULTS THEREOF, INCLUDING BUT NOT LIMITED
64-
TO THE CORRECTNESS, ACCURACY, RELIABILITY, OR USEFULNESS OF THE SOFTWARE.
65-
66-
You are solely responsible for determining the appropriateness of using and
67-
distributing the software and you assume all risks associated with its use,
68-
including but not limited to the risks and costs of program errors,
69-
compliance with applicable laws, damage to or loss of data, programs or
70-
equipment, and the unavailability or interruption of operation. This
71-
software is not intended to be used in any situation where a failure could
72-
cause risk of injury or damage to property. The software developed by NIST
73-
employees is not subject to copyright protection within the United
74-
States.
75-
```
76-
77-
The code in test/nistrng/aes.* is derived from code in BearSSL
78-
and carries the MIT license. It is only used for testing purposes.
79-
80-
```
81-
Copyright (c) The mlkem-native project authors
82-
Copyright (c) The mldsa-native project authors
83-
Copyright (c) 2016 Thomas Pornin <[email protected]>
84-
85-
SPDX-License-Identifier: MIT
86-
87-
Permission is hereby granted, free of charge, to any person obtaining
88-
a copy of this software and associated documentation files (the
89-
"Software"), to deal in the Software without restriction, including
90-
without limitation the rights to use, copy, modify, merge, publish,
91-
distribute, sublicense, and/or sell copies of the Software, and to
92-
permit persons to whom the Software is furnished to do so, subject to
93-
the following conditions:
94-
95-
The above copyright notice and this permission notice shall be
96-
included in all copies or substantial portions of the Software.
97-
98-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
99-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
100-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
101-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
102-
BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
103-
ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
104-
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
105-
SOFTWARE.
106-
```
107-
10839
The code in test/notrandombytes/* is derived from
10940
https://cr.yp.to/papers.html#surf and licensed under
11041
LicenseRef-PD-hp OR CC0-1.0 OR 0BSD OR MIT-0 OR MIT.

META.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,15 @@ implementations:
99
length-secret-key: 2560
1010
length-signature: 2420
1111
kat-sha256: 9d4ae4ea0c1b56f96650838c7425cc2167a0754643b79a93bee28cb039ac2fc2
12-
nistkat-sha256: 9a196e7fb32fbc93757dc2d8dc1924460eab66303c0c08aeb8b798fb8d8f8cf3
1312
- name: ML-DSA-65
1413
claimed-nist-level: 3
1514
length-public-key: 1952
1615
length-secret-key: 4032
1716
length-signature: 3309
1817
kat-sha256: b66d7de88a3bec2d7cf171a7a1198f6de47384e2a1dd3bf7d07432316a9a40f8
19-
nistkat-sha256: 7cb96242eac9907a55b5c84c202f0ebd552419c50b2e986dc2e28f07ecebf072
2018
- name: ML-DSA-87
2119
claimed-nist-level: 5
2220
length-public-key: 2592
2321
length-secret-key: 4896
2422
length-signature: 4627
2523
kat-sha256: 93029142bf62f67ae3df0d31c2fccf8c9fa1e61ab388048e1b3faeb9451a61ce
26-
nistkat-sha256: 4537905d2aabcf302fab2f242baed293459ecda7c230e6a67063b02c7e2840ed

Makefile

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# Copyright (c) The mldsa-native project authors
33
# SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
44

5-
.PHONY: func kat nistkat acvp \
6-
func_44 kat_44 nistkat_44 acvp_44 \
7-
func_65 kat_65 nistkat_65 acvp_65 \
8-
func_87 kat_87 nistkat_87 acvp_87 \
9-
run_func run_kat run_nistkat run_acvp \
10-
run_func_44 run_kat_44 run_nistkat_44 \
11-
run_func_65 run_kat_65 run_nistkat_65 \
12-
run_func_87 run_kat_87 run_nistkat_87 \
5+
.PHONY: func kat acvp \
6+
func_44 kat_44 acvp_44 \
7+
func_65 kat_65 acvp_65 \
8+
func_87 kat_87 acvp_87 \
9+
run_func run_kat run_acvp \
10+
run_func_44 run_kat_44 \
11+
run_func_65 run_kat_65 \
12+
run_func_87 run_kat_87 \
1313
bench_44 bench_65 bench_87 bench \
1414
run_bench_44 run_bench_65 run_bench_87 run_bench \
1515
bench_components_44 bench_components_65 bench_components_87 bench_components \
@@ -28,10 +28,10 @@ include test/mk/rules.mk
2828

2929
quickcheck: test
3030

31-
build: func nistkat kat acvp
31+
build: func kat acvp
3232
$(Q)echo " Everything builds fine!"
3333

34-
test: run_kat run_nistkat run_func run_acvp
34+
test: run_kat run_func run_acvp
3535
$(Q)echo " Everything checks fine!"
3636

3737
run_kat_44: kat_44
@@ -42,14 +42,6 @@ run_kat_87: kat_87
4242
$(W) $(MLDSA87_DIR)/bin/gen_KAT87 | sha256sum | cut -d " " -f 1 | xargs ./META.sh ML-DSA-87 kat-sha256
4343
run_kat: run_kat_44 run_kat_65 run_kat_87
4444

45-
run_nistkat_44: nistkat_44
46-
$(W) $(MLDSA44_DIR)/bin/gen_NISTKAT44 | sha256sum | cut -d " " -f 1 | xargs ./META.sh ML-DSA-44 nistkat-sha256
47-
run_nistkat_65: nistkat_65
48-
$(W) $(MLDSA65_DIR)/bin/gen_NISTKAT65 | sha256sum | cut -d " " -f 1 | xargs ./META.sh ML-DSA-65 nistkat-sha256
49-
run_nistkat_87: nistkat_87
50-
$(W) $(MLDSA87_DIR)/bin/gen_NISTKAT87 | sha256sum | cut -d " " -f 1 | xargs ./META.sh ML-DSA-87 nistkat-sha256
51-
run_nistkat: run_nistkat_44 run_nistkat_65 run_nistkat_87
52-
5345
run_func_44: func_44
5446
$(W) $(MLDSA44_DIR)/bin/test_mldsa44
5547
run_func_65: func_65
@@ -69,14 +61,6 @@ func_87: $(MLDSA87_DIR)/bin/test_mldsa87
6961
$(Q)echo " FUNC ML-DSA-87: $^"
7062
func: func_44 func_65 func_87
7163

72-
nistkat_44: $(MLDSA44_DIR)/bin/gen_NISTKAT44
73-
$(Q)echo " NISTKAT ML-DSA-44: $^"
74-
nistkat_65: $(MLDSA65_DIR)/bin/gen_NISTKAT65
75-
$(Q)echo " NISTKAT ML-DSA-65: $^"
76-
nistkat_87: $(MLDSA87_DIR)/bin/gen_NISTKAT87
77-
$(Q)echo " NISTKAT ML-DSA-87: $^"
78-
nistkat: nistkat_44 nistkat_65 nistkat_87
79-
8064
kat_44: $(MLDSA44_DIR)/bin/gen_KAT44
8165
$(Q)echo " KAT ML-DSA-44: $^"
8266
kat_65: $(MLDSA65_DIR)/bin/gen_KAT65

0 commit comments

Comments
 (0)