From 7a8ec42c25f0bc307f03510ca28f6d72ed1651f9 Mon Sep 17 00:00:00 2001 From: Basil Hess Date: Fri, 31 Jan 2025 11:21:42 +0100 Subject: [PATCH] Pull v1.0.0-alpha.2 [full tests] [extended tests] Signed-off-by: Basil Hess --- docs/algorithms/kem/ml_kem.md | 4 ++-- docs/algorithms/kem/ml_kem.yml | 2 +- scripts/copy_from_upstream/copy_from_upstream.yml | 4 ++-- src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/common.h | 2 -- src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/common.h | 2 -- src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/common.h | 2 -- src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/common.h | 2 -- src/kem/ml_kem/mlkem-native_ml-kem-512_ref/common.h | 2 -- src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/common.h | 2 -- src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/common.h | 2 -- src/kem/ml_kem/mlkem-native_ml-kem-768_ref/common.h | 2 -- src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/common.h | 2 -- 12 files changed, 5 insertions(+), 23 deletions(-) diff --git a/docs/algorithms/kem/ml_kem.md b/docs/algorithms/kem/ml_kem.md index fe69e7ef0..88c827767 100644 --- a/docs/algorithms/kem/ml_kem.md +++ b/docs/algorithms/kem/ml_kem.md @@ -7,9 +7,9 @@ - **Authors' website**: https://pq-crystals.org/kyber/ and https://csrc.nist.gov/pubs/fips/203 - **Specification version**: ML-KEM. - **Primary Source**: - - **Source**: https://github.com/pq-code-package/mlkem-native/commit/d830bc22eb1613bbe38028cfefc33f1a52a40b2f with copy_from_upstream patches + - **Source**: https://github.com/pq-code-package/mlkem-native/commit/3f1b9fc214a3c3f18e88b144f68814ea7ae88625 with copy_from_upstream patches - **Implementation license (SPDX-Identifier)**: CC0-1.0 or Apache-2.0 -- **Optimized Implementation sources**: https://github.com/pq-code-package/mlkem-native/commit/d830bc22eb1613bbe38028cfefc33f1a52a40b2f with copy_from_upstream patches +- **Optimized Implementation sources**: https://github.com/pq-code-package/mlkem-native/commit/3f1b9fc214a3c3f18e88b144f68814ea7ae88625 with copy_from_upstream patches - **cupqc-cuda**: - **Source**: https://github.com/praveksharma/cupqc-mlkem/commit/b026f4e5475cd9c20c2082c7d9bad80e5b0ba89e - **Implementation license (SPDX-Identifier)**: Apache-2.0 diff --git a/docs/algorithms/kem/ml_kem.yml b/docs/algorithms/kem/ml_kem.yml index 4042f6f60..e5d0dc82f 100644 --- a/docs/algorithms/kem/ml_kem.yml +++ b/docs/algorithms/kem/ml_kem.yml @@ -17,7 +17,7 @@ website: https://pq-crystals.org/kyber/ and https://csrc.nist.gov/pubs/fips/203 nist-round: FIPS203 spec-version: ML-KEM primary-upstream: - source: https://github.com/pq-code-package/mlkem-native/commit/d830bc22eb1613bbe38028cfefc33f1a52a40b2f + source: https://github.com/pq-code-package/mlkem-native/commit/3f1b9fc214a3c3f18e88b144f68814ea7ae88625 with copy_from_upstream patches spdx-license-identifier: CC0-1.0 or Apache-2.0 optimized-upstreams: diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml index 54fc50307..884471cfb 100644 --- a/scripts/copy_from_upstream/copy_from_upstream.yml +++ b/scripts/copy_from_upstream/copy_from_upstream.yml @@ -33,8 +33,8 @@ upstreams: - name: mlkem-native git_url: https://github.com/pq-code-package/mlkem-native.git - git_branch: main - git_commit: d830bc22eb1613bbe38028cfefc33f1a52a40b2f + git_branch: v1.0.0-alpha.2 + git_commit: 3f1b9fc214a3c3f18e88b144f68814ea7ae88625 kem_meta_path: 'integration/liboqs/{pretty_name_full}_META.yml' kem_scheme_path: '.' patches: [mlkem-native-ml_kem.patch] diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/common.h b/src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/common.h index e87debdd0..45ebaa5c4 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/common.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/common.h @@ -68,12 +68,10 @@ * namespace wrapper for ASM symbols. */ #if !defined(__APPLE__) #define MLKEM_ASM_NAMESPACE(sym) MLKEM_NAMESPACE(sym) -#define MLKEM_ASM_NAMESPACE_K(sym) MLKEM_NAMESPACE_K(sym) #else #define PREFIX_UNDERSCORE_(sym) _##sym #define PREFIX_UNDERSCORE(sym) PREFIX_UNDERSCORE_(sym) #define MLKEM_ASM_NAMESPACE(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE(sym)) -#define MLKEM_ASM_NAMESPACE_K(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE_K(sym)) #endif /* We aim to simplify the user's life by supporting builds where diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/common.h b/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/common.h index e87debdd0..45ebaa5c4 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/common.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/common.h @@ -68,12 +68,10 @@ * namespace wrapper for ASM symbols. */ #if !defined(__APPLE__) #define MLKEM_ASM_NAMESPACE(sym) MLKEM_NAMESPACE(sym) -#define MLKEM_ASM_NAMESPACE_K(sym) MLKEM_NAMESPACE_K(sym) #else #define PREFIX_UNDERSCORE_(sym) _##sym #define PREFIX_UNDERSCORE(sym) PREFIX_UNDERSCORE_(sym) #define MLKEM_ASM_NAMESPACE(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE(sym)) -#define MLKEM_ASM_NAMESPACE_K(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE_K(sym)) #endif /* We aim to simplify the user's life by supporting builds where diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/common.h b/src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/common.h index e87debdd0..45ebaa5c4 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/common.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/common.h @@ -68,12 +68,10 @@ * namespace wrapper for ASM symbols. */ #if !defined(__APPLE__) #define MLKEM_ASM_NAMESPACE(sym) MLKEM_NAMESPACE(sym) -#define MLKEM_ASM_NAMESPACE_K(sym) MLKEM_NAMESPACE_K(sym) #else #define PREFIX_UNDERSCORE_(sym) _##sym #define PREFIX_UNDERSCORE(sym) PREFIX_UNDERSCORE_(sym) #define MLKEM_ASM_NAMESPACE(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE(sym)) -#define MLKEM_ASM_NAMESPACE_K(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE_K(sym)) #endif /* We aim to simplify the user's life by supporting builds where diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/common.h b/src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/common.h index e87debdd0..45ebaa5c4 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/common.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/common.h @@ -68,12 +68,10 @@ * namespace wrapper for ASM symbols. */ #if !defined(__APPLE__) #define MLKEM_ASM_NAMESPACE(sym) MLKEM_NAMESPACE(sym) -#define MLKEM_ASM_NAMESPACE_K(sym) MLKEM_NAMESPACE_K(sym) #else #define PREFIX_UNDERSCORE_(sym) _##sym #define PREFIX_UNDERSCORE(sym) PREFIX_UNDERSCORE_(sym) #define MLKEM_ASM_NAMESPACE(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE(sym)) -#define MLKEM_ASM_NAMESPACE_K(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE_K(sym)) #endif /* We aim to simplify the user's life by supporting builds where diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/common.h b/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/common.h index e87debdd0..45ebaa5c4 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/common.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/common.h @@ -68,12 +68,10 @@ * namespace wrapper for ASM symbols. */ #if !defined(__APPLE__) #define MLKEM_ASM_NAMESPACE(sym) MLKEM_NAMESPACE(sym) -#define MLKEM_ASM_NAMESPACE_K(sym) MLKEM_NAMESPACE_K(sym) #else #define PREFIX_UNDERSCORE_(sym) _##sym #define PREFIX_UNDERSCORE(sym) PREFIX_UNDERSCORE_(sym) #define MLKEM_ASM_NAMESPACE(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE(sym)) -#define MLKEM_ASM_NAMESPACE_K(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE_K(sym)) #endif /* We aim to simplify the user's life by supporting builds where diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/common.h b/src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/common.h index e87debdd0..45ebaa5c4 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/common.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/common.h @@ -68,12 +68,10 @@ * namespace wrapper for ASM symbols. */ #if !defined(__APPLE__) #define MLKEM_ASM_NAMESPACE(sym) MLKEM_NAMESPACE(sym) -#define MLKEM_ASM_NAMESPACE_K(sym) MLKEM_NAMESPACE_K(sym) #else #define PREFIX_UNDERSCORE_(sym) _##sym #define PREFIX_UNDERSCORE(sym) PREFIX_UNDERSCORE_(sym) #define MLKEM_ASM_NAMESPACE(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE(sym)) -#define MLKEM_ASM_NAMESPACE_K(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE_K(sym)) #endif /* We aim to simplify the user's life by supporting builds where diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/common.h b/src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/common.h index e87debdd0..45ebaa5c4 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/common.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/common.h @@ -68,12 +68,10 @@ * namespace wrapper for ASM symbols. */ #if !defined(__APPLE__) #define MLKEM_ASM_NAMESPACE(sym) MLKEM_NAMESPACE(sym) -#define MLKEM_ASM_NAMESPACE_K(sym) MLKEM_NAMESPACE_K(sym) #else #define PREFIX_UNDERSCORE_(sym) _##sym #define PREFIX_UNDERSCORE(sym) PREFIX_UNDERSCORE_(sym) #define MLKEM_ASM_NAMESPACE(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE(sym)) -#define MLKEM_ASM_NAMESPACE_K(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE_K(sym)) #endif /* We aim to simplify the user's life by supporting builds where diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/common.h b/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/common.h index e87debdd0..45ebaa5c4 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/common.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/common.h @@ -68,12 +68,10 @@ * namespace wrapper for ASM symbols. */ #if !defined(__APPLE__) #define MLKEM_ASM_NAMESPACE(sym) MLKEM_NAMESPACE(sym) -#define MLKEM_ASM_NAMESPACE_K(sym) MLKEM_NAMESPACE_K(sym) #else #define PREFIX_UNDERSCORE_(sym) _##sym #define PREFIX_UNDERSCORE(sym) PREFIX_UNDERSCORE_(sym) #define MLKEM_ASM_NAMESPACE(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE(sym)) -#define MLKEM_ASM_NAMESPACE_K(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE_K(sym)) #endif /* We aim to simplify the user's life by supporting builds where diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/common.h b/src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/common.h index e87debdd0..45ebaa5c4 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/common.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/common.h @@ -68,12 +68,10 @@ * namespace wrapper for ASM symbols. */ #if !defined(__APPLE__) #define MLKEM_ASM_NAMESPACE(sym) MLKEM_NAMESPACE(sym) -#define MLKEM_ASM_NAMESPACE_K(sym) MLKEM_NAMESPACE_K(sym) #else #define PREFIX_UNDERSCORE_(sym) _##sym #define PREFIX_UNDERSCORE(sym) PREFIX_UNDERSCORE_(sym) #define MLKEM_ASM_NAMESPACE(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE(sym)) -#define MLKEM_ASM_NAMESPACE_K(sym) PREFIX_UNDERSCORE(MLKEM_NAMESPACE_K(sym)) #endif /* We aim to simplify the user's life by supporting builds where