summaryrefslogtreecommitdiffstats
path: root/redhat/tdebase/r1201705.diff
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/tdebase/r1201705.diff')
-rw-r--r--redhat/tdebase/r1201705.diff43
1 files changed, 0 insertions, 43 deletions
diff --git a/redhat/tdebase/r1201705.diff b/redhat/tdebase/r1201705.diff
deleted file mode 100644
index c7dff1e6e..000000000
--- a/redhat/tdebase/r1201705.diff
+++ /dev/null
@@ -1,43 +0,0 @@
-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;