Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-1.9.git;a=commitdiff;h=5bdc5d73c0cb236e27388805d83b866b9e523949
commit 5bdc5d73c0cb236e27388805d83b866b9e523949 Author: kikadf <[email protected]> Date: Tue Oct 28 10:21:43 2014 +0100 quassel-0.8.0-3arcturus1-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..c91986a --- /dev/null +++ b/source/kde-extra/quassel/CVE-2014-8483.patch @@ -0,0 +1,39 @@ +diff -Naur quassel-0.8.0/src/core/cipher.cpp quassel-0.8.0.new/src/core/cipher.cpp +--- quassel-0.8.0/src/core/cipher.cpp 2012-03-20 21:39:20.000000000 +0100 ++++ quassel-0.8.0.new/src/core/cipher.cpp 2014-10-28 10:11:28.736888116 +0100 +@@ -342,8 +342,12 @@ + } + 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; +@@ -351,12 +355,18 @@ + QByteArray temp2 = cipher.update(QCA::MemoryRegion(temp)).toByteArray(); + temp2 += cipher.final().toByteArray(); + +- if(!cipher.ok()) ++ if (!cipher.ok()) + return cipherText; + +- if(direction) +- temp2 = byteToB64(temp2); ++ 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 98e55aa..6c1207e 100644 --- a/source/kde-extra/quassel/FrugalBuild +++ b/source/kde-extra/quassel/FrugalBuild @@ -3,7 +3,7 @@ pkgname=quassel pkgver=0.8.0 -pkgrel=2 +pkgrel=3arcturus1 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=('b74967fa9f19b5d7c708279075cc0ef3a3dbbe8b') replaces=('conspire') +# FSA fix *** +source=(${source[@]} CVE-2014-8483.patch) +sha1sums=(${sha1sums[@]} '9cb9e1d795216ef783fe6ff04f34acf057bd5fae') +# *********** + build() { CMake_build -DWITH_KDE=1 Fbuild_gnome_scriptlet _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
