diff options
| author | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
|---|---|---|
| committer | Robert Xu <rxu@linux-zdwj.site> | 2012-02-01 00:31:59 -0500 |
| commit | f599f39717d771b8b7a2aff006cda6c31e8b12da (patch) | |
| tree | f601e3c0303a193cda6f8c6f956619dda9673c70 /opensuse/core/tdebase/openssl1.patch | |
| parent | ead369ac94473139a2320a1c90cda64dd887b94a (diff) | |
| parent | 27c9e783c6283f8916ebee3a23c6d1ba909a5126 (diff) | |
| download | tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.tar.gz tde-packaging-f599f39717d771b8b7a2aff006cda6c31e8b12da.zip | |
Merge branch 'suse'
Diffstat (limited to 'opensuse/core/tdebase/openssl1.patch')
| -rw-r--r-- | opensuse/core/tdebase/openssl1.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/opensuse/core/tdebase/openssl1.patch b/opensuse/core/tdebase/openssl1.patch new file mode 100644 index 000000000..f1d250c44 --- /dev/null +++ b/opensuse/core/tdebase/openssl1.patch @@ -0,0 +1,40 @@ +--- 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*? |