[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdelibs/kio/kssl
From:       George Staikos <staikos () kde ! org>
Date:       2003-02-14 16:59:43
[Download RAW message or body]

CVS commit by staikos: 

Fix #54634
Minor (arguably very minor) security impact.

CCMAIL: 54634-done@bugs.kde.org


  M +21 -6     ksslsettings.cc   1.24.2.2


--- kdelibs/kio/kssl/ksslsettings.cc  #1.24.2.1:1.24.2.2
@@ -149,8 +149,10 @@ QString clist = "";
  
       if (k == 0) {                   // do v2, then v3
-        if (!m_bUseSSLv2) continue;
+        if (!m_bUseSSLv2)
+          continue;
         m_cfg->setGroup("SSLv2");
       } else {
-        if (!m_bUseSSLv3) continue;
+        if (!m_bUseSSLv3)
+          continue;
         m_cfg->setGroup("SSLv3");
       }
@@ -170,5 +172,6 @@ QString clist = "";
       for(int i = 0;; i++) {
         SSL_CIPHER *sc = (meth->get_cipher)(i);
-        if (!sc) break;;
+        if (!sc)
+          break;
         tcipher.sprintf("cipher_%s", sc->name);
         int bits = d->kossl->SSL_CIPHER_get_bits(sc, NULL);
@@ -176,7 +179,9 @@ QString clist = "";
         if (m_cfg->readBoolEntry(tcipher, bits >= 56)) {
           CipherNode *xx = new CipherNode(sc->name,bits);
-          if (!cipherSort.contains(xx))
+          if (!cipherSort.contains(xx)) {
              cipherSort.inSort(xx);
-          else delete xx;
+          } else {
+             delete xx;
+          }
         } // if
       } // for  i
@@ -209,4 +213,15 @@ QString clist = "";
 #undef AdjustCipher
 
+    // Remove any ADH ciphers as per RFC2246
+    for (unsigned int i = 0; i < cipherSort.count(); i++) {
+      CipherNode *j = 0L;
+      while ((j = cipherSort.at(i)) != 0L) {
+        if (j->name.left(3) == "ADH") {
+          cipherSort.remove(j);
+        } else {
+          break;
+        }
+      }
+    } 
 
     // now assemble the list  cipher1:cipher2:cipher3:...:ciphern


[prev in list] [next in list] [prev in thread] [next in thread]