Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d414cc4056c1dc276f66eebc6de90f1150be4f01

commit d414cc4056c1dc276f66eebc6de90f1150be4f01
Author: kikadf <[email protected]>
Date:   Tue Oct 28 10:16:04 2014 +0100

konversation-1.5-2-x86_64

* Fix CVE-2014-8483

diff --git a/source/kde-extra/konversation/CVE-2014-8483.patch 
b/source/kde-extra/konversation/CVE-2014-8483.patch
new file mode 100644
index 0000000..246d9e2
--- /dev/null
+++ b/source/kde-extra/konversation/CVE-2014-8483.patch
@@ -0,0 +1,53 @@
+commit 1f55cee8b3d0956adc98834f7b5832e48e077ed7
+Author: Eike Hein <[email protected]>
+Date:   Fri Oct 24 13:57:54 2014 +0200
+
+    Do a bounds check on ECB blocks.
+
+    Blindly assuming they're the expected 12 chars can lead to a crash
+    on malformed input.
+
+    Original patch by Manuel Nickschas for Quassel, who incorporated
+    the original Konversation code into Quassel in 2009.
+
+    Upstream:
+    
https://github.com/quassel/quassel/commit/8b5ecd226f9208af3074b33d3b7cf5e14f55b138
+
+diff --git a/src/cipher.cpp b/src/cipher.cpp
+index 514e390..019b0ac 100644
+--- a/src/cipher.cpp
++++ b/src/cipher.cpp
+@@ -353,8 +353,12 @@ namespace Konversation
+         }
+         else
+         {
++        // ECB Blowfish encodes in blocks of 12 chars, so anything else is 
malformed input
++        if ((temp.length() % 12) != 0)
++            return cipherText;
++
+             temp = b64ToByte(temp);
+-            while((temp.length() % 8) != 0) temp.append('\0');
++            while ((temp.length() % 8) != 0) temp.append('\0');
+         }
+
+         QCA::Direction dir = (direction) ? QCA::Encode : QCA::Decode;
+@@ -362,11 +366,17 @@ namespace Konversation
+         QByteArray temp2 = 
cipher.update(QCA::MemoryRegion(temp)).toByteArray();
+         temp2 += cipher.final().toByteArray();
+
+-        if(!cipher.ok())
++        if (!cipher.ok())
+             return cipherText;
+
+-        if(direction)
++        if (direction)
++        {
++            // Sanity check
++            if ((temp2.length() % 8) != 0)
++                return cipherText;
++
+             temp2 = byteToB64(temp2);
++        }
+
+         return temp2;
+     }
diff --git a/source/kde-extra/konversation/FrugalBuild 
b/source/kde-extra/konversation/FrugalBuild
index c2b086d..e0d18f1 100644
--- a/source/kde-extra/konversation/FrugalBuild
+++ b/source/kde-extra/konversation/FrugalBuild
@@ -6,7 +6,7 @@ options+=('asneeded')

pkgname=konversation
pkgver=1.5
-pkgrel=1
+pkgrel=2
pkgdesc="Konversation is an IRC client for KDE"
url="http://$pkgname.kde.org/";
groups=('kde-extra')
@@ -21,4 +21,10 @@ makedepends=("${makedepends[@]}" 
"kdepimlibs-compiletime>=$_F_kde_ver" "kdebase-
"kdelibs>=$_F_kde_ver" "libkdeclarative>=$_F_kde_ver" "kdepimlibs>=$_F_kde_ver")
sha1sums=('3955a43758750b63d84299a9d9a5933b73e5492b')

+# FSA fix ***
+source=(${source[@]} CVE-2014-8483.patch)
+sha1sums=(${sha1sums[@]} '6f2355409829a501259474c3983c51c2cc26269a')
+# ***********
+
+
# optimization OK
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to