From cbc4928ebdbd9c244a1c0e3c2e90497a0d246b38 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 22 Jul 2025 09:18:02 +0000
Subject: Remove crypto_cpu_caps_ia32()

There are no more consumers of crypto_cpu_caps_ia32(), so remove it.

ok bcook@ joshua@ tb@
---
 src/lib/libcrypto/arch/amd64/crypto_arch.h     |  3 +--
 src/lib/libcrypto/arch/amd64/crypto_cpu_caps.c |  8 +-------
 src/lib/libcrypto/arch/i386/crypto_arch.h      |  3 +--
 src/lib/libcrypto/arch/i386/crypto_cpu_caps.c  |  8 +-------
 src/lib/libcrypto/crypto_internal.h            |  4 +---
 src/lib/libcrypto/crypto_legacy.c              | 10 +---------
 6 files changed, 6 insertions(+), 30 deletions(-)

(limited to 'src/lib')

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 @@
-/*	$OpenBSD: crypto_arch.h,v 1.12 2025/07/22 09:13:49 jsing Exp $ */
+/*	$OpenBSD: crypto_arch.h,v 1.13 2025/07/22 09:18:02 jsing Exp $ */
 /*
  * Copyright (c) 2024 Joel Sing <jsing@openbsd.org>
  *
@@ -21,7 +21,6 @@
 #define HEADER_CRYPTO_ARCH_H
 
 #define HAVE_CRYPTO_CPU_CAPS_INIT
-#define HAVE_CRYPTO_CPU_CAPS_IA32
 
 #ifndef __ASSEMBLER__
 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 @@
-/*	$OpenBSD: crypto_cpu_caps.c,v 1.6 2025/06/28 12:20:39 jsing Exp $ */
+/*	$OpenBSD: crypto_cpu_caps.c,v 1.7 2025/07/22 09:18:02 jsing Exp $ */
 /*
  * Copyright (c) 2024 Joel Sing <jsing@openbsd.org>
  *
@@ -130,9 +130,3 @@ crypto_cpu_caps_init(void)
 
 	OPENSSL_ia32cap_P = caps;
 }
-
-uint64_t
-crypto_cpu_caps_ia32(void)
-{
-	return OPENSSL_ia32cap_P;
-}
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 @@
-/*	$OpenBSD: crypto_arch.h,v 1.11 2025/07/22 09:13:49 jsing Exp $ */
+/*	$OpenBSD: crypto_arch.h,v 1.12 2025/07/22 09:18:02 jsing Exp $ */
 /*
  * Copyright (c) 2024 Joel Sing <jsing@openbsd.org>
  *
@@ -21,7 +21,6 @@
 #define HEADER_CRYPTO_ARCH_H
 
 #define HAVE_CRYPTO_CPU_CAPS_INIT
-#define HAVE_CRYPTO_CPU_CAPS_IA32
 
 #ifndef __ASSEMBLER__
 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 @@
-/*	$OpenBSD: crypto_cpu_caps.c,v 1.5 2025/06/28 12:21:46 jsing Exp $ */
+/*	$OpenBSD: crypto_cpu_caps.c,v 1.6 2025/07/22 09:18:02 jsing Exp $ */
 /*
  * Copyright (c) 2024 Joel Sing <jsing@openbsd.org>
  *
@@ -122,9 +122,3 @@ crypto_cpu_caps_init(void)
 
 	OPENSSL_ia32cap_P = caps;
 }
-
-uint64_t
-crypto_cpu_caps_ia32(void)
-{
-	return OPENSSL_ia32cap_P;
-}
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 @@
-/*	$OpenBSD: crypto_internal.h,v 1.15 2025/01/19 07:51:41 jsing Exp $ */
+/*	$OpenBSD: crypto_internal.h,v 1.16 2025/07/22 09:18:02 jsing Exp $ */
 /*
  * Copyright (c) 2023 Joel Sing <jsing@openbsd.org>
  *
@@ -300,6 +300,4 @@ crypto_ror_u64(uint64_t v, size_t shift)
 
 void crypto_cpu_caps_init(void);
 
-uint64_t crypto_cpu_caps_ia32(void);
-
 #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 @@
-/* $OpenBSD: crypto_legacy.c,v 1.8 2025/05/24 07:23:14 jsing Exp $ */
+/* $OpenBSD: crypto_legacy.c,v 1.9 2025/07/22 09:18:02 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -306,14 +306,6 @@ void
 }
 LCRYPTO_ALIAS(CRYPTO_get_dynlock_destroy_callback);
 
-#ifndef HAVE_CRYPTO_CPU_CAPS_IA32
-uint64_t
-crypto_cpu_caps_ia32(void)
-{
-	return 0;
-}
-#endif
-
 uint64_t
 OPENSSL_cpu_caps(void)
 {
-- 
cgit v1.2.3-55-g6feb