[or-cvs] r13219: We accidentally enabled the under-development v2 TLS handsha (in tor/trunk: . src/common)

[arma@xxxxxxxx]

Author: arma
Date: 2008-01-21 17:33:01 -0500 (Mon, 21 Jan 2008)
New Revision: 13219

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/common/tortls.c
Log:
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.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-01-21 22:09:42 UTC (rev 13218)
+++ tor/trunk/ChangeLog	2008-01-21 22:33:01 UTC (rev 13219)
@@ -10,6 +10,11 @@
       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.

Modified: tor/trunk/src/common/tortls.c
===================================================================
--- tor/trunk/src/common/tortls.c	2008-01-21 22:09:42 UTC (rev 13218)
+++ tor/trunk/src/common/tortls.c	2008-01-21 22:33:01 UTC (rev 13219)
@@ -43,7 +43,7 @@
 #include <string.h>
 
 // #define V2_HANDSHAKE_SERVER
-#define V2_HANDSHAKE_CLIENT
+// #define V2_HANDSHAKE_CLIENT
 
 /* Copied from or.h */
 #define LEGAL_NICKNAME_CHARACTERS \