Skip to content

sys: Prefix capability enum values with architecture #1770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkannwischer wants to merge 1 commit into
base: main
Choose a base branch
from
Open

sys: Prefix capability enum values with architecture #1770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev/fips202/aarch64/x1_v84a.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_keccak_f1600_x1_native(uint64_t *state)
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_SHA3))
if (!mlk_sys_check_capability(MLK_SYS_CAP_AARCH64_SHA3))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand Down
2 changes: 1 addition & 1 deletion dev/fips202/aarch64/x2_v84a.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_keccak_f1600_x4_native(uint64_t *state)
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_SHA3))
if (!mlk_sys_check_capability(MLK_SYS_CAP_AARCH64_SHA3))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand Down
2 changes: 1 addition & 1 deletion dev/fips202/aarch64/x4_v8a_v84a_scalar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_keccak_f1600_x4_native(uint64_t *state)
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_SHA3))
if (!mlk_sys_check_capability(MLK_SYS_CAP_AARCH64_SHA3))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand Down
2 changes: 1 addition & 1 deletion dev/fips202/x86_64/keccak_f1600_x4_avx2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_keccak_f1600_x4_native(uint64_t *state)
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand Down
40 changes: 20 additions & 20 deletions dev/x86_64/meta.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

static MLK_INLINE void mlk_poly_permute_bitrev_to_custom(int16_t data[MLKEM_N])
{
if (mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
mlk_nttunpack_avx2_asm(data);
}
Expand All @@ -48,7 +48,7 @@ static MLK_INLINE int mlk_rej_uniform_native(int16_t *r, unsigned len,
const uint8_t *buf,
unsigned buflen)
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2) || len != MLKEM_N ||
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2) || len != MLKEM_N ||
buflen % 12 != 0)
{
return MLK_NATIVE_FUNC_FALLBACK;
Expand All @@ -59,7 +59,7 @@ static MLK_INLINE int mlk_rej_uniform_native(int16_t *r, unsigned len,
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_ntt_native(int16_t data[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -71,7 +71,7 @@ static MLK_INLINE int mlk_ntt_native(int16_t data[MLKEM_N])
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_intt_native(int16_t data[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -83,7 +83,7 @@ static MLK_INLINE int mlk_intt_native(int16_t data[MLKEM_N])
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_reduce_native(int16_t data[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -95,7 +95,7 @@ static MLK_INLINE int mlk_poly_reduce_native(int16_t data[MLKEM_N])
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_tomont_native(int16_t data[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -108,7 +108,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_mulcache_compute_native(int16_t x[MLKEM_N / 2],
const int16_t y[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -123,7 +123,7 @@ static MLK_INLINE int mlk_polyvec_basemul_acc_montgomery_cached_k2_native(
int16_t r[MLKEM_N], const int16_t a[2 * MLKEM_N],
const int16_t b[2 * MLKEM_N], const int16_t b_cache[2 * (MLKEM_N / 2)])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -139,7 +139,7 @@ static MLK_INLINE int mlk_polyvec_basemul_acc_montgomery_cached_k3_native(
int16_t r[MLKEM_N], const int16_t a[3 * MLKEM_N],
const int16_t b[3 * MLKEM_N], const int16_t b_cache[3 * (MLKEM_N / 2)])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -155,7 +155,7 @@ static MLK_INLINE int mlk_polyvec_basemul_acc_montgomery_cached_k4_native(
int16_t r[MLKEM_N], const int16_t a[4 * MLKEM_N],
const int16_t b[4 * MLKEM_N], const int16_t b_cache[4 * (MLKEM_N / 2)])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -169,7 +169,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_tobytes_native(uint8_t r[MLKEM_POLYBYTES],
const int16_t a[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -182,7 +182,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_frombytes_native(
int16_t r[MLKEM_N], const uint8_t a[MLKEM_POLYBYTES])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -196,7 +196,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_compress_d4_native(
uint8_t r[MLKEM_POLYCOMPRESSEDBYTES_D4], const int16_t a[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -209,7 +209,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_compress_d10_native(
uint8_t r[MLKEM_POLYCOMPRESSEDBYTES_D10], const int16_t a[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -222,7 +222,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_decompress_d4_native(
int16_t r[MLKEM_N], const uint8_t a[MLKEM_POLYCOMPRESSEDBYTES_D4])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -235,7 +235,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_decompress_d10_native(
int16_t r[MLKEM_N], const uint8_t a[MLKEM_POLYCOMPRESSEDBYTES_D10])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -250,7 +250,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_compress_d5_native(
uint8_t r[MLKEM_POLYCOMPRESSEDBYTES_D5], const int16_t a[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -263,7 +263,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_compress_d11_native(
uint8_t r[MLKEM_POLYCOMPRESSEDBYTES_D11], const int16_t a[MLKEM_N])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -276,7 +276,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_decompress_d5_native(
int16_t r[MLKEM_N], const uint8_t a[MLKEM_POLYCOMPRESSEDBYTES_D5])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand All @@ -289,7 +289,7 @@ MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_poly_decompress_d11_native(
int16_t r[MLKEM_N], const uint8_t a[MLKEM_POLYCOMPRESSEDBYTES_D11])
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand Down
14 changes: 14 additions & 0 deletions integration/aws-lc/post_import.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) The mlkem-native project authors
# SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT
diff --git a/crypto/fipsmodule/ml_kem/mlkem_native_config.h b/crypto/fipsmodule/ml_kem/mlkem_native_config.h
--- a/crypto/fipsmodule/ml_kem/mlkem_native_config.h
+++ b/crypto/fipsmodule/ml_kem/mlkem_native_config.h
@@ -36,7 +36,7 @@
static MLK_INLINE int mlk_sys_check_capability(mlk_sys_cap cap)
{
#if defined(MLK_SYS_X86_64)
- if (cap == MLK_SYS_CAP_AVX2)
+ if (cap == MLK_SYS_CAP_X86_64_AVX2)
{
return CRYPTO_is_AVX2_capable();
}
2 changes: 1 addition & 1 deletion mlkem/src/fips202/native/aarch64/x1_v84a.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_keccak_f1600_x1_native(uint64_t *state)
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_SHA3))
if (!mlk_sys_check_capability(MLK_SYS_CAP_AARCH64_SHA3))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand Down
2 changes: 1 addition & 1 deletion mlkem/src/fips202/native/aarch64/x2_v84a.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_keccak_f1600_x4_native(uint64_t *state)
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_SHA3))
if (!mlk_sys_check_capability(MLK_SYS_CAP_AARCH64_SHA3))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand Down
2 changes: 1 addition & 1 deletion mlkem/src/fips202/native/aarch64/x4_v8a_v84a_scalar.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_keccak_f1600_x4_native(uint64_t *state)
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_SHA3))
if (!mlk_sys_check_capability(MLK_SYS_CAP_AARCH64_SHA3))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand Down
2 changes: 1 addition & 1 deletion mlkem/src/fips202/native/x86_64/keccak_f1600_x4_avx2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
MLK_MUST_CHECK_RETURN_VALUE
static MLK_INLINE int mlk_keccak_f1600_x4_native(uint64_t *state)
{
if (!mlk_sys_check_capability(MLK_SYS_CAP_AVX2))
if (!mlk_sys_check_capability(MLK_SYS_CAP_X86_64_AVX2))
{
return MLK_NATIVE_FUNC_FALLBACK;
}
Expand Down
Loading
Loading