Skip to content

Commit a990502

Browse files
authored
Merge pull request #1259 from pq-code-package/autogen_configs
2 parents 071fa87 + 1665af8 commit a990502

27 files changed

+6105
-98
lines changed

.github/workflows/integration-opentitan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
with:
5555
# TODO: switch to upstream once merged
5656
expo-repository: https://github.com/mkannwischer/expo
57-
expo-commit: 8c1fdb65ca6ff026c446cdefb106d08fd43ba7e9
57+
expo-commit: 8e6cfe2d1cc918fa3ae6cd076e806909bb1c09e0
5858

5959
- name: Patch mlkem-native dependency
6060
run: |

BIBLIOGRAPHY.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ source code and documentation.
2727
* URL: https://csrc.nist.gov/projects/cryptographic-module-validation-program/fips-140-3-ig-announcements
2828
* Referenced from:
2929
- [examples/basic_deterministic/mlkem_native/custom_no_randomized_config.h](examples/basic_deterministic/mlkem_native/custom_no_randomized_config.h)
30+
- [examples/custom_backend/mlkem_native/custom_config.h](examples/custom_backend/mlkem_native/custom_config.h)
31+
- [examples/monolithic_build/config_1024.h](examples/monolithic_build/config_1024.h)
32+
- [examples/monolithic_build/config_512.h](examples/monolithic_build/config_512.h)
33+
- [examples/monolithic_build/config_768.h](examples/monolithic_build/config_768.h)
34+
- [examples/monolithic_build_multilevel/multilevel_config.h](examples/monolithic_build_multilevel/multilevel_config.h)
35+
- [examples/monolithic_build_multilevel_native/multilevel_config.h](examples/monolithic_build_multilevel_native/multilevel_config.h)
36+
- [examples/monolithic_build_native/config_1024.h](examples/monolithic_build_native/config_1024.h)
37+
- [examples/monolithic_build_native/config_512.h](examples/monolithic_build_native/config_512.h)
38+
- [examples/monolithic_build_native/config_768.h](examples/monolithic_build_native/config_768.h)
3039
- [integration/liboqs/config_aarch64.h](integration/liboqs/config_aarch64.h)
3140
- [integration/liboqs/config_c.h](integration/liboqs/config_c.h)
3241
- [integration/liboqs/config_x86_64.h](integration/liboqs/config_x86_64.h)

examples/basic_deterministic/mlkem_native/custom_no_randomized_config.h

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,21 @@
1212
* https://csrc.nist.gov/projects/cryptographic-module-validation-program/fips-140-3-ig-announcements
1313
*/
1414

15+
/*
16+
* WARNING: This file is auto-generated from scripts/autogen
17+
* in the mlkem-native repository.
18+
* Do not modify it directly.
19+
*/
20+
21+
/*
22+
* Test configuration: Config without randomized API
23+
*
24+
* This configuration differs from the default mlkem/src/config.h in the
25+
* following places:
26+
* - MLK_CONFIG_NO_RANDOMIZED_API
27+
*/
28+
29+
1530
#ifndef MLK_CONFIG_H
1631
#define MLK_CONFIG_H
1732

@@ -35,7 +50,7 @@
3550
* Name: MLK_CONFIG_FILE
3651
*
3752
* Description: If defined, this is a header that will be included instead
38-
* of this default configuration file mlkem/src/config.h.
53+
* of the default configuration file mlkem/src/config.h.
3954
*
4055
* When you need to build mlkem-native in multiple configurations,
4156
* using varying MLK_CONFIG_FILE can be more convenient
@@ -47,6 +62,7 @@
4762
* on the command line.
4863
*
4964
*****************************************************************************/
65+
/* No need to set this -- we _are_ already in a custom config */
5066
/* #define MLK_CONFIG_FILE "config.h" */
5167

5268
/******************************************************************************
@@ -457,7 +473,7 @@
457473
* Description: If this option is set, mlkem-native will be built without the
458474
* randomized API functions (crypto_kem_keypair and
459475
* crypto_kem_enc).
460-
*. This allows users to build mlkem-native without providing a
476+
* This allows users to build mlkem-native without providing a
461477
* randombytes() implementation if they only need the
462478
* deterministic API
463479
* (crypto_kem_keypair_derand, crypto_kem_enc_derand,

0 commit comments

Comments
 (0)