[tor-commits] [tor/master] Restore prop198 behavior from 4677 patch

[nickm at torproject.org]

commit 8f9c847fbf4032a8db4802708f7e2d69a26cd3d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 25 10:53:37 2013 -0500

    Restore prop198 behavior from 4677 patch
    
    The previous commit from piet would have backed out some of proposal
    198 and made servers built without the V2 handshake not use the
    unrestricted cipher list from prop198.
    
    Bug not in any released Tor.
---
 src/common/tortls.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 1fc440f..3d6efeb 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1630,7 +1630,7 @@ tor_tls_server_info_callback(const SSL *ssl, int type, int val)
 }
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,0) && defined(V2_HANDSHAKE_SERVER)
+#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,0)
 /** Callback to get invoked on a server after we've read the list of ciphers
  * the client supports, but before we pick our own ciphersuite.
  *