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.

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 1fc440fc1fb0df1341effbd81b90b243ddf15772..3d6efeba04687504e7831ccfeef15a916b880758 100644 (file)
--- 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.
  *