[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] Split PARANOIA_B into B1 and B2.



Update of /home/or/cvsroot/tor/src/common
In directory moria:/tmp/cvs-serv27710/src/common

Modified Files:
	crypto.c crypto.h 
Log Message:
Split PARANOIA_B into B1 and B2.

Index: crypto.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/crypto.c,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -p -d -r1.184 -r1.185
--- crypto.c	17 Jan 2006 23:08:38 -0000	1.184
+++ crypto.c	22 Jan 2006 18:22:04 -0000	1.185
@@ -228,7 +228,7 @@ crypto_global_init(int useAccel)
 void
 crypto_thread_cleanup(void)
 {
-#ifndef ENABLE_0119_PARANOIA_B
+#ifndef ENABLE_0119_PARANOIA_B1
   ERR_remove_state(0);
 #endif
 }
@@ -1610,7 +1610,7 @@ crypto_dh_free(crypto_dh_env_t *dh)
 
 /* Use RAND_poll if openssl is 0.9.6 release or later.  (The "f" means
    "release".)  */
-#ifndef ENABLE_0119_PARANOIA_B
+#ifndef ENABLE_0119_PARANOIA_B2
 #define USE_RAND_POLL (OPENSSL_VERSION_NUMBER >= 0x0090600fl)
 #else
 #define USE_RAND_POLL 0

Index: crypto.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/crypto.h,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -d -r1.75 -r1.76
--- crypto.h	17 Jan 2006 23:08:38 -0000	1.75
+++ crypto.h	22 Jan 2006 18:22:04 -0000	1.76
@@ -16,7 +16,8 @@
 #include <stdio.h>
 
 #undef ENABLE_0119_PARANOIA_A
-#undef ENABLE_0119_PARANOIA_B
+#undef ENABLE_0119_PARANOIA_B1
+#undef ENABLE_0119_PARANOIA_B2
 #undef ENABLE_0119_PARANOIA_C
 
 /** Length of the output of our message digest. */