summaryrefslogtreecommitdiff
path: root/src/common/crypto.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2006-01-17 23:08:38 +0000
committerNick Mathewson <nickm@torproject.org>2006-01-17 23:08:38 +0000
commit241310bbac2225eb7307a50f153cc55d23ea7fa7 (patch)
treead9dd853e8ae911252b9b94b57b551aeedb73873 /src/common/crypto.c
parent2be4f537f7f5d521ce7bcbb71e0a68efd7cfbcb4 (diff)
downloadtor-241310bbac2225eb7307a50f153cc55d23ea7fa7.tar.gz
tor-241310bbac2225eb7307a50f153cc55d23ea7fa7.zip
Split 0119_PARANOIA into 0119_PARANOIA_[ABC]. A is "this is suspicious, and we have not tried running without this yet". B is "this is suspicious, but the last time we tested, it was okay." C is "How could this possibly be the cause?"
svn:r5840
Diffstat (limited to 'src/common/crypto.c')
-rw-r--r--src/common/crypto.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c
index a486b23513..59e19c4b4e 100644
--- a/src/common/crypto.c
+++ b/src/common/crypto.c
@@ -228,7 +228,7 @@ crypto_global_init(int useAccel)
void
crypto_thread_cleanup(void)
{
-#ifndef ENABLE_0119_PARANOIA
+#ifndef ENABLE_0119_PARANOIA_B
ERR_remove_state(0);
#endif
}
@@ -239,13 +239,13 @@ int
crypto_global_cleanup(void)
{
EVP_cleanup();
-#ifndef ENABLE_0119_PARANOIA
+#ifndef ENABLE_0119_PARANOIA_C
ERR_remove_state(0);
#endif
ERR_free_strings();
#ifndef NO_ENGINES
ENGINE_cleanup();
-#ifndef ENABLE_0119_PARANOIA
+#ifndef ENABLE_0119_PARANOIA_C
CONF_modules_unload(1);
CRYPTO_cleanup_all_ex_data();
#endif
@@ -1381,7 +1381,7 @@ crypto_dh_new(void)
if (!(res->dh->g = BN_dup(dh_param_g)))
goto err;
-#ifndef ENABLE_0119_PARANOIA
+#ifndef ENABLE_0119_PARANOIA_A
res->dh->length = DH_PRIVATE_KEY_BITS;
#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
+#ifndef ENABLE_0119_PARANOIA_B
#define USE_RAND_POLL (OPENSSL_VERSION_NUMBER >= 0x0090600fl)
#else
#define USE_RAND_POLL 0