aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-05-24 00:37:38 +0000
committerRoger Dingledine <arma@torproject.org>2006-05-24 00:37:38 +0000
commit36712a443b0044d2e793d61a2fe611211a253962 (patch)
tree59fa5828c6dfcb2fb7a8bcf1142d2ae63650f456 /src
parent67a885ecacf076dc439a0ac9024f2de18f0d6e94 (diff)
downloadtor-36712a443b0044d2e793d61a2fe611211a253962.tar.gz
tor-36712a443b0044d2e793d61a2fe611211a253962.zip
Stop initializing the hardware accelerator engines simply because
we overloaded the meaning of the argument to crypto_global_init(). svn:r6490
Diffstat (limited to 'src')
-rw-r--r--src/common/crypto.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index 5460c6d4d8..429df04b12 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -189,10 +189,11 @@ crypto_global_init(int useAccel)
OpenSSL_add_all_algorithms();
_crypto_global_initialized = 1;
setup_openssl_threading();
+ if (useAccel < 0) {
+ log_warn(LD_CRYPTO, "Initializing OpenSSL via tor_tls_init().");
+ }
#ifndef NO_ENGINES
- if (useAccel) {
- if (useAccel < 0)
- log_warn(LD_CRYPTO, "Initializing OpenSSL via tor_tls_init().");
+ if (useAccel > 0) {
log_info(LD_CRYPTO, "Initializing OpenSSL engine support.");
ENGINE_load_builtin_engines();
if (!ENGINE_register_all_complete())