aboutsummaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-06-05 04:29:03 +0000
committerRoger Dingledine <arma@torproject.org>2006-06-05 04:29:03 +0000
commit266afcd7d5d276a77f30debcc1ba51347390514b (patch)
treedc0784527ccc45b3864b7c191d5b0f2a7f5e10ce /src/common
parentb7ca697fafd1120f0257fca27508a6b687f6ab08 (diff)
downloadtor-266afcd7d5d276a77f30debcc1ba51347390514b.tar
tor-266afcd7d5d276a77f30debcc1ba51347390514b.tar.gz
bandaid for bug 299. this is still a bug, since we don't
initialize for hardware acceleration in certain configurations; but not critical until that is supported. svn:r6536
Diffstat (limited to 'src/common')
-rw-r--r--src/common/crypto.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index ac2388011..200c74a27 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -189,8 +189,12 @@ crypto_global_init(int useAccel)
OpenSSL_add_all_algorithms();
_crypto_global_initialized = 1;
setup_openssl_threading();
+ /* XXX the below is a bug, since we can't know if we're supposed
+ * to be using hardware acceleration or not. we should arrange
+ * for this function to be called before init_keys. But make it
+ * not complain loudly, at least until we make acceleration work. */
if (useAccel < 0) {
- log_warn(LD_CRYPTO, "Initializing OpenSSL via tor_tls_init().");
+ log_info(LD_CRYPTO, "Initializing OpenSSL via tor_tls_init().");
}
#ifndef NO_ENGINES
if (useAccel > 0) {