diff options
Diffstat (limited to 'src/lib/libcrypto/engine/eng_all.c')
| -rw-r--r-- | src/lib/libcrypto/engine/eng_all.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/lib/libcrypto/engine/eng_all.c b/src/lib/libcrypto/engine/eng_all.c index a35b3db9e8..b3030fe505 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, |
| @@ -96,23 +92,11 @@ void ENGINE_load_builtin_engines(void) | |||
| 96 | #ifndef OPENSSL_NO_HW_SUREWARE | 92 | #ifndef OPENSSL_NO_HW_SUREWARE |
| 97 | ENGINE_load_sureware(); | 93 | ENGINE_load_sureware(); |
| 98 | #endif | 94 | #endif |
| 95 | #ifndef OPENSSL_NO_HW_4758_CCA | ||
| 96 | ENGINE_load_4758cca(); | ||
| 97 | #endif | ||
| 99 | #ifdef OPENSSL_OPENBSD_DEV_CRYPTO | 98 | #ifdef OPENSSL_OPENBSD_DEV_CRYPTO |
| 100 | ENGINE_load_openbsd_dev_crypto(); | 99 | ENGINE_load_openbsd_dev_crypto(); |
| 101 | #endif | 100 | #endif |
| 102 | #ifdef __OpenBSD__ | ||
| 103 | ENGINE_load_cryptodev(); | ||
| 104 | #endif | ||
| 105 | #endif | 101 | #endif |
| 106 | } | 102 | } |
| 107 | |||
| 108 | #ifdef __OpenBSD__ | ||
| 109 | void ENGINE_setup_openbsd(void) { | ||
| 110 | if (!openbsd_default_loaded) { | ||
| 111 | ENGINE_load_cryptodev(); | ||
| 112 | ENGINE_register_all_complete(); | ||
| 113 | } | ||
| 114 | openbsd_default_loaded=1; | ||
| 115 | } | ||
| 116 | #endif | ||
| 117 | |||
| 118 | |||
