diff options
author | jsing <> | 2024-10-17 14:27:57 +0000 |
---|---|---|
committer | jsing <> | 2024-10-17 14:27:57 +0000 |
commit | 978d3a277baeb25c75e71e4d12342c47d1764205 (patch) | |
tree | 9a374ab05acc812ea22b6eb26d787771e956e515 /src/lib/libcrypto/cryptlib.c | |
parent | 3f67c2a09f63d9b79af4479ddb350c665f82747f (diff) | |
download | openbsd-978d3a277baeb25c75e71e4d12342c47d1764205.tar.gz openbsd-978d3a277baeb25c75e71e4d12342c47d1764205.tar.bz2 openbsd-978d3a277baeb25c75e71e4d12342c47d1764205.zip |
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@
Diffstat (limited to 'src/lib/libcrypto/cryptlib.c')
-rw-r--r-- | src/lib/libcrypto/cryptlib.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c index fe15135ed9..60f14eba12 100644 --- a/src/lib/libcrypto/cryptlib.c +++ b/src/lib/libcrypto/cryptlib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cryptlib.c,v 1.55 2024/10/17 14:09:29 jsing Exp $ */ | 1 | /* $OpenBSD: cryptlib.c,v 1.56 2024/10/17 14:27:57 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 | * |
@@ -124,6 +124,8 @@ | |||
124 | #include <openssl/opensslconf.h> | 124 | #include <openssl/opensslconf.h> |
125 | #include <openssl/crypto.h> | 125 | #include <openssl/crypto.h> |
126 | 126 | ||
127 | #include "cryptlib.h" | ||
128 | #include "crypto_internal.h" | ||
127 | #include "crypto_local.h" | 129 | #include "crypto_local.h" |
128 | #include "x86_arch.h" | 130 | #include "x86_arch.h" |
129 | 131 | ||
@@ -369,6 +371,14 @@ OPENSSL_cpuid_setup(void) | |||
369 | } | 371 | } |
370 | #endif | 372 | #endif |
371 | 373 | ||
374 | #ifndef HAVE_CRYPTO_CPU_CAPS_INIT | ||
375 | void | ||
376 | crypto_cpu_caps_init(void) | ||
377 | { | ||
378 | OPENSSL_cpuid_setup(); | ||
379 | } | ||
380 | #endif | ||
381 | |||
372 | uint64_t | 382 | uint64_t |
373 | OPENSSL_cpu_caps(void) | 383 | OPENSSL_cpu_caps(void) |
374 | { | 384 | { |