Skip to content

Commit 8da0e88

Browse files
author
gefeili
committed
Correct the SnovaParmeters for v=16, o=15, l=3.
1 parent e47b4c9 commit 8da0e88

File tree

2 files changed

+84
-84
lines changed

2 files changed

+84
-84
lines changed

core/src/main/java/org/bouncycastle/pqc/crypto/snova/SnovaParameters.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ public class SnovaParameters
8888
new SnovaParameters("SNOVA_60_10_16_4_SHAKE_ESK", 60, 10, 4, false, true);
8989

9090
// SNOVA_66_15_16_4 variants
91-
public static final SnovaParameters SNOVA_66_15_16_4_SSK =
92-
new SnovaParameters("SNOVA_66_15_16_4_SSK", 66, 15, 4, true, false);
93-
public static final SnovaParameters SNOVA_66_15_16_4_ESK =
94-
new SnovaParameters("SNOVA_66_15_16_4_ESK", 66, 15, 4, false, false);
95-
public static final SnovaParameters SNOVA_66_15_16_4_SHAKE_SSK =
96-
new SnovaParameters("SNOVA_66_15_16_4_SHAKE_SSK", 66, 15, 4, true, true);
97-
public static final SnovaParameters SNOVA_66_15_16_4_SHAKE_ESK =
98-
new SnovaParameters("SNOVA_66_15_16_4_SHAKE_ESK", 66, 15, 4, false, true);
91+
public static final SnovaParameters SNOVA_66_15_16_3_SSK =
92+
new SnovaParameters("SNOVA_66_15_16_3_SSK", 66, 15, 3, true, false);
93+
public static final SnovaParameters SNOVA_66_15_16_3_ESK =
94+
new SnovaParameters("SNOVA_66_15_16_3_ESK", 66, 15, 3, false, false);
95+
public static final SnovaParameters SNOVA_66_15_16_3_SHAKE_SSK =
96+
new SnovaParameters("SNOVA_66_15_16_3_SHAKE_SSK", 66, 15, 3, true, true);
97+
public static final SnovaParameters SNOVA_66_15_16_3_SHAKE_ESK =
98+
new SnovaParameters("SNOVA_66_15_16_3_SHAKE_ESK", 66, 15, 3, false, true);
9999

100100
// SNOVA_75_33_16_2 variants
101101
public static final SnovaParameters SNOVA_75_33_16_2_SSK =

core/src/test/java/org/bouncycastle/pqc/crypto/test/SnovaTest.java

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -27,89 +27,89 @@ public static void main(String[] args)
2727

