[or-cvs] backport to stop using hardware accelerators when we initia...

[arma@xxxxxxxx]

Update of /home/or/cvsroot/tor/src/common
In directory moria:/home/arma/work/onion/tor-011x/tor/src/common

Modified Files:
      Tag: tor-0_1_1-patches
	crypto.c 
Log Message:
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.


Index: crypto.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/crypto.c,v
retrieving revision 1.189
retrieving revision 1.189.2.1
diff -u -p -d -r1.189 -r1.189.2.1
--- crypto.c	26 Mar 2006 06:47:51 -0000	1.189
+++ crypto.c	25 May 2006 21:25:16 -0000	1.189.2.1
@@ -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())