diff options
author | jsing <> | 2025-07-22 09:18:02 +0000 |
---|---|---|
committer | jsing <> | 2025-07-22 09:18:02 +0000 |
commit | ef16ba98ee6bf1fad529d5b66f4dd0d862d1255c (patch) | |
tree | 9825fb894a8de1f7e73e9b6aa7b5af0a792839e8 /src | |
parent | c128b1d7f07c34584cba1744237fac46230292d7 (diff) | |
download | openbsd-ef16ba98ee6bf1fad529d5b66f4dd0d862d1255c.tar.gz openbsd-ef16ba98ee6bf1fad529d5b66f4dd0d862d1255c.tar.bz2 openbsd-ef16ba98ee6bf1fad529d5b66f4dd0d862d1255c.zip |
Remove crypto_cpu_caps_ia32()
There are no more consumers of crypto_cpu_caps_ia32(), so remove it.
ok bcook@ joshua@ tb@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/arch/amd64/crypto_arch.h | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/i386/crypto_arch.h | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/arch/i386/crypto_cpu_caps.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/crypto_internal.h | 4 | ||||
-rw-r--r-- | src/lib/libcrypto/crypto_legacy.c | 10 |
6 files changed, 6 insertions, 30 deletions
diff --git a/src/lib/libcrypto/arch/amd64/crypto_arch.h b/src/lib/libcrypto/arch/amd64/crypto_arch.h index e8faf0bca1..e869fbba35 100644 --- a/src/lib/libcrypto/arch/amd64/crypto_arch.h +++ b/src/lib/libcrypto/arch/amd64/crypto_arch.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_arch.h,v 1.12 2025/07/22 09:13:49 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_arch.h,v 1.13 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -21,7 +21,6 @@ | |||
21 | #define HEADER_CRYPTO_ARCH_H | 21 | #define HEADER_CRYPTO_ARCH_H |
22 | 22 | ||
23 | #define HAVE_CRYPTO_CPU_CAPS_INIT | 23 | #define HAVE_CRYPTO_CPU_CAPS_INIT |
24 | #define HAVE_CRYPTO_CPU_CAPS_IA32 | ||
25 | 24 | ||
26 | #ifndef __ASSEMBLER__ | 25 | #ifndef __ASSEMBLER__ |
27 | extern uint64_t crypto_cpu_caps_amd64; | 26 | extern uint64_t crypto_cpu_caps_amd64; |
diff --git a/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c b/src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c index b7323be5d0..0bc440d34f 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 @@ | |||
1 | /* $OpenBSD: crypto_cpu_caps.c,v 1.6 2025/06/28 12:20:39 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_cpu_caps.c,v 1.7 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -130,9 +130,3 @@ crypto_cpu_caps_init(void) | |||
130 | 130 | ||
131 | OPENSSL_ia32cap_P = caps; | 131 | OPENSSL_ia32cap_P = caps; |
132 | } | 132 | } |
133 | |||
134 | uint64_t | ||
135 | crypto_cpu_caps_ia32(void) | ||
136 | { | ||
137 | return OPENSSL_ia32cap_P; | ||
138 | } | ||
diff --git a/src/lib/libcrypto/arch/i386/crypto_arch.h b/src/lib/libcrypto/arch/i386/crypto_arch.h index ccaa3e8494..d2faa36e2e 100644 --- a/src/lib/libcrypto/arch/i386/crypto_arch.h +++ b/src/lib/libcrypto/arch/i386/crypto_arch.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_arch.h,v 1.11 2025/07/22 09:13:49 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_arch.h,v 1.12 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -21,7 +21,6 @@ | |||
21 | #define HEADER_CRYPTO_ARCH_H | 21 | #define HEADER_CRYPTO_ARCH_H |
22 | 22 | ||
23 | #define HAVE_CRYPTO_CPU_CAPS_INIT | 23 | #define HAVE_CRYPTO_CPU_CAPS_INIT |
24 | #define HAVE_CRYPTO_CPU_CAPS_IA32 | ||
25 | 24 | ||
26 | #ifndef __ASSEMBLER__ | 25 | #ifndef __ASSEMBLER__ |
27 | extern uint64_t crypto_cpu_caps_i386; | 26 | extern uint64_t crypto_cpu_caps_i386; |
diff --git a/src/lib/libcrypto/arch/i386/crypto_cpu_caps.c b/src/lib/libcrypto/arch/i386/crypto_cpu_caps.c index 12717a6db3..07d60f9a3f 100644 --- a/src/lib/libcrypto/arch/i386/crypto_cpu_caps.c +++ b/src/lib/libcrypto/arch/i386/crypto_cpu_caps.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_cpu_caps.c,v 1.5 2025/06/28 12:21:46 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_cpu_caps.c,v 1.6 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2024 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -122,9 +122,3 @@ crypto_cpu_caps_init(void) | |||
122 | 122 | ||
123 | OPENSSL_ia32cap_P = caps; | 123 | OPENSSL_ia32cap_P = caps; |
124 | } | 124 | } |
125 | |||
126 | uint64_t | ||
127 | crypto_cpu_caps_ia32(void) | ||
128 | { | ||
129 | return OPENSSL_ia32cap_P; | ||
130 | } | ||
diff --git a/src/lib/libcrypto/crypto_internal.h b/src/lib/libcrypto/crypto_internal.h index 09ae7fa466..058245e95e 100644 --- a/src/lib/libcrypto/crypto_internal.h +++ b/src/lib/libcrypto/crypto_internal.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_internal.h,v 1.15 2025/01/19 07:51:41 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_internal.h,v 1.16 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2023 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2023 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -300,6 +300,4 @@ crypto_ror_u64(uint64_t v, size_t shift) | |||
300 | 300 | ||
301 | void crypto_cpu_caps_init(void); | 301 | void crypto_cpu_caps_init(void); |
302 | 302 | ||
303 | uint64_t crypto_cpu_caps_ia32(void); | ||
304 | |||
305 | #endif | 303 | #endif |
diff --git a/src/lib/libcrypto/crypto_legacy.c b/src/lib/libcrypto/crypto_legacy.c index c11b80885c..dcaa63236c 100644 --- a/src/lib/libcrypto/crypto_legacy.c +++ b/src/lib/libcrypto/crypto_legacy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: crypto_legacy.c,v 1.8 2025/05/24 07:23:14 jsing Exp $ */ | 1 | /* $OpenBSD: crypto_legacy.c,v 1.9 2025/07/22 09:18:02 jsing Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2006 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -306,14 +306,6 @@ void | |||
306 | } | 306 | } |
307 | LCRYPTO_ALIAS(CRYPTO_get_dynlock_destroy_callback); | 307 | LCRYPTO_ALIAS(CRYPTO_get_dynlock_destroy_callback); |
308 | 308 | ||
309 | #ifndef HAVE_CRYPTO_CPU_CAPS_IA32 | ||
310 | uint64_t | ||
311 | crypto_cpu_caps_ia32(void) | ||
312 | { | ||
313 | return 0; | ||
314 | } | ||
315 | #endif | ||
316 | |||
317 | uint64_t | 309 | uint64_t |
318 | OPENSSL_cpu_caps(void) | 310 | OPENSSL_cpu_caps(void) |
319 | { | 311 | { |