[or-cvs] r13794: Backport: People diagnosed and fixed bug 616. See changelog (in tor/branches/tor-0_2_0-patches: . src/common)

[nickm at seul.org]

Author: nickm
Date: 2008-03-01 09:59:07 -0500 (Sat, 01 Mar 2008)
New Revision: 13794

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/common/tortls.c
Log:
 r18536 at catbus:  nickm | 2008-03-01 09:58:55 -0500
 Backport:  People diagnosed and fixed bug 616. See changelog for details.  Bugfix on 0.2.0.20-rc.



Property changes on: tor/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r18536] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-01 14:59:03 UTC (rev 13793)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-01 14:59:07 UTC (rev 13794)
@@ -6,6 +6,10 @@
     - Downgrade assert in connection_buckets_decrement() to a log message.
       This may help us solve bug 614, and in any case will make its
       symptoms less severe. Bugfix on 0.2.0.20-rc.
+    - Fix compilation with OpenSSL 0.9.8 and 0.9.8a.  All other supported
+      OpenSSL versions should have been working fine.  Diagnosis and patch
+      from lodger, Karsten Loesing and Sebastian Hahn.  Fixes bug 616.
+      Bugfix on 0.2.0.20-rc.
 
 
 Changes in version 0.2.0.20-rc - 2008-02-24

Modified: tor/branches/tor-0_2_0-patches/src/common/tortls.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/common/tortls.c	2008-03-01 14:59:03 UTC (rev 13793)
+++ tor/branches/tor-0_2_0-patches/src/common/tortls.c	2008-03-01 14:59:07 UTC (rev 13794)
@@ -432,7 +432,7 @@
  * SSL3_TXT_RSA_NULL_SHA.  If you do this, you won't be able to communicate
  * with any of the "real" Tors, though. */
 
-#if OPENSSL_VERSION_NUMBER >= 0x00908000l
+#if OPENSSL_VERSION_NUMBER >= 0x00908020l
 #define CLIENT_CIPHER_LIST                         \
   (TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA ":"   \
    TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA ":"     \