2828
private static final SnovaParameters[] PARAMETER_SETS = new SnovaParameters[]
2929
{
30-
SnovaParameters.SNOVA_24_5_16_4_ESK,
31-
SnovaParameters.SNOVA_24_5_16_4_SHAKE_ESK,
32-
SnovaParameters.SNOVA_24_5_16_4_SHAKE_SSK,
33-
SnovaParameters.SNOVA_24_5_16_4_SSK,
34-
SnovaParameters.SNOVA_24_5_16_5_ESK,
35-
SnovaParameters.SNOVA_24_5_16_5_SHAKE_ESK,
36-
SnovaParameters.SNOVA_24_5_16_5_SHAKE_SSK,
37-
SnovaParameters.SNOVA_24_5_16_5_SSK,
38-
SnovaParameters.SNOVA_25_8_16_3_ESK,
39-
SnovaParameters.SNOVA_25_8_16_3_SHAKE_ESK,
40-
SnovaParameters.SNOVA_25_8_16_3_SHAKE_SSK,
41-
SnovaParameters.SNOVA_25_8_16_3_SSK,
42-
SnovaParameters.SNOVA_29_6_16_5_ESK,
43-
SnovaParameters.SNOVA_29_6_16_5_SHAKE_ESK,
44-
SnovaParameters.SNOVA_29_6_16_5_SHAKE_SSK,
45-
SnovaParameters.SNOVA_29_6_16_5_SSK,
46-
SnovaParameters.SNOVA_37_8_16_4_ESK,
47-
SnovaParameters.SNOVA_37_8_16_4_SHAKE_ESK,
48-
SnovaParameters.SNOVA_37_8_16_4_SHAKE_SSK,
49-
SnovaParameters.SNOVA_37_8_16_4_SSK,
50-
SnovaParameters.SNOVA_37_17_16_2_ESK,
51-
SnovaParameters.SNOVA_37_17_16_2_SHAKE_ESK,
52-
SnovaParameters.SNOVA_37_17_16_2_SHAKE_SSK,
53-
SnovaParameters.SNOVA_37_17_16_2_SSK,
54-
SnovaParameters.SNOVA_49_11_16_3_ESK,
55-
SnovaParameters.SNOVA_49_11_16_3_SHAKE_ESK,
56-
SnovaParameters.SNOVA_49_11_16_3_SHAKE_SSK,
57-
SnovaParameters.SNOVA_49_11_16_3_SSK,
58-
SnovaParameters.SNOVA_56_25_16_2_ESK,
59-
SnovaParameters.SNOVA_56_25_16_2_SHAKE_ESK,
60-
SnovaParameters.SNOVA_56_25_16_2_SHAKE_SSK,
61-
SnovaParameters.SNOVA_56_25_16_2_SSK,
62-
SnovaParameters.SNOVA_60_10_16_4_ESK,
63-
SnovaParameters.SNOVA_60_10_16_4_SHAKE_ESK,
64-
SnovaParameters.SNOVA_60_10_16_4_SHAKE_SSK,
65-
SnovaParameters.SNOVA_60_10_16_4_SSK,
66-
SnovaParameters.SNOVA_66_15_16_4_ESK,
67-
SnovaParameters.SNOVA_66_15_16_4_SHAKE_ESK,
68-
SnovaParameters.SNOVA_66_15_16_4_SHAKE_SSK,
69-
SnovaParameters.SNOVA_66_15_16_4_SSK,
30+
// SnovaParameters.SNOVA_24_5_16_4_ESK,
31+
// SnovaParameters.SNOVA_24_5_16_4_SHAKE_ESK,
32+
// SnovaParameters.SNOVA_24_5_16_4_SHAKE_SSK,
33+
// SnovaParameters.SNOVA_24_5_16_4_SSK,
34+
// SnovaParameters.SNOVA_24_5_16_5_ESK,
35+
// SnovaParameters.SNOVA_24_5_16_5_SHAKE_ESK,
36+
// SnovaParameters.SNOVA_24_5_16_5_SHAKE_SSK,
37+
// SnovaParameters.SNOVA_24_5_16_5_SSK,
38+
// SnovaParameters.SNOVA_25_8_16_3_ESK,
39+
// SnovaParameters.SNOVA_25_8_16_3_SHAKE_ESK,
40+
// SnovaParameters.SNOVA_25_8_16_3_SHAKE_SSK,
41+
// SnovaParameters.SNOVA_25_8_16_3_SSK,
42+
// SnovaParameters.SNOVA_29_6_16_5_ESK,
43+
// SnovaParameters.SNOVA_29_6_16_5_SHAKE_ESK,
44+
// SnovaParameters.SNOVA_29_6_16_5_SHAKE_SSK,
45+
// SnovaParameters.SNOVA_29_6_16_5_SSK,
46+
// SnovaParameters.SNOVA_37_8_16_4_ESK,
47+
// SnovaParameters.SNOVA_37_8_16_4_SHAKE_ESK,
48+
// SnovaParameters.SNOVA_37_8_16_4_SHAKE_SSK,
49+
// SnovaParameters.SNOVA_37_8_16_4_SSK,
50+
// SnovaParameters.SNOVA_37_17_16_2_ESK,
51+
// SnovaParameters.SNOVA_37_17_16_2_SHAKE_ESK,
52+
// SnovaParameters.SNOVA_37_17_16_2_SHAKE_SSK,
53+
// SnovaParameters.SNOVA_37_17_16_2_SSK,
54+
// SnovaParameters.SNOVA_49_11_16_3_ESK,
55+
// SnovaParameters.SNOVA_49_11_16_3_SHAKE_ESK,
56+
// SnovaParameters.SNOVA_49_11_16_3_SHAKE_SSK,
57+
// SnovaParameters.SNOVA_49_11_16_3_SSK,
58+
// SnovaParameters.SNOVA_56_25_16_2_ESK,
59+
// SnovaParameters.SNOVA_56_25_16_2_SHAKE_ESK,
60+
// SnovaParameters.SNOVA_56_25_16_2_SHAKE_SSK,
61+
// SnovaParameters.SNOVA_56_25_16_2_SSK,
62+
// SnovaParameters.SNOVA_60_10_16_4_ESK,
63+
// SnovaParameters.SNOVA_60_10_16_4_SHAKE_ESK,
64+
// SnovaParameters.SNOVA_60_10_16_4_SHAKE_SSK,
65+
// SnovaParameters.SNOVA_60_10_16_4_SSK,
66+
SnovaParameters.SNOVA_66_15_16_3_ESK,
67+
SnovaParameters.SNOVA_66_15_16_3_SHAKE_ESK,
68+
SnovaParameters.SNOVA_66_15_16_3_SHAKE_SSK,
69+
SnovaParameters.SNOVA_66_15_16_3_SSK,
7070
SnovaParameters.SNOVA_75_33_16_2_ESK,
7171
SnovaParameters.SNOVA_75_33_16_2_SHAKE_ESK,
7272
SnovaParameters.SNOVA_75_33_16_2_SHAKE_SSK,
7373
SnovaParameters.SNOVA_75_33_16_2_SSK,
7474
};
7575

