diff options
author | jsing <> | 2025-05-24 07:23:14 +0000 |
---|---|---|
committer | jsing <> | 2025-05-24 07:23:14 +0000 |
commit | ec8eb11a5ce860544e57c838ca5fd73a0308e657 (patch) | |
tree | 68670908b6c499e3109bde2c7878c05c0fe85354 /src | |
parent | 3cfae66703ed572e7cf2f91e206ec0193019c094 (diff) | |
download | openbsd-ec8eb11a5ce860544e57c838ca5fd73a0308e657.tar.gz openbsd-ec8eb11a5ce860544e57c838ca5fd73a0308e657.tar.bz2 openbsd-ec8eb11a5ce860544e57c838ca5fd73a0308e657.zip |
Remove remnants of OPENSSL_cpuid_setup().
This is no longer used.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/crypto_init.c | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/crypto_legacy.c | 17 | ||||
-rw-r--r-- | src/lib/libcrypto/crypto_local.h | 4 |
3 files changed, 10 insertions, 20 deletions
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 @@ | |||
1 | /* $OpenBSD: crypto_init.c,v 1.23 2025/05/10 05:54:38 tb Exp $ */ | 1 | /* $OpenBSD: crypto_init.c,v 1.24 2025/05/24 07:23:14 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -37,6 +37,13 @@ static pthread_once_t crypto_init_once = PTHREAD_ONCE_INIT; | |||
37 | static pthread_t crypto_init_thread; | 37 | static pthread_t crypto_init_thread; |
38 | static int crypto_init_cleaned_up; | 38 | static int crypto_init_cleaned_up; |
39 | 39 | ||
40 | #ifndef HAVE_CRYPTO_CPU_CAPS_INIT | ||
41 | void | ||
42 | crypto_cpu_caps_init(void) | ||
43 | { | ||
44 | } | ||
45 | #endif | ||
46 | |||
40 | void | 47 | void |
41 | OPENSSL_init(void) | 48 | OPENSSL_init(void) |
42 | { | 49 | { |
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 @@ | |||
1 | /* $OpenBSD: crypto_legacy.c,v 1.7 2025/05/10 05:54:38 tb Exp $ */ | 1 | /* $OpenBSD: crypto_legacy.c,v 1.8 2025/05/24 07:23:14 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,21 +306,6 @@ void | |||
306 | } | 306 | } |
307 | LCRYPTO_ALIAS(CRYPTO_get_dynlock_destroy_callback); | 307 | LCRYPTO_ALIAS(CRYPTO_get_dynlock_destroy_callback); |
308 | 308 | ||
309 | #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) | ||
310 | void | ||
311 | OPENSSL_cpuid_setup(void) | ||
312 | { | ||
313 | } | ||
314 | #endif | ||
315 | |||
316 | #ifndef HAVE_CRYPTO_CPU_CAPS_INIT | ||
317 | void | ||
318 | crypto_cpu_caps_init(void) | ||
319 | { | ||
320 | OPENSSL_cpuid_setup(); | ||
321 | } | ||
322 | #endif | ||
323 | |||
324 | #ifndef HAVE_CRYPTO_CPU_CAPS_IA32 | 309 | #ifndef HAVE_CRYPTO_CPU_CAPS_IA32 |
325 | uint64_t | 310 | uint64_t |
326 | crypto_cpu_caps_ia32(void) | 311 | 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 @@ | |||
1 | /* $OpenBSD: crypto_local.h,v 1.4 2024/11/05 10:11:58 tb Exp $ */ | 1 | /* $OpenBSD: crypto_local.h,v 1.5 2025/05/24 07:23:14 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -75,8 +75,6 @@ extern "C" { | |||
75 | #define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" | 75 | #define CTLOG_FILE OPENSSLDIR "/ct_log_list.cnf" |
76 | #define CTLOG_FILE_EVP "CTLOG_FILE" | 76 | #define CTLOG_FILE_EVP "CTLOG_FILE" |
77 | 77 | ||
78 | void OPENSSL_cpuid_setup(void); | ||
79 | |||
80 | #ifdef __cplusplus | 78 | #ifdef __cplusplus |
81 | } | 79 | } |
82 | #endif | 80 | #endif |