Make sure that even in the weird fiddly paths that lead to init_keys,

crypto_global_init gets called.  Also have it be crypto_global_init
that calls crypto_seed_rng, so we are not dependent on OpenSSL's
RAND_poll in these fiddly cases.

Should fix bug 907.  Bugfix on 0.0.9pre6.  Backport candidate.

svn:r18210

diff --git a/ChangeLog b/ChangeLog
index 453e1865a8cf15565e3a8efa9e287d9e177628f4..42620fc0bb2f19c2ab626bb17012b6a8db0388c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ Changes in version 0.2.1.12-alpha - 2009-01-??
       0.2.1.11-alpha.
     - Fix a bug in address parsing that was preventing bridges or hidden
       service targets from being at IPv6 addresses.
+    - Solve a bug that kept hardware crypto acceleration from getting
+      enabled when accounting was turned on.  Fixes bug 907.  Bugfix on
+      0.0.9pre6.
 
 
 Changes in version 0.2.1.11-alpha - 2009-01-20

diff --git a/src/common/crypto.c b/src/common/crypto.c
index ab6670039d3e1d1eb3a7e7dddc60ec5b99ac0c2b..0abd30be1ad7309c592fb2cc26cfcea91a101d2f 100644 (file)
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -197,6 +197,7 @@ crypto_global_init(int useAccel)
       log_engine("3DES", ENGINE_get_cipher_engine(NID_des_ede3_ecb));
       log_engine("AES", ENGINE_get_cipher_engine(NID_aes_128_ecb));
     }
+    return crypto_seed_rng(1);
   }
   return 0;
 }

diff --git a/src/or/main.c b/src/or/main.c
index d1c2b516fff758ff9d7c5880f3767b14b88bd7f9..353082749ce421fb0cc40da443d959428f61f3df 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1817,9 +1817,8 @@ tor_init(int argc, char *argv[])
              "and you probably shouldn't.");
 #endif
 
-  crypto_global_init(get_options()->HardwareAccel);
-  if (crypto_seed_rng(1)) {
-    log_err(LD_BUG, "Unable to seed random number generator. Exiting.");
+  if (crypto_global_init(get_options()->HardwareAccel)) {
+    log_err(LD_BUG, "Unable to initialize OpenSSL. Exiting.");
     return -1;
   }
 

diff --git a/src/or/router.c b/src/or/router.c
index 1cdcd20652ab680751c01ede4c2f9f75f41dbf5d..3d6cae367e47c9f5ff3c77dfb51b1e84b3426b8d 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -444,6 +444,12 @@ init_keys(void)
   if (!key_lock)
     key_lock = tor_mutex_new();
 
+  /* There are a couple of paths that put us here before */
+  if (crypto_global_init(get_options()->HardwareAccel)) {
+    log_err(LD_BUG, "Unable to initialize OpenSSL. Exiting.");
+    return -1;
+  }
+
   /* OP's don't need persistent keys; just make up an identity and
    * initialize the TLS context. */
   if (!server_mode(options)) {