Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > 29f0aa80256359e806b307d2ee022eef > files > 4

libmcrypto-0.8.0-0.1.20100629svn3775.fc13.src.rpm

From ed8b73389536bb9717b3637816104d91f610c132 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Tue, 24 Aug 2010 10:09:10 +0400
Subject: [PATCH 3/3] Compile with OpenSSL 1.0

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
 source/openssl/DtlsSocket.cxx      |    2 +-
 source/openssl/TlsServerSocket.cxx |    2 +-
 source/openssl/TlsSocket.cxx       |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/openssl/DtlsSocket.cxx b/source/openssl/DtlsSocket.cxx
index 30e5f65..30f635d 100644
--- a/source/openssl/DtlsSocket.cxx
+++ b/source/openssl/DtlsSocket.cxx
@@ -438,7 +438,7 @@ bool OdtlsSocket::initDtlsSocket( void * &ctx,
 	SSL_library_init();
 	SSL_load_error_strings();
 
-	SSL_METHOD *method = DTLSv1_method();
+	const SSL_METHOD *method = DTLSv1_method();
 	ssl_ctx = SSL_CTX_new( method );
 	if (!ssl_ctx) {
 		printf("SSL_CTX_new failed\n");
diff --git a/source/openssl/TlsServerSocket.cxx b/source/openssl/TlsServerSocket.cxx
index e51370a..ec72e6b 100644
--- a/source/openssl/TlsServerSocket.cxx
+++ b/source/openssl/TlsServerSocket.cxx
@@ -89,7 +89,7 @@ void OsslServerSocket::init( MRef<ServerSocket*> sock,
 	type = MSOCKET_TYPE_TLS;
 	this->cert_db = cert_db_;
 	this->sock = sock;
-	SSL_METHOD * meth;
+	const SSL_METHOD * meth;
 	const unsigned char * sid_ctx = (const unsigned char *)"Minisip TLS";
 	
 	SSL_load_error_strings();
diff --git a/source/openssl/TlsSocket.cxx b/source/openssl/TlsSocket.cxx
index f7f3adb..06de8cb 100644
--- a/source/openssl/TlsSocket.cxx
+++ b/source/openssl/TlsSocket.cxx
@@ -121,7 +121,7 @@ void OsslSocket::OsslSocket_init( MRef<StreamSocket*> ssock, void * &ssl_ctx_,
 	type = MSOCKET_TYPE_TLS;
 	const unsigned char * sid_ctx = (const unsigned char *)"Minisip TLS";
 	SSLeay_add_ssl_algorithms();
-	SSL_METHOD *meth = SSLv23_client_method();
+	const SSL_METHOD *meth = SSLv23_client_method();
 	this->ssl_ctx = (SSL_CTX *)ssl_ctx_;
 	this->cert_db = cert_db_;
 	peerPort = ssock->getPeerPort();
-- 
1.7.2.1