From 50001f1757f97510e80cb1990e2f2d5b00144c2a Mon Sep 17 00:00:00 2001
From: samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 28 Nov 2010 12:08:07 +0000
Subject: [kdebase/kcontrol] make it compatibile with openssl < 1.0

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1201705 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/crypto/crypto.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'kcontrol')

diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index ae3f9e0ca..d39c09752 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -2316,12 +2316,19 @@ void KCryptoConfig::slotGeneratePersonal() {
 
 
 #ifdef HAVE_SSL
+
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+#define SSL_CONST const
+#else
+#define SSL_CONST
+#endif
+
 // This gets all the available ciphers from OpenSSL
 bool KCryptoConfig::loadCiphers() {
 unsigned int i;
 SSL_CTX *ctx;
 SSL *ssl;
-const SSL_METHOD *meth;
+SSL_CONST SSL_METHOD *meth;
 
   SSLv2Box->clear();
   SSLv3Box->clear();
@@ -2337,7 +2344,7 @@ const SSL_METHOD *meth;
   CipherItem *item;
   for (i=0; ; i++) {
     int j, k;
-    const SSL_CIPHER *sc;
+    SSL_CONST SSL_CIPHER *sc;
     sc = (meth->get_cipher)(i);
     if (!sc)
       break;
@@ -2365,7 +2372,7 @@ const SSL_METHOD *meth;
 
   for (i=0; ; i++) {
     int j, k;
-    const SSL_CIPHER *sc;
+    SSL_CONST SSL_CIPHER *sc;
     sc = (meth->get_cipher)(i);
     if (!sc)
       break;
-- 
cgit v1.2.1