>From 4ed38b3a6376ebc89f2fbcf7390cf24011673e26 Mon Sep 17 00:00:00 2001
From: Izik Eidus <iei...@redhat.com>
Date: Tue, 22 Dec 2009 06:52:14 +0200
Subject: [PATCH] spice: fix ssl compiling errors
(openssl api was changed, so lets have ifdef to compile in all cases)
Signed-off-by: Izik Eidus <iei...@redhat.com>
---
client/red_peer.cpp | 4 ++++
server/reds.c | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/client/red_peer.cpp b/client/red_peer.cpp
index dad035d..79409ed 100644
--- a/client/red_peer.cpp
+++ b/client/red_peer.cpp
@@ -132,7 +132,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 c10f0ca..2bb707b 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -3165,7 +3165,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;
--
1.6.5.2
------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev
_______________________________________________
Spice-space-devel mailing list
Spice-space-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spice-space-devel
