From 978d3a277baeb25c75e71e4d12342c47d1764205 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 17 Oct 2024 14:27:57 +0000
Subject: Provide crypto_cpu_caps_init() as a CPU capability detection entry
 point.

This can be overridden on a per-architecture basis. The default version
calls OPENSSL_cpuid_setup(), which will be eventually replaced/removed.

ok joshua@ tb@
---
 src/lib/libcrypto/crypto_init.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/lib/libcrypto/crypto_init.c')

diff --git a/src/lib/libcrypto/crypto_init.c b/src/lib/libcrypto/crypto_init.c
index d2d06f87df..6016d1ae40 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.21 2024/04/10 14:51:02 beck Exp $ */
+/*	$OpenBSD: crypto_init.c,v 1.22 2024/10/17 14:27:57 jsing Exp $ */
 /*
  * Copyright (c) 2018 Bob Beck <beck@openbsd.org>
  *
@@ -27,7 +27,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509v3.h>
 
-#include "cryptlib.h"
+#include "crypto_internal.h"
 #include "x509_issuer_cache.h"
 
 int OpenSSL_config(const char *);
@@ -48,7 +48,8 @@ OPENSSL_init_crypto_internal(void)
 {
 	crypto_init_thread = pthread_self();
 
-	OPENSSL_cpuid_setup();
+	crypto_cpu_caps_init();
+
 	ERR_load_crypto_strings();
 }
 
-- 
cgit v1.2.3-55-g6feb