Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=198f3c785b6e73bc6627c64f7451ac301bdb680b
commit 198f3c785b6e73bc6627c64f7451ac301bdb680b Author: kikadf <[email protected]> Date: Tue Oct 28 10:17:29 2014 +0100 quassel-0.9.2-2-x86_64 * Fix CVE-2014-8483 diff --git a/source/kde-extra/quassel/CVE-2014-8483.patch b/source/kde-extra/quassel/CVE-2014-8483.patch new file mode 100644 index 0000000..3c15a71 --- /dev/null +++ b/source/kde-extra/quassel/CVE-2014-8483.patch @@ -0,0 +1,47 @@ +commit 8b5ecd226f9208af3074b33d3b7cf5e14f55b138 +Author: Manuel Nickschas <[email protected]> +Date: Tue Oct 21 21:20:07 2014 +0200 + + Check for invalid input in encrypted buffers + + The ECB Blowfish decryption function assumed that encrypted input would + always come in blocks of 12 characters, as specified. However, buggy + clients or annoying people may not adhere to that assumption, causing + the core to crash while trying to process the invalid base64 input. + + With this commit we make sure that we're not overstepping the bounds of + the input string while decoding it; instead we bail out early and display + the original input. Fixes #1314. + + Thanks to Tucos for finding that one! + +diff --git a/src/core/cipher.cpp b/src/core/cipher.cpp +index 7cc75d0..7d1fe46 100644 +--- a/src/core/cipher.cpp ++++ b/src/core/cipher.cpp +@@ -364,6 +364,10 @@ QByteArray Cipher::blowfishECB(QByteArray cipherText, bool direction) + } + 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'); + } +@@ -376,8 +380,13 @@ QByteArray Cipher::blowfishECB(QByteArray cipherText, bool direction) + 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/quassel/FrugalBuild b/source/kde-extra/quassel/FrugalBuild index 67325f2..92770e2 100644 --- a/source/kde-extra/quassel/FrugalBuild +++ b/source/kde-extra/quassel/FrugalBuild @@ -3,7 +3,7 @@ pkgname=quassel pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A modern, cross-platform, distributed IRC client." url="http://quassel-irc.org" depends=('libqtwebkit' 'libknotify' 'libqtsql' 'qca' 'libkdewidgets' "kdelibs>=$_F_kde_ver") @@ -17,6 +17,11 @@ Finclude cmake gnome-scriptlet sha1sums=('b32c76a4fc608c2e3a86a02456b4f4e996a815b3') replaces=('conspire') +# FSA fix *** +source=(${source[@]} CVE-2014-8483.patch) +sha1sums=(${sha1sums[@]} 'cc37f75d36baa17799e41d8c220ead8aabd749b0') +# *********** + build() { CMake_build -DWITH_KDE=1 Fbuild_gnome_scriptlet _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
