diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-10-25 16:54:56 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-10-25 16:54:56 +0000 |
| commit | 7da93b80ca7a6bafdc1caee71863db3eee99da4e (patch) | |
| tree | 2891fc4e0e4aebb39d62f1f69a3eddf4121761a0 /src/common/tortls.c | |
| parent | d5a0eeb57e174cd7182137928fa05a291df7a780 (diff) | |
| download | tor-7da93b80ca7a6bafdc1caee71863db3eee99da4e.tar.gz tor-7da93b80ca7a6bafdc1caee71863db3eee99da4e.zip | |
r16159@catbus: nickm | 2007-10-25 12:53:38 -0400
Drop support for OpenSSL 0.9.6.
svn:r12191
Diffstat (limited to 'src/common/tortls.c')
| -rw-r--r-- | src/common/tortls.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index eed35cd32d..986265da9b 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -337,8 +337,7 @@ tor_tls_create_certificate(crypto_pk_env_t *rsa, #define CIPHER_LIST (TLS1_TXT_DHE_RSA_WITH_AES_128_SHA ":" \ SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA) #else -/* We're running OpenSSL before 0.9.7. We only support 3DES. */ -#define CIPHER_LIST SSL3_TXT_EDH_RSA_DES_192_CBC3_SHA +#error "Tor requires OpenSSL version 0.9.7 or later, for AES support." #endif /** Create a new TLS context for use with Tor TLS handshakes. @@ -844,12 +843,6 @@ int tor_tls_get_pending_bytes(tor_tls_t *tls) { tor_assert(tls); -#if OPENSSL_VERSION_NUMBER < 0x0090700fl - if (tls->ssl->rstate == SSL_ST_READ_BODY) - return 0; - if (tls->ssl->s3->rrec.type != SSL3_RT_APPLICATION_DATA) - return 0; -#endif return SSL_pending(tls->ssl); } |