You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
41 lines
1021 B
41 lines
1021 B
14 years ago
|
--- kcontrol/crypto/crypto.cpp.orig 2006-10-02 06:31:49.000000000 +1300
|
||
|
|
+++ kcontrol/crypto/crypto.cpp
|
||
|
|
@@ -2321,7 +2321,11 @@ bool KCryptoConfig::loadCiphers() {
|
||
|
|
unsigned int i;
|
||
|
|
SSL_CTX *ctx;
|
||
|
|
SSL *ssl;
|
||
|
|
+#if OPENSSL_VERSION_NUMBER < 0x00909000L
|
||
|
|
SSL_METHOD *meth;
|
||
|
|
+#else
|
||
|
|
+const SSL_METHOD *meth;
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
SSLv2Box->clear();
|
||
|
|
SSLv3Box->clear();
|
||
|
|
@@ -2337,8 +2341,10 @@ SSL_METHOD *meth;
|
||
|
|
CipherItem *item;
|
||
|
|
for (i=0; ; i++) {
|
||
|
|
int j, k;
|
||
|
|
- SSL_CIPHER *sc;
|
||
|
|
- sc = (meth->get_cipher)(i);
|
||
|
|
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||
|
|
+ const
|
||
|
|
+#endif
|
||
|
|
+ SSL_CIPHER *sc = (meth->get_cipher)(i);
|
||
|
|
if (!sc)
|
||
|
|
break;
|
||
|
|
// Leak of sc*?
|
||
|
|
@@ -2365,8 +2371,10 @@ SSL_METHOD *meth;
|
||
|
|
|
||
|
|
for (i=0; ; i++) {
|
||
|
|
int j, k;
|
||
|
|
- SSL_CIPHER *sc;
|
||
|
|
- sc = (meth->get_cipher)(i);
|
||
|
|
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
|
||
|
|
+ const
|
||
|
|
+#endif
|
||
|
|
+ SSL_CIPHER *sc = (meth->get_cipher)(i);
|
||
|
|
if (!sc)
|
||
|
|
break;
|
||
|
|
// Leak of sc*?
|