From 32ac497024192c28860a7248c295d2638805a96d Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Thu, 17 Oct 2024 14:09:29 +0000
Subject: [PATCH] Remove run once code from OPENSSL_cpuid_setup().

OPENSSL_cpuid_setup() is no longer exported and is now only ever run under
pthread_once().

ok joshua@ tb@
---
 lib/libcrypto/cryptlib.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/libcrypto/cryptlib.c b/lib/libcrypto/cryptlib.c
index 59e6456bbb2..fe15135ed98 100644
--- a/lib/libcrypto/cryptlib.c
+++ b/lib/libcrypto/cryptlib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cryptlib.c,v 1.54 2024/09/06 09:57:32 tb Exp $ */
+/* $OpenBSD: cryptlib.c,v 1.55 2024/10/17 14:09:29 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
  *
@@ -345,12 +345,8 @@ crypto_cpu_caps_ia32(void)
 void
 OPENSSL_cpuid_setup(void)
 {
-	static int trigger = 0;
 	uint64_t OPENSSL_ia32_cpuid(void);
 
-	if (trigger)
-		return;
-	trigger = 1;
 	OPENSSL_ia32cap_P = OPENSSL_ia32_cpuid();
 
 	if ((OPENSSL_ia32cap_P & CPUCAP_MASK_AESNI) != 0)
-- 
2.20.1