Skip to content

Commit f2fb27d

Browse files
mkannwischerhanno-becker
mkannwischer
authored and
hanno-becker
committed
params.h: Rename CRYPTO_XXX to MLDSA_CRYPTO_XXX
To avoid clashing with the symbols defined in mldsa_native.h, this commits aligns with mlkem-native, by using different symbol names (MLDSA_CRYPTO_XXX) Signed-off-by: Matthias J. Kannwischer <matthias@kannwischer.eu>
1 parent fe1c783 commit f2fb27d

File tree

17 files changed

+333
-324
lines changed

17 files changed

+333
-324
lines changed

‎BIBLIOGRAPHY.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ source code and documentation.
2929
- [examples/custom_backend/mldsa_native/mldsa_native_config.h](examples/custom_backend/mldsa_native/mldsa_native_config.h)
3030
- [examples/monolithic_build/mldsa_native/mldsa_native_config.h](examples/monolithic_build/mldsa_native/mldsa_native_config.h)
3131
- [examples/monolithic_build_multilevel/mldsa_native/mldsa_native_config.h](examples/monolithic_build_multilevel/mldsa_native/mldsa_native_config.h)
32+
- [examples/monolithic_build_multilevel_native/mldsa_native/mldsa_native_config.h](examples/monolithic_build_multilevel_native/mldsa_native/mldsa_native_config.h)
3233
- [examples/monolithic_build_native/mldsa_native/mldsa_native_config.h](examples/monolithic_build_native/mldsa_native/mldsa_native_config.h)
3334
- [examples/multilevel_build/mldsa_native/mldsa_native_config.h](examples/multilevel_build/mldsa_native/mldsa_native_config.h)
3435
- [examples/multilevel_build_native/mldsa_native/mldsa_native_config.h](examples/multilevel_build_native/mldsa_native/mldsa_native_config.h)
@@ -74,6 +75,7 @@ source code and documentation.
7475
- [examples/custom_backend/mldsa_native/mldsa_native_config.h](examples/custom_backend/mldsa_native/mldsa_native_config.h)
7576
- [examples/monolithic_build/mldsa_native/mldsa_native_config.h](examples/monolithic_build/mldsa_native/mldsa_native_config.h)
7677
- [examples/monolithic_build_multilevel/mldsa_native/mldsa_native_config.h](examples/monolithic_build_multilevel/mldsa_native/mldsa_native_config.h)
78+
- [examples/monolithic_build_multilevel_native/mldsa_native/mldsa_native_config.h](examples/monolithic_build_multilevel_native/mldsa_native/mldsa_native_config.h)
7779
- [examples/monolithic_build_native/mldsa_native/mldsa_native_config.h](examples/monolithic_build_native/mldsa_native/mldsa_native_config.h)
7880
- [examples/multilevel_build/mldsa_native/mldsa_native_config.h](examples/multilevel_build/mldsa_native/mldsa_native_config.h)
7981
- [examples/multilevel_build_native/mldsa_native/mldsa_native_config.h](examples/multilevel_build_native/mldsa_native/mldsa_native_config.h)

‎mldsa/mldsa_native.S‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,6 @@
199199
#undef MLD_COMMON_H
200200
#undef MLD_CONCAT
201201
#undef MLD_CONCAT_
202-
#undef MLD_CONFIG_API_NAMESPACE_PREFIX
203-
#undef MLD_CONFIG_API_PARAMETER_SET
204202
#undef MLD_EMPTY_CU
205203
#undef MLD_EXTERNAL_API
206204
#undef MLD_FIPS202X4_HEADER_FILE
@@ -224,6 +222,9 @@
224222
/* mldsa/src/params.h */
225223
#undef MLDSA_BETA
226224
#undef MLDSA_CRHBYTES
225+
#undef MLDSA_CRYPTO_BYTES
226+
#undef MLDSA_CRYPTO_PUBLICKEYBYTES
227+
#undef MLDSA_CRYPTO_SECRETKEYBYTES
227228
#undef MLDSA_CTILDEBYTES
228229
#undef MLDSA_D
229230
#undef MLDSA_ETA

‎mldsa/mldsa_native.c‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,6 @@
196196
#undef MLD_COMMON_H
197197
#undef MLD_CONCAT
198198
#undef MLD_CONCAT_
199-
#undef MLD_CONFIG_API_NAMESPACE_PREFIX
200-
#undef MLD_CONFIG_API_PARAMETER_SET
201199
#undef MLD_EMPTY_CU
202200
#undef MLD_EXTERNAL_API
203201
#undef MLD_FIPS202X4_HEADER_FILE
@@ -221,6 +219,9 @@
221219
/* mldsa/src/params.h */
222220
#undef MLDSA_BETA
223221
#undef MLDSA_CRHBYTES
222+
#undef MLDSA_CRYPTO_BYTES
223+
#undef MLDSA_CRYPTO_PUBLICKEYBYTES
224+
#undef MLDSA_CRYPTO_SECRETKEYBYTES
224225
#undef MLDSA_CTILDEBYTES
225226
#undef MLDSA_D
226227
#undef MLDSA_ETA

