소스 검색

r18535@catbus: nickm | 2008-03-01 09:58:33 -0500
Whoo. People diagnosed and fixed bug 616. See changelog for details. Bugfix on 0.2.0.20-rc.


svn:r13793

Nick Mathewson 18 년 전
부모
커밋
77d1654c50
2개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 4 0
      ChangeLog
  2. 1 1
      src/common/tortls.c

+ 4 - 0
ChangeLog

@@ -3,6 +3,10 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
     - Downgrade assert in connection_buckets_decrement() to a log message.
     - 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
       This may help us solve bug 614, and in any case will make its symptoms
       less severe.  Bugfix on 0.2.0.20-rc.
       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
 Changes in version 0.2.0.20-rc - 2008-02-24

+ 1 - 1
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
  * SSL3_TXT_RSA_NULL_SHA.  If you do this, you won't be able to communicate
  * with any of the "real" Tors, though. */
  * with any of the "real" Tors, though. */
 
 
-#if OPENSSL_VERSION_NUMBER >= 0x00908000l
+#if OPENSSL_VERSION_NUMBER >= 0x00908020l
 #define CLIENT_CIPHER_LIST                         \
 #define CLIENT_CIPHER_LIST                         \
   (TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA ":"   \
   (TLS1_TXT_ECDHE_ECDSA_WITH_AES_256_CBC_SHA ":"   \
    TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA ":"     \
    TLS1_TXT_ECDHE_RSA_WITH_AES_256_CBC_SHA ":"     \