From 00fda16e1a26fe8a3e47833b6c754f14ce0e3a23 Mon Sep 17 00:00:00 2001 From: Basil Hess Date: Fri, 10 Jan 2025 18:37:13 +0100 Subject: [PATCH] Updates for windows [full tests] Signed-off-by: Basil Hess --- docs/algorithms/kem/ml_kem.md | 2 +- docs/algorithms/kem/ml_kem.yml | 2 +- scripts/copy_from_upstream/copy_from_upstream.yml | 2 +- src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/sys.h | 8 ++++---- src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/sys.h | 8 ++++---- src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/sys.h | 8 ++++---- src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/sys.h | 8 ++++---- src/kem/ml_kem/mlkem-native_ml-kem-512_ref/sys.h | 8 ++++---- src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/sys.h | 8 ++++---- src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/sys.h | 8 ++++---- src/kem/ml_kem/mlkem-native_ml-kem-768_ref/sys.h | 8 ++++---- src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/sys.h | 8 ++++---- 12 files changed, 39 insertions(+), 39 deletions(-) diff --git a/docs/algorithms/kem/ml_kem.md b/docs/algorithms/kem/ml_kem.md index f4e8059d8..21cf7a857 100644 --- a/docs/algorithms/kem/ml_kem.md +++ b/docs/algorithms/kem/ml_kem.md @@ -7,7 +7,7 @@ - **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/bhess/mlkem-native/commit/086b45d1ba2b5d820d4c4edb3875cbb9e023e080 + - **Source**: https://github.com/bhess/mlkem-native/commit/8decb465cf3f63009fd19c337be283b440f2bd89 - **Implementation license (SPDX-Identifier)**: CC0-1.0 or Apache-2.0 diff --git a/docs/algorithms/kem/ml_kem.yml b/docs/algorithms/kem/ml_kem.yml index 6e7bfad24..627a7008e 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/bhess/mlkem-native/commit/086b45d1ba2b5d820d4c4edb3875cbb9e023e080 + source: https://github.com/bhess/mlkem-native/commit/8decb465cf3f63009fd19c337be283b440f2bd89 spdx-license-identifier: CC0-1.0 or Apache-2.0 parameter-sets: - name: ML-KEM-512 diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml index 50de1d824..9a2162c66 100644 --- a/scripts/copy_from_upstream/copy_from_upstream.yml +++ b/scripts/copy_from_upstream/copy_from_upstream.yml @@ -34,7 +34,7 @@ upstreams: name: mlkem-native git_url: https://github.com/bhess/mlkem-native.git git_branch: updates-4 - git_commit: 086b45d1ba2b5d820d4c4edb3875cbb9e023e080 + git_commit: 8decb465cf3f63009fd19c337be283b440f2bd89 kem_meta_path: '{pretty_name_full}_META.yml' kem_scheme_path: '.' - diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/sys.h b/src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/sys.h index 01abb6032..2f9b96961 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/sys.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-1024_aarch64/sys.h @@ -63,12 +63,12 @@ /* Do not use inline for C90 builds*/ #if !defined(INLINE) #if !defined(inline) -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define INLINE inline -#define ALWAYS_INLINE __attribute__((always_inline)) -#elif defined(_MSC_VER) +#if defined(_MSC_VER) #define INLINE __inline #define ALWAYS_INLINE __forceinline +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define INLINE inline +#define ALWAYS_INLINE __attribute__((always_inline)) #else #define INLINE __attribute__((unused)) #define ALWAYS_INLINE diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/sys.h b/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/sys.h index 01abb6032..2f9b96961 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/sys.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-1024_ref/sys.h @@ -63,12 +63,12 @@ /* Do not use inline for C90 builds*/ #if !defined(INLINE) #if !defined(inline) -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define INLINE inline -#define ALWAYS_INLINE __attribute__((always_inline)) -#elif defined(_MSC_VER) +#if defined(_MSC_VER) #define INLINE __inline #define ALWAYS_INLINE __forceinline +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define INLINE inline +#define ALWAYS_INLINE __attribute__((always_inline)) #else #define INLINE __attribute__((unused)) #define ALWAYS_INLINE diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/sys.h b/src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/sys.h index 01abb6032..2f9b96961 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/sys.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-1024_x86_64/sys.h @@ -63,12 +63,12 @@ /* Do not use inline for C90 builds*/ #if !defined(INLINE) #if !defined(inline) -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define INLINE inline -#define ALWAYS_INLINE __attribute__((always_inline)) -#elif defined(_MSC_VER) +#if defined(_MSC_VER) #define INLINE __inline #define ALWAYS_INLINE __forceinline +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define INLINE inline +#define ALWAYS_INLINE __attribute__((always_inline)) #else #define INLINE __attribute__((unused)) #define ALWAYS_INLINE diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/sys.h b/src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/sys.h index 01abb6032..2f9b96961 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/sys.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-512_aarch64/sys.h @@ -63,12 +63,12 @@ /* Do not use inline for C90 builds*/ #if !defined(INLINE) #if !defined(inline) -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define INLINE inline -#define ALWAYS_INLINE __attribute__((always_inline)) -#elif defined(_MSC_VER) +#if defined(_MSC_VER) #define INLINE __inline #define ALWAYS_INLINE __forceinline +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define INLINE inline +#define ALWAYS_INLINE __attribute__((always_inline)) #else #define INLINE __attribute__((unused)) #define ALWAYS_INLINE diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/sys.h b/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/sys.h index 01abb6032..2f9b96961 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/sys.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-512_ref/sys.h @@ -63,12 +63,12 @@ /* Do not use inline for C90 builds*/ #if !defined(INLINE) #if !defined(inline) -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define INLINE inline -#define ALWAYS_INLINE __attribute__((always_inline)) -#elif defined(_MSC_VER) +#if defined(_MSC_VER) #define INLINE __inline #define ALWAYS_INLINE __forceinline +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define INLINE inline +#define ALWAYS_INLINE __attribute__((always_inline)) #else #define INLINE __attribute__((unused)) #define ALWAYS_INLINE diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/sys.h b/src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/sys.h index 01abb6032..2f9b96961 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/sys.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-512_x86_64/sys.h @@ -63,12 +63,12 @@ /* Do not use inline for C90 builds*/ #if !defined(INLINE) #if !defined(inline) -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define INLINE inline -#define ALWAYS_INLINE __attribute__((always_inline)) -#elif defined(_MSC_VER) +#if defined(_MSC_VER) #define INLINE __inline #define ALWAYS_INLINE __forceinline +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define INLINE inline +#define ALWAYS_INLINE __attribute__((always_inline)) #else #define INLINE __attribute__((unused)) #define ALWAYS_INLINE diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/sys.h b/src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/sys.h index 01abb6032..2f9b96961 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/sys.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-768_aarch64/sys.h @@ -63,12 +63,12 @@ /* Do not use inline for C90 builds*/ #if !defined(INLINE) #if !defined(inline) -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define INLINE inline -#define ALWAYS_INLINE __attribute__((always_inline)) -#elif defined(_MSC_VER) +#if defined(_MSC_VER) #define INLINE __inline #define ALWAYS_INLINE __forceinline +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define INLINE inline +#define ALWAYS_INLINE __attribute__((always_inline)) #else #define INLINE __attribute__((unused)) #define ALWAYS_INLINE diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/sys.h b/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/sys.h index 01abb6032..2f9b96961 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/sys.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-768_ref/sys.h @@ -63,12 +63,12 @@ /* Do not use inline for C90 builds*/ #if !defined(INLINE) #if !defined(inline) -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define INLINE inline -#define ALWAYS_INLINE __attribute__((always_inline)) -#elif defined(_MSC_VER) +#if defined(_MSC_VER) #define INLINE __inline #define ALWAYS_INLINE __forceinline +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define INLINE inline +#define ALWAYS_INLINE __attribute__((always_inline)) #else #define INLINE __attribute__((unused)) #define ALWAYS_INLINE diff --git a/src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/sys.h b/src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/sys.h index 01abb6032..2f9b96961 100644 --- a/src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/sys.h +++ b/src/kem/ml_kem/mlkem-native_ml-kem-768_x86_64/sys.h @@ -63,12 +63,12 @@ /* Do not use inline for C90 builds*/ #if !defined(INLINE) #if !defined(inline) -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define INLINE inline -#define ALWAYS_INLINE __attribute__((always_inline)) -#elif defined(_MSC_VER) +#if defined(_MSC_VER) #define INLINE __inline #define ALWAYS_INLINE __forceinline +#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define INLINE inline +#define ALWAYS_INLINE __attribute__((always_inline)) #else #define INLINE __attribute__((unused)) #define ALWAYS_INLINE