diff options
author | beck <> | 2018-03-19 03:56:08 +0000 |
---|---|---|
committer | beck <> | 2018-03-19 03:56:08 +0000 |
commit | d5fb5d1a107696bee4657cd62e568b4bd3bb49ed (patch) | |
tree | f807e35e5152ebb636ddebaad78f8e4ad42b3269 /src | |
parent | 2f7b277069b6cb7fc65a5f3fc8b7dfa914f78905 (diff) | |
download | openbsd-d5fb5d1a107696bee4657cd62e568b4bd3bb49ed.tar.gz openbsd-d5fb5d1a107696bee4657cd62e568b4bd3bb49ed.tar.bz2 openbsd-d5fb5d1a107696bee4657cd62e568b4bd3bb49ed.zip |
I should not be calling ENGINE_load_builtin_engines_internal
here, just the normal version.
ok jsing@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/conf/conf_sap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libcrypto/conf/conf_sap.c b/src/lib/libcrypto/conf/conf_sap.c index 98497025ee..827cf96e74 100644 --- a/src/lib/libcrypto/conf/conf_sap.c +++ b/src/lib/libcrypto/conf/conf_sap.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: conf_sap.c,v 1.13 2018/03/19 03:35:38 beck Exp $ */ | 1 | /* $OpenBSD: conf_sap.c,v 1.14 2018/03/19 03:56:08 beck Exp $ */ |
2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Stephen Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2001. | 3 | * project 2001. |
4 | */ | 4 | */ |
@@ -80,15 +80,13 @@ static pthread_once_t openssl_configured = PTHREAD_ONCE_INIT; | |||
80 | 80 | ||
81 | static const char *openssl_config_name; | 81 | static const char *openssl_config_name; |
82 | 82 | ||
83 | void ENGINE_load_builtin_engines_internal(void); | ||
84 | |||
85 | static void | 83 | static void |
86 | OPENSSL_config_internal(void) | 84 | OPENSSL_config_internal(void) |
87 | { | 85 | { |
88 | OPENSSL_load_builtin_modules(); | 86 | OPENSSL_load_builtin_modules(); |
89 | #ifndef OPENSSL_NO_ENGINE | 87 | #ifndef OPENSSL_NO_ENGINE |
90 | /* Need to load ENGINEs */ | 88 | /* Need to load ENGINEs */ |
91 | ENGINE_load_builtin_engines_internal(); | 89 | ENGINE_load_builtin_engines(); |
92 | #endif | 90 | #endif |
93 | /* Add others here? */ | 91 | /* Add others here? */ |
94 | 92 | ||