‎mldsa/src/common.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,4 @@
169169
#endif /* MLD_CONFIG_API_PARAMETER_SET || MLD_CONFIG_API_NAMESPACE_PREFIX || \
170170
MLD_CONFIG_API_NO_SUPERCOP || MLD_CONFIG_API_CONSTANTS_ONLY */
171171

172-
#define MLD_CONFIG_API_PARAMETER_SET MLD_CONFIG_PARAMETER_SET
173-
#define MLD_CONFIG_API_NAMESPACE_PREFIX \
174-
MLD_ADD_PARAM_SET(MLD_CONFIG_NAMESPACE_PREFIX)
175-
176172
#endif /* !MLD_COMMON_H */

‎mldsa/src/packing.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
/* End of parameter set namespacing */
1818

1919
MLD_INTERNAL_API
20-
void mld_pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES],
20+
void mld_pack_pk(uint8_t pk[MLDSA_CRYPTO_PUBLICKEYBYTES],
2121
const uint8_t rho[MLDSA_SEEDBYTES], const mld_polyveck *t1)
2222
{
2323
unsigned int i;
2424

2525
mld_memcpy(pk, rho, MLDSA_SEEDBYTES);
2626
for (i = 0; i < MLDSA_K; ++i)
2727
__loop__(
28-
assigns(i, memory_slice(pk, CRYPTO_PUBLICKEYBYTES))
28+
assigns(i, memory_slice(pk, MLDSA_CRYPTO_PUBLICKEYBYTES))
2929
invariant(i <= MLDSA_K)
3030
)
3131
{
@@ -36,7 +36,7 @@ void mld_pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES],
3636

3737
MLD_INTERNAL_API
3838
void mld_unpack_pk(uint8_t rho[MLDSA_SEEDBYTES], mld_polyveck *t1,
39-
const uint8_t pk[CRYPTO_PUBLICKEYBYTES])
39+
const uint8_t pk[MLDSA_CRYPTO_PUBLICKEYBYTES])
4040
{
4141
unsigned int i;
4242

@@ -50,7 +50,7 @@ void mld_unpack_pk(uint8_t rho[MLDSA_SEEDBYTES], mld_polyveck *t1,
5050
}
5151

5252
MLD_INTERNAL_API
53-
void mld_pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES],
53+
void mld_pack_sk(uint8_t sk[MLDSA_CRYPTO_SECRETKEYBYTES],
5454
const uint8_t rho[MLDSA_SEEDBYTES],
5555
const uint8_t tr[MLDSA_TRBYTES],
5656
const uint8_t key[MLDSA_SEEDBYTES], const mld_polyveck *t0,
@@ -78,7 +78,7 @@ MLD_INTERNAL_API
7878
void mld_unpack_sk(uint8_t rho[MLDSA_SEEDBYTES], uint8_t tr[MLDSA_TRBYTES],
7979
uint8_t key[MLDSA_SEEDBYTES], mld_polyveck *t0,
8080
mld_polyvecl *s1, mld_polyveck *s2,
81-
const uint8_t sk[CRYPTO_SECRETKEYBYTES])
81+
const uint8_t sk[MLDSA_CRYPTO_SECRETKEYBYTES])
8282
{
8383
mld_memcpy(rho, sk, MLDSA_SEEDBYTES);
8484
sk += MLDSA_SEEDBYTES;
@@ -99,9 +99,9 @@ void mld_unpack_sk(uint8_t rho[MLDSA_SEEDBYTES], uint8_t tr[MLDSA_TRBYTES],
9999
}
100100

101101
MLD_INTERNAL_API
102-
void mld_pack_sig(uint8_t sig[CRYPTO_BYTES], const uint8_t c[MLDSA_CTILDEBYTES],
103-
const mld_polyvecl *z, const mld_polyveck *h,
104-
const unsigned int number_of_hints)
102+
void mld_pack_sig(uint8_t sig[MLDSA_CRYPTO_BYTES],
103+
const uint8_t c[MLDSA_CTILDEBYTES], const mld_polyvecl *z,
104+
const mld_polyveck *h, const unsigned int number_of_hints)
105105
{
106106
unsigned int i, j, k;
107107

@@ -261,7 +261,7 @@ __contract__(
261261

262262
MLD_INTERNAL_API
263263
int mld_unpack_sig(uint8_t c[MLDSA_CTILDEBYTES], mld_polyvecl *z,
264-
mld_polyveck *h, const uint8_t sig[CRYPTO_BYTES])
264+
mld_polyveck *h, const uint8_t sig[MLDSA_CRYPTO_BYTES])
265265
{
266266
mld_memcpy(c, sig, MLDSA_CTILDEBYTES);
267267
sig += MLDSA_CTILDEBYTES;

‎mldsa/src/packing.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@
1919
* - const mld_polyveck *t1: pointer to vector t1
2020
**************************************************/
2121
MLD_INTERNAL_API
22-
void mld_pack_pk(uint8_t pk[CRYPTO_PUBLICKEYBYTES],
22+
void mld_pack_pk(uint8_t pk[MLDSA_CRYPTO_PUBLICKEYBYTES],
2323
const uint8_t rho[MLDSA_SEEDBYTES], const mld_polyveck *t1)
2424
__contract__(
25-
requires(memory_no_alias(pk, CRYPTO_PUBLICKEYBYTES))
25+
requires(memory_no_alias(pk, MLDSA_CRYPTO_PUBLICKEYBYTES))
2626
requires(memory_no_alias(rho, MLDSA_SEEDBYTES))
2727
requires(memory_no_alias(t1, sizeof(mld_polyveck)))
2828
requires(forall(k0, 0, MLDSA_K,
2929
array_bound(t1->vec[k0].coeffs, 0, MLDSA_N, 0, 1 << 10)))
30-
assigns(memory_slice(pk, CRYPTO_PUBLICKEYBYTES))
30+
assigns(memory_slice(pk, MLDSA_CRYPTO_PUBLICKEYBYTES))
3131
);
3232

3333

@@ -46,13 +46,13 @@ __contract__(
4646
* - const mld_polyveck *s2: pointer to vector s2
4747
**************************************************/
4848
MLD_INTERNAL_API
49-
void mld_pack_sk(uint8_t sk[CRYPTO_SECRETKEYBYTES],
49+
void mld_pack_sk(uint8_t sk[MLDSA_CRYPTO_SECRETKEYBYTES],
5050
const uint8_t rho[MLDSA_SEEDBYTES],
5151
const uint8_t tr[MLDSA_TRBYTES],
5252
const uint8_t key[MLDSA_SEEDBYTES], const mld_polyveck *t0,
5353
const mld_polyvecl *s1, const mld_polyveck *s2)
5454
__contract__(
55-
requires(memory_no_alias(sk, CRYPTO_SECRETKEYBYTES))
55+
requires(memory_no_alias(sk, MLDSA_CRYPTO_SECRETKEYBYTES))
5656
requires(memory_no_alias(rho, MLDSA_SEEDBYTES))
5757
requires(memory_no_alias(tr, MLDSA_TRBYTES))
5858
requires(memory_no_alias(key, MLDSA_SEEDBYTES))
@@ -65,7 +65,7 @@ __contract__(
6565
array_abs_bound(s1->vec[k1].coeffs, 0, MLDSA_N, MLDSA_ETA + 1)))
6666
requires(forall(k2, 0, MLDSA_K,
6767
array_abs_bound(s2->vec[k2].coeffs, 0, MLDSA_N, MLDSA_ETA + 1)))
68-
assigns(memory_slice(sk, CRYPTO_SECRETKEYBYTES))
68+
assigns(memory_slice(sk, MLDSA_CRYPTO_SECRETKEYBYTES))
6969
);
7070

7171

@@ -88,11 +88,11 @@ __contract__(
8888
* proof of type safety.
8989
**************************************************/
9090
MLD_INTERNAL_API
91-
void mld_pack_sig(uint8_t sig[CRYPTO_BYTES], const uint8_t c[MLDSA_CTILDEBYTES],
92-
const mld_polyvecl *z, const mld_polyveck *h,
93-
const unsigned int number_of_hints)
91+
void mld_pack_sig(uint8_t sig[MLDSA_CRYPTO_BYTES],
92+
const uint8_t c[MLDSA_CTILDEBYTES], const mld_polyvecl *z,
93+
const mld_polyveck *h, const unsigned int number_of_hints)
9494
__contract__(
95-
requires(memory_no_alias(sig, CRYPTO_BYTES))
95+
requires(memory_no_alias(sig, MLDSA_CRYPTO_BYTES))
9696
requires(memory_no_alias(c, MLDSA_CTILDEBYTES))
9797
requires(memory_no_alias(z, sizeof(mld_polyvecl)))
9898
requires(memory_no_alias(h, sizeof(mld_polyveck)))
@@ -101,7 +101,7 @@ __contract__(
101101
requires(forall(k1, 0, MLDSA_K,
102102
array_bound(h->vec[k1].coeffs, 0, MLDSA_N, 0, 2)))
103103
requires(number_of_hints <= MLDSA_OMEGA)
104-
assigns(memory_slice(sig, CRYPTO_BYTES))
104+
assigns(memory_slice(sig, MLDSA_CRYPTO_BYTES))
105105
);
106106

107107
#define mld_unpack_pk MLD_NAMESPACE_KL(unpack_pk)
@@ -116,9 +116,9 @@ __contract__(
116116
**************************************************/
117117
MLD_INTERNAL_API
118118
void mld_unpack_pk(uint8_t rho[MLDSA_SEEDBYTES], mld_polyveck *t1,
119-
const uint8_t pk[CRYPTO_PUBLICKEYBYTES])
119+
const uint8_t pk[MLDSA_CRYPTO_PUBLICKEYBYTES])
120120
__contract__(
121-
requires(memory_no_alias(pk, CRYPTO_PUBLICKEYBYTES))
121+
requires(memory_no_alias(pk, MLDSA_CRYPTO_PUBLICKEYBYTES))
122122
requires(memory_no_alias(rho, MLDSA_SEEDBYTES))
123123
requires(memory_no_alias(t1, sizeof(mld_polyveck)))
124124
assigns(memory_slice(rho, MLDSA_SEEDBYTES))
@@ -146,15 +146,15 @@ MLD_INTERNAL_API
146146
void mld_unpack_sk(uint8_t rho[MLDSA_SEEDBYTES], uint8_t tr[MLDSA_TRBYTES],
147147
uint8_t key[MLDSA_SEEDBYTES], mld_polyveck *t0,
148148
mld_polyvecl *s1, mld_polyveck *s2,
149-
const uint8_t sk[CRYPTO_SECRETKEYBYTES])
149+
const uint8_t sk[MLDSA_CRYPTO_SECRETKEYBYTES])
150150
__contract__(
151151
requires(memory_no_alias(rho, MLDSA_SEEDBYTES))
152152
requires(memory_no_alias(tr, MLDSA_TRBYTES))
153153
requires(memory_no_alias(key, MLDSA_SEEDBYTES))
154154
requires(memory_no_alias(t0, sizeof(mld_polyveck)))
155155
requires(memory_no_alias(s1, sizeof(mld_polyvecl)))
156156
requires(memory_no_alias(s2, sizeof(mld_polyveck)))
157-
requires(memory_no_alias(sk, CRYPTO_SECRETKEYBYTES))
157+
requires(memory_no_alias(sk, MLDSA_CRYPTO_SECRETKEYBYTES))
158158
assigns(memory_slice(rho, MLDSA_SEEDBYTES))
159159
assigns(memory_slice(tr, MLDSA_TRBYTES))
160160
assigns(memory_slice(key, MLDSA_SEEDBYTES))
@@ -185,9 +185,9 @@ __contract__(
185185
**************************************************/
186186
MLD_INTERNAL_API
187187
int mld_unpack_sig(uint8_t c[MLDSA_CTILDEBYTES], mld_polyvecl *z,
188-
mld_polyveck *h, const uint8_t sig[CRYPTO_BYTES])
188+
mld_polyveck *h, const uint8_t sig[MLDSA_CRYPTO_BYTES])
189189
__contract__(
190-
requires(memory_no_alias(sig, CRYPTO_BYTES))
190+
requires(memory_no_alias(sig, MLDSA_CRYPTO_BYTES))
191191
requires(memory_no_alias(c, MLDSA_CTILDEBYTES))
192192
requires(memory_no_alias(z, sizeof(mld_polyvecl)))
193193
requires(memory_no_alias(h, sizeof(mld_polyveck)))

‎mldsa/src/params.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@
6767
#define MLDSA_POLYT0_PACKEDBYTES 416
6868
#define MLDSA_POLYVECH_PACKEDBYTES (MLDSA_OMEGA + MLDSA_K)
6969

70-
#define CRYPTO_PUBLICKEYBYTES \
70+
#define MLDSA_CRYPTO_PUBLICKEYBYTES \
7171
(MLDSA_SEEDBYTES + MLDSA_K * MLDSA_POLYT1_PACKEDBYTES)
72-
#define CRYPTO_SECRETKEYBYTES \
72+
#define MLDSA_CRYPTO_SECRETKEYBYTES \
7373
(2 * MLDSA_SEEDBYTES + MLDSA_TRBYTES + MLDSA_L * MLDSA_POLYETA_PACKEDBYTES + \
7474
MLDSA_K * MLDSA_POLYETA_PACKEDBYTES + MLDSA_K * MLDSA_POLYT0_PACKEDBYTES)
75-
#define CRYPTO_BYTES \
75+
#define MLDSA_CRYPTO_BYTES \
7676
(MLDSA_CTILDEBYTES + MLDSA_L * MLDSA_POLYZ_PACKEDBYTES + \
7777
MLDSA_POLYVECH_PACKEDBYTES)
7878

0 commit comments

Comments
 (0)