From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CCE2B1381F3 for ; Sun, 16 Jun 2013 12:35:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5EB1DE078C; Sun, 16 Jun 2013 12:35:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7B03E078C for ; Sun, 16 Jun 2013 12:35:08 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C219233E007 for ; Sun, 16 Jun 2013 12:35:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6A0E3E468F for ; Sun, 16 Jun 2013 12:35:06 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1371386101.9562807e5774b7dc42c890440c9813ca0a032c4b.johu@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kdeplasma-addons/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch X-VCS-Directories: kde-base/kdeplasma-addons/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 9562807e5774b7dc42c890440c9813ca0a032c4b X-VCS-Branch: master Date: Sun, 16 Jun 2013 12:35:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d21cf160-cc90-4338-b8a2-9034f12240fb X-Archives-Hash: b879cc7578257ac24e27b727fca58dd2 commit: 9562807e5774b7dc42c890440c9813ca0a032c4b Author: Johannes Huber gentoo org> AuthorDate: Sun Jun 16 12:35:01 2013 +0000 Commit: Johannes Huber gentoo org> CommitDate: Sun Jun 16 12:35:01 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9562807e [kde-base/kdeplasma-addons] Remove unused patch. Package-Manager: portage-2.2.0_alpha180 --- .../kdeplasma-addons-4.10.3-cve-2013-2120.patch | 81 ---------------------- 1 file changed, 81 deletions(-) diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch deleted file mode 100644 index 88d7879..0000000 --- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.10.3-cve-2013-2120.patch +++ /dev/null @@ -1,81 +0,0 @@ -From d84015218bf78b707650cf5426ae1a469d37c29d Mon Sep 17 00:00:00 2001 -From: Aaron Seigo -Date: Mon, 3 Jun 2013 19:16:32 +0200 -Subject: [PATCH] use KRandom, avoid modulo bias - ---- - applets/paste/pastemacroexpander.cpp | 29 ++++++++++++++++++++++------- - 1 file changed, 22 insertions(+), 7 deletions(-) - -diff --git a/applets/paste/pastemacroexpander.cpp b/applets/paste/pastemacroexpander.cpp -index ea6163f..d0a8b49 100644 ---- a/applets/paste/pastemacroexpander.cpp -+++ b/applets/paste/pastemacroexpander.cpp -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - - class PasteMacroExpanderSingleton - { -@@ -142,35 +143,49 @@ QString PasteMacroExpander::password(const QString& args) - << "01234567890" - << "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~"; - -- int charCount; -+ int charCount = 8; - QString chars; - QString result; - - if (a.count() > 0) { -- charCount = qMax(a[0].trimmed().toInt(), 1); -- } else { -- charCount = 8; -+ charCount = qMax(a[0].trimmed().toInt(), 8); - } -+ - if (a.count() < 2) { - chars = characterSets.join(""); - } -+ - if (a.count() > 1) { - chars += (a[1].trimmed() == "true") ? characterSets[0] : ""; - } -+ - if (a.count() > 2) { - chars += (a[2].trimmed() == "true") ? characterSets[1] : ""; - } -+ - if (a.count() > 3) { - chars += (a[3].trimmed() == "true") ? characterSets[2] : ""; - } -+ - if (a.count() > 4) { - chars += (a[4].trimmed() == "true") ? characterSets[3] : ""; - } - -- QDateTime now = QDateTime::currentDateTime(); -- qsrand(now.toTime_t() / now.time().msec()); -+ const int setSize = chars.count(); -+ const int top = (RAND_MAX / setSize) * setSize; -+ kDebug() << "topping out at " << setSize << RAND_MAX << top; - for (int i = 0; i < charCount; ++i) { -- result += chars[qrand() % chars.count()]; -+ // to prevent modulo bias, discard random numbers at the -+ // 'top end' of INT_MAX -+ int rand = -1; -+ do { -+ if (rand > 0) { -+ kDebug() << "Ha!" << rand; -+ } -+ rand = KRandom::random(); -+ } while (rand >= top); -+ -+ result += chars[rand % setSize]; - } - //kDebug() << result; - return result; --- -1.8.2.1 -