diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-30 11:31:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-30 11:31:35 -0600 |
| commit | a46db2a2d768b06acb462858c8925c411f8616ee (patch) | |
| tree | a23959ecbf1802c15c204257f17f855c27b9f232 /redhat/kdebase/r1201523.diff | |
| parent | 68d88671e2193517a9087ffdf326b81068dfee6a (diff) | |
| parent | 184f44c7e7a1039bb209e3c6a5abd079bcae8e98 (diff) | |
| download | tde-packaging-a46db2a2d768b06acb462858c8925c411f8616ee.tar.gz tde-packaging-a46db2a2d768b06acb462858c8925c411f8616ee.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/kdebase/r1201523.diff')
| -rw-r--r-- | redhat/kdebase/r1201523.diff | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/redhat/kdebase/r1201523.diff b/redhat/kdebase/r1201523.diff new file mode 100644 index 000000000..7272968b2 --- /dev/null +++ b/redhat/kdebase/r1201523.diff @@ -0,0 +1,31 @@ +Index: kdebase/kcontrol/crypto/crypto.cpp +=================================================================== +--- kdebase/kcontrol/crypto/crypto.cpp (revision 1201522) ++++ kdebase/kcontrol/crypto/crypto.cpp (revision 1201523) +@@ -2321,7 +2321,7 @@ + unsigned int i; + SSL_CTX *ctx; + SSL *ssl; +-SSL_METHOD *meth; ++const SSL_METHOD *meth; + + SSLv2Box->clear(); + SSLv3Box->clear(); +@@ -2337,7 +2337,7 @@ + CipherItem *item; + for (i=0; ; i++) { + int j, k; +- SSL_CIPHER *sc; ++ const SSL_CIPHER *sc; + sc = (meth->get_cipher)(i); + if (!sc) + break; +@@ -2365,7 +2365,7 @@ + + for (i=0; ; i++) { + int j, k; +- SSL_CIPHER *sc; ++ const SSL_CIPHER *sc; + sc = (meth->get_cipher)(i); + if (!sc) + break; |