From c534647b2ec7521ee4210dd398faaad0018287d0 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Sat, 28 Jun 2025 12:20:39 +0000 Subject: Add CLMUL to machine dependent CPU capabilities for amd64. ok tb@ --- src/lib/libcrypto/arch/amd64/crypto_arch.h | 5 +++-- src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/lib/libcrypto') diff --git a/src/lib/libcrypto/arch/amd64/crypto_arch.h b/src/lib/libcrypto/arch/amd64/crypto_arch.h index 9eb99229d1..213a5d903e 100644 --- a/src/lib/libcrypto/arch/amd64/crypto_arch.h +++ b/src/lib/libcrypto/arch/amd64/crypto_arch.h @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto_arch.h,v 1.7 2025/06/27 17:10:45 jsing Exp $ */ +/* $OpenBSD: crypto_arch.h,v 1.8 2025/06/28 12:20:39 jsing Exp $ */ /* * Copyright (c) 2024 Joel Sing * @@ -28,7 +28,8 @@ extern uint64_t crypto_cpu_caps_amd64; #endif #define CRYPTO_CPU_CAPS_AMD64_AES (1ULL << 0) -#define CRYPTO_CPU_CAPS_AMD64_SHA (1ULL << 1) +#define CRYPTO_CPU_CAPS_AMD64_CLMUL (1ULL << 1) +#define CRYPTO_CPU_CAPS_AMD64_SHA (1ULL << 2) #ifndef OPENSSL_NO_ASM diff --git a/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c b/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c index 942454badd..b7323be5d0 100644 --- a/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c +++ b/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c @@ -1,4 +1,4 @@ -/* $OpenBSD: crypto_cpu_caps.c,v 1.5 2025/06/15 14:16:11 jsing Exp $ */ +/* $OpenBSD: crypto_cpu_caps.c,v 1.6 2025/06/28 12:20:39 jsing Exp $ */ /* * Copyright (c) 2024 Joel Sing * @@ -102,8 +102,10 @@ crypto_cpu_caps_init(void) caps |= CPUCAP_MASK_AESNI; crypto_cpu_caps_amd64 |= CRYPTO_CPU_CAPS_AMD64_AES; } - if ((ecx & IA32CAP_MASK1_PCLMUL) != 0) + if ((ecx & IA32CAP_MASK1_PCLMUL) != 0) { caps |= CPUCAP_MASK_PCLMUL; + crypto_cpu_caps_amd64 |= CRYPTO_CPU_CAPS_AMD64_CLMUL; + } if ((ecx & IA32CAP_MASK1_SSSE3) != 0) caps |= CPUCAP_MASK_SSSE3; -- cgit v1.2.3-55-g6feb