diff options
author | Izik Eidus <ieidus@redhat.com> | 2009-12-22 06:52:14 +0200 |
---|---|---|
committer | Yaniv Kamay <ykamay@redhat.com> | 2010-01-03 17:47:13 +0200 |
commit | 6333e034a3dbe00a9826cb5d802477dd78047221 (patch) | |
tree | da5be634eea904280af126294cfbe475bcdcba01 | |
parent | 6b065f80dee389490c20289beb97415b06108d02 (diff) | |
download | spice-6333e034a3dbe00a9826cb5d802477dd78047221.tar.gz spice-6333e034a3dbe00a9826cb5d802477dd78047221.tar.xz spice-6333e034a3dbe00a9826cb5d802477dd78047221.zip |
spice: fix ssl compiling errors
(openssl api was changed, so lets have ifdef to compile in all cases)
Signed-off-by: Izik Eidus <ieidus@redhat.com>
-rw-r--r-- | client/red_peer.cpp | 4 | ||||
-rw-r--r-- | server/reds.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/client/red_peer.cpp b/client/red_peer.cpp index e20d5ca6..d0868725 100644 --- a/client/red_peer.cpp +++ b/client/red_peer.cpp @@ -174,7 +174,11 @@ void RedPeer::connect_secure(const ConnectionOptions& options, uint32_t ip) ASSERT(_ctx == NULL && _ssl == NULL && _peer != INVALID_SOCKET); try { +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + const SSL_METHOD *ssl_method = TLSv1_method(); +#else SSL_METHOD *ssl_method = TLSv1_method(); +#endif _ctx = SSL_CTX_new(ssl_method); if (_ctx == NULL) { diff --git a/server/reds.c b/server/reds.c index 54225dc8..38a65387 100644 --- a/server/reds.c +++ b/server/reds.c @@ -3163,7 +3163,11 @@ static void openssl_thread_setup() static void reds_init_ssl() { +#if OPENSSL_VERSION_NUMBER >= 0x10000000L + const SSL_METHOD *ssl_method; +#else SSL_METHOD *ssl_method; +#endif int return_code; long ssl_options = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3; |