diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-05-25 21:25:16 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-05-25 21:25:16 +0000 |
| commit | 4548149cbe346ba78efad3c107cec0a4ee1831c2 (patch) | |
| tree | 4e68c12a158dcd118151df53393e7a4f9447eacd /src | |
| parent | 9cc85e51dac859a6314e1844f7b0b9a91865d11d (diff) | |
| download | tor-4548149cbe346ba78efad3c107cec0a4ee1831c2.tar.gz tor-4548149cbe346ba78efad3c107cec0a4ee1831c2.zip | |
backport to stop using hardware accelerators when we initialize
the crypto libs from a certain code path. the bug remains of why
we use that codepath. it happens when we hibernate.
svn:r6498
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/crypto.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 4cdc814641..4fc9aff832 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()) |