Archives
Archives
| From: | "Samuli Suominen (ssuominen)" <ssuominen@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-p2p/dclib/files: dclib-0.3.23-openssl-1.patch |
| Date: | Thu, 29 Jul 2010 08:45:05 |
| Message-Id: | 20100729084501.F09832C5F2@corvid.gentoo.org |
| 1 | ssuominen 10/07/29 08:45:01 |
| 2 | |
| 3 | Added: dclib-0.3.23-openssl-1.patch |
| 4 | Log: |
| 5 | Fix building with OpenSSL >= 1.0.0 wrt #330291 by Diego E. Pettenò. |
| 6 | (Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 | |
| 8 | Revision Changes Path |
| 9 | 1.1 net-p2p/dclib/files/dclib-0.3.23-openssl-1.patch |
| 10 | |
| 11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/dclib/files/dclib-0.3.23-openssl-1.patch?rev=1.1&view=markup |
| 12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-p2p/dclib/files/dclib-0.3.23-openssl-1.patch?rev=1.1&content-type=text/plain |
| 13 | |
| 14 | Index: dclib-0.3.23-openssl-1.patch |
| 15 | =================================================================== |
| 16 | http://bugs.gentoo.org/330291 |
| 17 | |
| 18 | --- dclib/core/cssl.cpp |
| 19 | +++ dclib/core/cssl.cpp |
| 20 | @@ -86,7 +86,11 @@ |
| 21 | /** */ |
| 22 | SSL_CTX * CSSL::InitClientCTX() |
| 23 | { |
| 24 | + #if OPENSSL_VERSION_NUMBER >= 0x10000000L |
| 25 | + const SSL_METHOD *method; |
| 26 | + #else |
| 27 | SSL_METHOD *method; |
| 28 | + #endif |
| 29 | SSL_CTX *ctx = NULL; |
| 30 | |
| 31 | method = SSLv23_client_method(); /* Create new client-method instance */ |
| 32 | @@ -109,7 +113,11 @@ |
| 33 | /** */ |
| 34 | SSL_CTX * CSSL::InitServerCTX() |
| 35 | { |
| 36 | + #if OPENSSL_VERSION_NUMBER >= 0x10000000L |
| 37 | + const SSL_METHOD *method; |
| 38 | + #else |
| 39 | SSL_METHOD *method; |
| 40 | + #endif |
| 41 | SSL_CTX *ctx = NULL; |
| 42 | |
| 43 | method = SSLv23_server_method(); /* Create new client-method instance */ |
| 44 | @@ -130,7 +138,11 @@ |
| 45 | /** */ |
| 46 | SSL_CTX * CSSL::NewTLSv1ClientCTX() |
| 47 | { |
| 48 | + #if OPENSSL_VERSION_NUMBER >= 0x10000000L |
| 49 | + const SSL_METHOD * method = TLSv1_client_method(); |
| 50 | + #else |
| 51 | SSL_METHOD * method = TLSv1_client_method(); |
| 52 | + #endif |
| 53 | SSL_CTX * ctx = NULL; |
| 54 | |
| 55 | if ( method != NULL ) |
| 56 | @@ -149,7 +161,11 @@ |
| 57 | /** */ |
| 58 | SSL_CTX * CSSL::NewTLSv1ServerCTX() |
| 59 | { |
| 60 | + #if OPENSSL_VERSION_NUMBER >= 0x10000000L |
| 61 | + const SSL_METHOD * method = TLSv1_server_method(); |
| 62 | + #else |
| 63 | SSL_METHOD * method = TLSv1_server_method(); |
| 64 | + #endif |
| 65 | SSL_CTX * ctx = NULL; |
| 66 | |
| 67 | if ( method != NULL ) |