Skip to content

Commit 3a6d87c

Browse files
committed
Re-run autogen and fix typo in config derivation
Signed-off-by: Hanno Becker <beckphan@amazon.co.uk>
1 parent ae3c473 commit 3a6d87c

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

mlkem/mlkem_native.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@
158158
#undef MLK_API_CONCAT_UNDERSCORE
159159
#undef MLK_API_MUST_CHECK_RETURN_VALUE
160160
#undef MLK_API_NAMESPACE
161+
#undef MLK_API_QUALIFIER
161162
#undef MLK_H
162163
#undef crypto_kem_check_pk
163164
#undef crypto_kem_check_sk
@@ -175,6 +176,7 @@
175176
#undef MLK_CONCAT_
176177
#undef MLK_CONFIG_API_NAMESPACE_PREFIX
177178
#undef MLK_CONFIG_API_PARAMETER_SET
179+
#undef MLK_CONFIG_API_QUALIFIER
178180
#undef MLK_EMPTY_CU
179181
#undef MLK_EXTERNAL_API
180182
#undef MLK_FIPS202X4_HEADER_FILE

mlkem/mlkem_native.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
#undef MLK_API_CONCAT_UNDERSCORE
148148
#undef MLK_API_MUST_CHECK_RETURN_VALUE
149149
#undef MLK_API_NAMESPACE
150+
#undef MLK_API_QUALIFIER
150151
#undef MLK_H
151152
#undef crypto_kem_check_pk
152153
#undef crypto_kem_check_sk
@@ -164,6 +165,7 @@
164165
#undef MLK_CONCAT_
165166
#undef MLK_CONFIG_API_NAMESPACE_PREFIX
166167
#undef MLK_CONFIG_API_PARAMETER_SET
168+
#undef MLK_CONFIG_API_QUALIFIER
167169
#undef MLK_EMPTY_CU
168170
#undef MLK_EXTERNAL_API
169171
#undef MLK_FIPS202X4_HEADER_FILE

mlkem/mlkem_native.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,7 @@ MLK_API_QUALIFIER MLK_API_MUST_CHECK_RETURN_VALUE int MLK_API_NAMESPACE(
337337
#undef MLK_API_CONCAT_UNDERSCORE
338338
#undef MLK_API_NAMESPACE
339339
#undef MLK_API_MUST_CHECK_RETURN_VALUE
340+
#undef MLK_API_QUALIFIER
340341

341342
#endif /* MLK_CONFIG_API_NO_SUPERCOP */
342343
#endif /* !MLK_CONFIG_API_CONSTANTS_ONLY */

mlkem/src/common.h

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,17 +159,19 @@
159159
#if defined(MLK_CONFIG_API_PARAMETER_SET) || \
160160
defined(MLK_CONFIG_API_NAMESPACE_PREFIX) || \
161161
defined(MLK_CONFIG_API_NO_SUPERCOP) || \
162+
defined(MLK_CONFIG_API_QUALIFIER) || \
162163
defined(MLK_CONFIG_API_CONSTANTS_ONLY)
163164
#error Pre-existing MLK_CONFIG_API_XXX configuration is neither useful nor allowed during an mlkem-native build
164165
#endif /* MLK_CONFIG_API_PARAMETER_SET || MLK_CONFIG_API_NAMESPACE_PREFIX || \
165-
MLK_CONFIG_API_NO_SUPERCOP || MLK_CONFIG_API_CONSTANTS_ONLY */
166+
MLK_CONFIG_API_NO_SUPERCOP || MLK_CONFIG_API_QUALIFIER || \
167+
MLK_CONFIG_API_CONSTANTS_ONLY */
166168

167169
#define MLK_CONFIG_API_PARAMETER_SET MLK_CONFIG_PARAMETER_SET
168170
#define MLK_CONFIG_API_NAMESPACE_PREFIX \
169171
MLK_ADD_PARAM_SET(MLK_CONFIG_NAMESPACE_PREFIX)
170172

171-
#ifdef MLK_CONFIG_API_QUALIFIER
172-
#define MLK_CONFIG_API_QUALIFIER MLK_EXTERNAL_API
173+
#if defined(MLK_CONFIG_EXTERNAL_API_QUALIFIER)
174+
#define MLK_CONFIG_API_QUALIFIER MLK_CONFIG_EXTERNAL_API_QUALIFIER
173175
#endif
174176

175177
#endif /* !MLK_COMMON_H */

0 commit comments

Comments
 (0)