summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2008-01-21 22:33:01 +0000
committerRoger Dingledine <arma@torproject.org>2008-01-21 22:33:01 +0000
commit750ed3d0159c12b0f88f056b360e50efb4d46666 (patch)
tree34d9d81e75a42f274e658b795b69ebcb5a059468
parentddb753f87a5a0ca8dc64682525659f2ae4327907 (diff)
downloadtor-750ed3d0159c12b0f88f056b360e50efb4d46666.tar.gz
tor-750ed3d0159c12b0f88f056b360e50efb4d46666.zip
We accidentally enabled the under-development v2 TLS handshake
code, which is causing log entries like "TLS error while renegotiating handshake". Disable it again. Resolves bug 590. svn:r13219
-rw-r--r--ChangeLog5
-rw-r--r--src/common/tortls.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a9b1c0cec..8c9891952a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,11 @@ Changes in version 0.2.0.18-alpha - 2008-01-??
Tor can warn and/or refuse connections to ports commonly used with
vulnerable-plaintext protocols.
+ o Major bugfixes:
+ - We accidentally enabled the under-development v2 TLS handshake
+ code, which is causing log entries like "TLS error while
+ renegotiating handshake". Disable it again. Resolves bug 590.
+
o Minor features:
- Don't answer "/tor/networkstatus-bridges" directory requests if
the request isn't encrypted.
diff --git a/src/common/tortls.c b/src/common/tortls.c
index b049aa11ec..171bb80e42 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -43,7 +43,7 @@ const char tortls_c_id[] =
#include <string.h>
// #define V2_HANDSHAKE_SERVER
-#define V2_HANDSHAKE_CLIENT
+// #define V2_HANDSHAKE_CLIENT
/* Copied from or.h */
#define LEGAL_NICKNAME_CHARACTERS \