Skip to content

Commit 31300ad

Browse files
mkannwischerhanno-becker
authored andcommitted
Remove TRBYTES from public API
TRBYTES is an internal constant and should not be part of `mldsa_native.h`. Drop the `MLDSA*_TRBYTES` macros and their `#undef`s, and hardcode the value in the corrupted-sk test that was the only consumer outside the internal code. - Resolves #1267 Signed-off-by: Matthias J. Kannwischer <matthias@zerorisc.com>
1 parent 00c5297 commit 31300ad

4 files changed

Lines changed: 2 additions & 14 deletions

File tree

mldsa/mldsa_native.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,18 @@
127127
#undef MLDSA44_RNDBYTES
128128
#undef MLDSA44_SECRETKEYBYTES
129129
#undef MLDSA44_SEEDBYTES
130-
#undef MLDSA44_TRBYTES
131130
#undef MLDSA65_BYTES
132131
#undef MLDSA65_CRHBYTES
133132
#undef MLDSA65_PUBLICKEYBYTES
134133
#undef MLDSA65_RNDBYTES
135134
#undef MLDSA65_SECRETKEYBYTES
136135
#undef MLDSA65_SEEDBYTES
137-
#undef MLDSA65_TRBYTES
138136
#undef MLDSA87_BYTES
139137
#undef MLDSA87_CRHBYTES
140138
#undef MLDSA87_PUBLICKEYBYTES
141139
#undef MLDSA87_RNDBYTES
142140
#undef MLDSA87_SECRETKEYBYTES
143141
#undef MLDSA87_SEEDBYTES
144-
#undef MLDSA87_TRBYTES
145142
#undef MLDSA_BYTES
146143
#undef MLDSA_BYTES_
147144
#undef MLDSA_CRHBYTES
@@ -151,7 +148,6 @@
151148
#undef MLDSA_SECRETKEYBYTES
152149
#undef MLDSA_SECRETKEYBYTES_
153150
#undef MLDSA_SEEDBYTES
154-
#undef MLDSA_TRBYTES
155151
#undef MLD_API_CONCAT
156152
#undef MLD_API_CONCAT_
157153
#undef MLD_API_CONCAT_UNDERSCORE

mldsa/mldsa_native.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,6 @@
6262
#define MLDSA65_CRHBYTES MLDSA_CRHBYTES
6363
#define MLDSA87_CRHBYTES MLDSA_CRHBYTES
6464

65-
/* Size of TR output in bytes (level-independent) */
66-
#define MLDSA_TRBYTES 64
67-
#define MLDSA44_TRBYTES MLDSA_TRBYTES
68-
#define MLDSA65_TRBYTES MLDSA_TRBYTES
69-
#define MLDSA87_TRBYTES MLDSA_TRBYTES
70-
7165
/* Size of randomness for signing in bytes (level-independent) */
7266
#define MLDSA_RNDBYTES 32
7367
#define MLDSA44_RNDBYTES MLDSA_RNDBYTES

mldsa/mldsa_native_asm.S

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,21 +148,18 @@
148148
#undef MLDSA44_RNDBYTES
149149
#undef MLDSA44_SECRETKEYBYTES
150150
#undef MLDSA44_SEEDBYTES
151-
#undef MLDSA44_TRBYTES
152151
#undef MLDSA65_BYTES
153152
#undef MLDSA65_CRHBYTES
154153
#undef MLDSA65_PUBLICKEYBYTES
155154
#undef MLDSA65_RNDBYTES
156155
#undef MLDSA65_SECRETKEYBYTES
157156
#undef MLDSA65_SEEDBYTES
158-
#undef MLDSA65_TRBYTES
159157
#undef MLDSA87_BYTES
160158
#undef MLDSA87_CRHBYTES
161159
#undef MLDSA87_PUBLICKEYBYTES
162160
#undef MLDSA87_RNDBYTES
163161
#undef MLDSA87_SECRETKEYBYTES
164162
#undef MLDSA87_SEEDBYTES
165-
#undef MLDSA87_TRBYTES
166163
#undef MLDSA_BYTES
167164
#undef MLDSA_BYTES_
168165
#undef MLDSA_CRHBYTES
@@ -172,7 +169,6 @@
172169
#undef MLDSA_SECRETKEYBYTES
173170
#undef MLDSA_SECRETKEYBYTES_
174171
#undef MLDSA_SEEDBYTES
175-
#undef MLDSA_TRBYTES
176172
#undef MLD_API_CONCAT
177173
#undef MLD_API_CONCAT_
178174
#undef MLD_API_CONCAT_UNDERSCORE

test/src/test_mldsa.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#define MLEN 59
2828
#define CTXLEN 1
2929

30+
#define MLDSA_TRBYTES 64
31+
3032
#define CHECK(x) \
3133
do \
3234
{ \

0 commit comments

Comments
 (0)