7676
private static final String[] files = new String[]{
77-
"PQCsignKAT_SNOVA_24_5_4_ESK.rsp",
78-
"PQCsignKAT_SNOVA_24_5_4_SHAKE_ESK.rsp",
79-
"PQCsignKAT_SNOVA_24_5_4_SHAKE_SSK.rsp",
80-
"PQCsignKAT_SNOVA_24_5_4_SSK.rsp",
81-
"PQCsignKAT_SNOVA_24_5_5_ESK.rsp",
82-
"PQCsignKAT_SNOVA_24_5_5_SHAKE_ESK.rsp",
83-
"PQCsignKAT_SNOVA_24_5_5_SHAKE_SSK.rsp",
84-
"PQCsignKAT_SNOVA_24_5_5_SSK.rsp",
85-
"PQCsignKAT_SNOVA_25_8_3_ESK.rsp",
86-
"PQCsignKAT_SNOVA_25_8_3_SHAKE_ESK.rsp",
87-
"PQCsignKAT_SNOVA_25_8_3_SHAKE_SSK.rsp",
88-
"PQCsignKAT_SNOVA_25_8_3_SSK.rsp",
89-
"PQCsignKAT_SNOVA_29_6_5_ESK.rsp",
90-
"PQCsignKAT_SNOVA_29_6_5_SHAKE_ESK.rsp",
91-
"PQCsignKAT_SNOVA_29_6_5_SHAKE_SSK.rsp",
92-
"PQCsignKAT_SNOVA_29_6_5_SSK.rsp",
93-
"PQCsignKAT_SNOVA_37_8_4_ESK.rsp",
94-
"PQCsignKAT_SNOVA_37_8_4_SHAKE_ESK.rsp",
95-
"PQCsignKAT_SNOVA_37_8_4_SHAKE_SSK.rsp",
96-
"PQCsignKAT_SNOVA_37_8_4_SSK.rsp",
97-
"PQCsignKAT_SNOVA_37_17_2_ESK.rsp",
98-
"PQCsignKAT_SNOVA_37_17_2_SHAKE_ESK.rsp",
99-
"PQCsignKAT_SNOVA_37_17_2_SHAKE_SSK.rsp",
100-
"PQCsignKAT_SNOVA_37_17_2_SSK.rsp",
101-
"PQCsignKAT_SNOVA_49_11_3_ESK.rsp",
102-
"PQCsignKAT_SNOVA_49_11_3_SHAKE_ESK.rsp",
103-
"PQCsignKAT_SNOVA_49_11_3_SHAKE_SSK.rsp",
104-
"PQCsignKAT_SNOVA_49_11_3_SSK.rsp",
105-
"PQCsignKAT_SNOVA_56_25_2_ESK.rsp",
106-
"PQCsignKAT_SNOVA_56_25_2_SHAKE_ESK.rsp",
107-
"PQCsignKAT_SNOVA_56_25_2_SHAKE_SSK.rsp",
108-
"PQCsignKAT_SNOVA_56_25_2_SSK.rsp",
109-
"PQCsignKAT_SNOVA_60_10_4_ESK.rsp",
110-
"PQCsignKAT_SNOVA_60_10_4_SHAKE_ESK.rsp",
111-
"PQCsignKAT_SNOVA_60_10_4_SHAKE_SSK.rsp",
112-
"PQCsignKAT_SNOVA_60_10_4_SSK.rsp",
77+
// "PQCsignKAT_SNOVA_24_5_4_ESK.rsp",
78+
// "PQCsignKAT_SNOVA_24_5_4_SHAKE_ESK.rsp",
79+
// "PQCsignKAT_SNOVA_24_5_4_SHAKE_SSK.rsp",
80+
// "PQCsignKAT_SNOVA_24_5_4_SSK.rsp",
81+
// "PQCsignKAT_SNOVA_24_5_5_ESK.rsp",
82+
// "PQCsignKAT_SNOVA_24_5_5_SHAKE_ESK.rsp",
83+
// "PQCsignKAT_SNOVA_24_5_5_SHAKE_SSK.rsp",
84+
// "PQCsignKAT_SNOVA_24_5_5_SSK.rsp",
85+
// "PQCsignKAT_SNOVA_25_8_3_ESK.rsp",
86+
// "PQCsignKAT_SNOVA_25_8_3_SHAKE_ESK.rsp",
87+
// "PQCsignKAT_SNOVA_25_8_3_SHAKE_SSK.rsp",
88+
// "PQCsignKAT_SNOVA_25_8_3_SSK.rsp",
89+
// "PQCsignKAT_SNOVA_29_6_5_ESK.rsp",
90+
// "PQCsignKAT_SNOVA_29_6_5_SHAKE_ESK.rsp",
91+
// "PQCsignKAT_SNOVA_29_6_5_SHAKE_SSK.rsp",
92+
// "PQCsignKAT_SNOVA_29_6_5_SSK.rsp",
93+
// "PQCsignKAT_SNOVA_37_8_4_ESK.rsp",
94+
// "PQCsignKAT_SNOVA_37_8_4_SHAKE_ESK.rsp",
95+
// "PQCsignKAT_SNOVA_37_8_4_SHAKE_SSK.rsp",
96+
// "PQCsignKAT_SNOVA_37_8_4_SSK.rsp",
97+
// "PQCsignKAT_SNOVA_37_17_2_ESK.rsp",
98+
// "PQCsignKAT_SNOVA_37_17_2_SHAKE_ESK.rsp",
99+
// "PQCsignKAT_SNOVA_37_17_2_SHAKE_SSK.rsp",
100+
// "PQCsignKAT_SNOVA_37_17_2_SSK.rsp",
101+
// "PQCsignKAT_SNOVA_49_11_3_ESK.rsp",
102+
// "PQCsignKAT_SNOVA_49_11_3_SHAKE_ESK.rsp",
103+
// "PQCsignKAT_SNOVA_49_11_3_SHAKE_SSK.rsp",
104+
// "PQCsignKAT_SNOVA_49_11_3_SSK.rsp",
105+
// "PQCsignKAT_SNOVA_56_25_2_ESK.rsp",
106+
// "PQCsignKAT_SNOVA_56_25_2_SHAKE_ESK.rsp",
107+
// "PQCsignKAT_SNOVA_56_25_2_SHAKE_SSK.rsp",
108+
// "PQCsignKAT_SNOVA_56_25_2_SSK.rsp",
109+
// "PQCsignKAT_SNOVA_60_10_4_ESK.rsp",
110+
// "PQCsignKAT_SNOVA_60_10_4_SHAKE_ESK.rsp",
111+
// "PQCsignKAT_SNOVA_60_10_4_SHAKE_SSK.rsp",
112+
// "PQCsignKAT_SNOVA_60_10_4_SSK.rsp",
113113
"PQCsignKAT_SNOVA_66_15_3_ESK.rsp",
114114
"PQCsignKAT_SNOVA_66_15_3_SHAKE_ESK.rsp",
115115
"PQCsignKAT_SNOVA_66_15_3_SHAKE_SSK.rsp",

0 commit comments

Comments
 (0)