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.
This commit is contained in:
Nick Mathewson 2013-11-25 10:53:37 -05:00
parent 2d9adcd204
commit 8f9c847fbf

View File

@ -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.
*