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/crypto_init.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/crypto_init.c')
-rw-r--r-- | src/lib/libcrypto/crypto_init.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 @@ | |||
1 | /* $OpenBSD: crypto_init.c,v 1.21 2024/04/10 14:51:02 beck Exp $ */ | 1 | /* $OpenBSD: crypto_init.c,v 1.22 2024/10/17 14:27:57 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> | 3 | * Copyright (c) 2018 Bob Beck <beck@openbsd.org> |
4 | * | 4 | * |
@@ -27,7 +27,7 @@ | |||
27 | #include <openssl/objects.h> | 27 | #include <openssl/objects.h> |
28 | #include <openssl/x509v3.h> | 28 | #include <openssl/x509v3.h> |
29 | 29 | ||
30 | #include "cryptlib.h" | 30 | #include "crypto_internal.h" |
31 | #include "x509_issuer_cache.h" | 31 | #include "x509_issuer_cache.h" |
32 | 32 | ||
33 | int OpenSSL_config(const char *); | 33 | int OpenSSL_config(const char *); |
@@ -48,7 +48,8 @@ OPENSSL_init_crypto_internal(void) | |||
48 | { | 48 | { |
49 | crypto_init_thread = pthread_self(); | 49 | crypto_init_thread = pthread_self(); |
50 | 50 | ||
51 | OPENSSL_cpuid_setup(); | 51 | crypto_cpu_caps_init(); |
52 | |||
52 | ERR_load_crypto_strings(); | 53 | ERR_load_crypto_strings(); |
53 | } | 54 | } |
54 | 55 | ||