diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-03-01 14:59:07 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-03-01 14:59:07 +0000 |
| commit | 211da8ea14e52e467a3935aa8a58aca0be7a44cc (patch) | |
| tree | f23a517041d9d4173c3c50c93a31b2f9da0f969b | |
| parent | a52c215dd1edfb35cf433282acbee0b3057b538c (diff) | |
| download | tor-211da8ea14e52e467a3935aa8a58aca0be7a44cc.tar.gz tor-211da8ea14e52e467a3935aa8a58aca0be7a44cc.zip | |
r18536@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.
svn:r13794
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/common/tortls.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -6,6 +6,10 @@ Changes in version 0.2.0.21-rc - 2008-0?-?? - 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 diff --git a/src/common/tortls.c b/src/common/tortls.c index 21108820d6..24e0a4071a 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -432,7 +432,7 @@ tor_tls_create_certificate(crypto_pk_env_t *rsa, * 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 ":" \ |