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

diff --git a/ChangeLog b/ChangeLog
index 7a9b1c0cec7e88974fbd1375723cc842bf0a5097..8c9891952ab22ca3143c043010fc50f56252843c 100644 (file)
--- 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 b049aa11eca21c61493b471bdc91389bcfdbd508..171bb80e424a64ecbe251d5833029c439aa357e1 100644 (file)
--- 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 \