diff options
Diffstat (limited to 'src/lib/libcrypto/engine/eng_all.c')
-rw-r--r-- | src/lib/libcrypto/engine/eng_all.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c index bc50465422..0f6992a40d 100644 --- a/src/lib/libcrypto/engine/eng_all.c +++ b/src/lib/libcrypto/engine/eng_all.c | |||
@@ -60,10 +60,6 @@ | |||
60 | #include <openssl/engine.h> | 60 | #include <openssl/engine.h> |
61 | #include "eng_int.h" | 61 | #include "eng_int.h" |
62 | 62 | ||
63 | #ifdef __OpenBSD__ | ||
64 | static int openbsd_default_loaded = 0; | ||
65 | #endif | ||
66 | |||
67 | void ENGINE_load_builtin_engines(void) | 63 | void ENGINE_load_builtin_engines(void) |
68 | { | 64 | { |
69 | /* There's no longer any need for an "openssl" ENGINE unless, one day, | 65 | /* There's no longer any need for an "openssl" ENGINE unless, one day, |
@@ -99,21 +95,19 @@ void ENGINE_load_builtin_engines(void) | |||
99 | #ifndef OPENSSL_NO_HW_4758_CCA | 95 | #ifndef OPENSSL_NO_HW_4758_CCA |
100 | ENGINE_load_4758cca(); | 96 | ENGINE_load_4758cca(); |
101 | #endif | 97 | #endif |
102 | #ifdef OPENSSL_OPENBSD_DEV_CRYPTO | 98 | #if defined(__OpenBSD__) || defined(__FreeBSD__) |
103 | ENGINE_load_openbsd_dev_crypto(); | ||
104 | #endif | ||
105 | #ifdef __OpenBSD__ | ||
106 | ENGINE_load_cryptodev(); | 99 | ENGINE_load_cryptodev(); |
107 | #endif | 100 | #endif |
108 | #endif | 101 | #endif |
109 | } | 102 | } |
110 | 103 | ||
111 | #ifdef __OpenBSD__ | 104 | #if defined(__OpenBSD__) || defined(__FreeBSD__) |
112 | void ENGINE_setup_openbsd(void) { | 105 | void ENGINE_setup_bsd_cryptodev(void) { |
113 | if (!openbsd_default_loaded) { | 106 | static int bsd_cryptodev_default_loaded = 0; |
107 | if (!bsd_cryptodev_default_loaded) { | ||
114 | ENGINE_load_cryptodev(); | 108 | ENGINE_load_cryptodev(); |
115 | ENGINE_register_all_complete(); | 109 | ENGINE_register_all_complete(); |
116 | } | 110 | } |
117 | openbsd_default_loaded=1; | 111 | bsd_cryptodev_default_loaded=1; |
118 | } | 112 | } |
119 | #endif | 113 | #endif |