diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-11-28 12:08:07 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-11-28 12:08:07 +0000 |
| commit | 50001f1757f97510e80cb1990e2f2d5b00144c2a (patch) | |
| tree | 9eda848e56fcb862fdfdf479adeccd95b6fe387a /kcontrol/crypto | |
| parent | 7344f33c4166ecd2a96147e56b5e5f7e5614d106 (diff) | |
| download | tdebase-50001f1757f97510e80cb1990e2f2d5b00144c2a.tar.gz tdebase-50001f1757f97510e80cb1990e2f2d5b00144c2a.zip | |
[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
Diffstat (limited to 'kcontrol/crypto')
| -rw-r--r-- | kcontrol/crypto/crypto.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
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; |