From ec8eb11a5ce860544e57c838ca5fd73a0308e657 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 24 May 2025 07:23:14 +0000
Subject: Remove remnants of OPENSSL_cpuid_setup().

This is no longer used.
---
 src/lib/libcrypto/crypto_init.c   |  9 ++++++++-
 src/lib/libcrypto/crypto_legacy.c | 17 +----------------
 src/lib/libcrypto/crypto_local.h  |  4 +---
 3 files changed, 10 insertions(+), 20 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/crypto_init.c b/src/lib/libcrypto/crypto_init.c
index 931dff73f8..44c4846762 100644
--- a/src/lib/libcrypto/crypto_init.c
+++ b/src/lib/libcrypto/crypto_init.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crypto_init.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */
+/*	$OpenBSD: crypto_init.c,v 1.24 2025/05/24 07:23:14 jsing Exp $ */
 /*
  * Copyright (c) 2018 Bob Beck <beck@openbsd.org>
  *
@@ -37,6 +37,13 @@ static pthread_once_t crypto_init_once = PTHREAD_ONCE_INIT;
 static pthread_t crypto_init_thread;
 static int crypto_init_cleaned_up;
 
+#ifndef HAVE_CRYPTO_CPU_CAPS_INIT
+void
+crypto_cpu_caps_init(void)
+{
+}
+#endif
+
 void
 OPENSSL_init(void)
 {
diff --git a/src/lib/libcrypto/crypto_legacy.c b/src/lib/libcrypto/crypto_legacy.c
index cfe10467f6..c11b80885c 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.7 2025/05/10 05:54:38 tb Exp $ */
+/* $OpenBSD: crypto_legacy.c,v 1.8 2025/05/24 07:23:14 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -306,21 +306,6 @@ void
 }
 LCRYPTO_ALIAS(CRYPTO_get_dynlock_destroy_callback);
 
-#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)
-void
-OPENSSL_cpuid_setup(void)
-{
-}
-#endif
-
-#ifndef HAVE_CRYPTO_CPU_CAPS_INIT
-void
-crypto_cpu_caps_init(void)
-{
-	OPENSSL_cpuid_setup();
-}
-#endif
-
 #ifndef HAVE_CRYPTO_CPU_CAPS_IA32
 uint64_t
 crypto_cpu_caps_ia32(void)
diff --git a/src/lib/libcrypto/crypto_local.h b/src/lib/libcrypto/crypto_local.h
index 2b4c74552f..d549102da0 100644
--- a/src/lib/libcrypto/crypto_local.h
+++ b/src/lib/libcrypto/crypto_local.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto_local.h,v 1.4 2024/11/05 10:11:58 tb Exp $ */
+/* $OpenBSD: crypto_local.h,v 1.5 2025/05/24 07:23:14 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -75,8 +75,6 @@ extern "C" {
 #define CTLOG_FILE		OPENSSLDIR "/ct_log_list.cnf"
 #define CTLOG_FILE_EVP		"CTLOG_FILE"
 
-void OPENSSL_cpuid_setup(void);
-
 #ifdef  __cplusplus
 }
 #endif
-- 
cgit v1.2.3-55-g6feb