summaryrefslogtreecommitdiffstats
path: root/redhat/tdebase/r1201705.diff
blob: c7dff1e6ef8b7551f80c19ddc0c64bb578de804f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
Index: kdebase/kcontrol/crypto/crypto.cpp
===================================================================
--- kdebase/kcontrol/crypto/crypto.cpp	(revision 1201704)
+++ kdebase/kcontrol/crypto/crypto.cpp	(revision 1201705)
@@ -2316,12 +2316,19 @@
 
 
 #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 @@
   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 @@
 
   for (i=0; ; i++) {
     int j, k;
-    const SSL_CIPHER *sc;
+    SSL_CONST SSL_CIPHER *sc;
     sc = (meth->get_cipher)(i);
     if (!sc)
       break;