Update patches

5 files changed, 143 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc496df59570..297e298c8c37 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,9 +20,10 @@ pkgbase = keepassx2-twofish
 	source = https://www.keepassx.org/dev/attachments/download/100/keepassx-2.0-beta1.tar.gz
 	source = 0001-Add-support-for-Twofish-in-KeePass2-code.patch
 	source = 0002-Add-Algorithm-label-ComboBox-in-Database-settings-fo.patch
+	source = 0003-Use-the-correct-cipher-for-benchmark.patch
 	sha256sums = bce1933c48fd33ef8043dd526d769fd9c454d1b63464c82a35e1f7a8689acbf2
-	sha256sums = 901d4dff35f9e21c77cbd0dfe962ca00873c85cb1566bcccfd6492cada94220f
-	sha256sums = 99a52bb7f2b9b0c00690a5243d74c09667cc2d6f7580ecfc45b6fd4961a7dfb6
+	sha256sums = 68cfe8e862e35cd022becf3c81d67d4fa5f8b77fa84543042307e50f512152cd
+	sha256sums = db0b0a542fd45a7110f33cf23596c8e4bc70bee7ddf1b6f1c01a204245a1bed8
 
 pkgname = keepassx2-twofish
 
diff --git a/0001-Add-support-for-Twofish-in-KeePass2-code.patch b/0001-Add-support-for-Twofish-in-KeePass2-code.patch
index 604290e31bfd..f18f81106bda 100644
--- a/0001-Add-support-for-Twofish-in-KeePass2-code.patch
+++ b/0001-Add-support-for-Twofish-in-KeePass2-code.patch
@@ -1,7 +1,7 @@
 From c259ce3d6ae1476a8ad8b6093fc7c81efc24173e Mon Sep 17 00:00:00 2001
 From: Timothy Redaelli <timothy.redaelli@gmail.com>
 Date: Tue, 4 Aug 2015 15:18:41 +0200
-Subject: [PATCH 1/2] Add support for Twofish in KeePass2 code
+Subject: [PATCH 1/3] Add support for Twofish in KeePass2 code
 
 ---
  src/format/KeePass2.h         |  1 +
diff --git a/0002-Add-Algorithm-label-ComboBox-in-Database-settings-fo.patch b/0002-Add-Algorithm-label-ComboBox-in-Database-settings-fo.patch
index d5524b43a7a2..7bad02c2f1da 100644
--- a/0002-Add-Algorithm-label-ComboBox-in-Database-settings-fo.patch
+++ b/0002-Add-Algorithm-label-ComboBox-in-Database-settings-fo.patch
@@ -1,7 +1,7 @@
 From 2bd441b8ef1f78f5a8e9d3a2aa452f47608b3fab Mon Sep 17 00:00:00 2001
 From: Timothy Redaelli <timothy.redaelli@gmail.com>
 Date: Wed, 5 Aug 2015 15:23:49 +0200
-Subject: [PATCH 2/2] Add Algorithm label / ComboBox in Database settings form
+Subject: [PATCH 2/3] Add Algorithm label / ComboBox in Database settings form
 
 ---
  src/gui/DatabaseSettingsWidget.cpp | 13 ++++++
diff --git a/0003-Use-the-correct-cipher-for-benchmark.patch b/0003-Use-the-correct-cipher-for-benchmark.patch
new file mode 100644
index 000000000000..ea306e230cfb
--- /dev/null
+++ b/0003-Use-the-correct-cipher-for-benchmark.patch
@@ -0,0 +1,132 @@
+From bb693692988026dabe68e8294fe9e17f99fe1499 Mon Sep 17 00:00:00 2001
+From: Timothy Redaelli <timothy.redaelli@gmail.com>
+Date: Thu, 6 Aug 2015 15:12:37 +0200
+Subject: [PATCH 3/3] Use the correct cipher for benchmark
+
+---
+ src/gui/DatabaseSettingsWidget.cpp | 10 +++++++++-
+ src/keys/CompositeKey.cpp          | 11 ++++++-----
+ src/keys/CompositeKey.h            |  3 ++-
+ src/keys/CompositeKey_p.h          |  4 +++-
+ 4 files changed, 20 insertions(+), 8 deletions(-)
+
+diff --git a/src/gui/DatabaseSettingsWidget.cpp b/src/gui/DatabaseSettingsWidget.cpp
+index 34c55b5c..ee50eae3 100644
+--- a/src/gui/DatabaseSettingsWidget.cpp
++++ b/src/gui/DatabaseSettingsWidget.cpp
+@@ -21,9 +21,11 @@
+ #include "core/Database.h"
+ #include "core/Group.h"
+ #include "core/Metadata.h"
++#include "crypto/SymmetricCipher.h"
+ #include "format/KeePass2.h"
+ #include "keys/CompositeKey.h"
+ 
++
+ DatabaseSettingsWidget::DatabaseSettingsWidget(QWidget* parent)
+     : DialogyWidget(parent)
+     , m_ui(new Ui::DatabaseSettingsWidget())
+@@ -143,7 +145,13 @@ void DatabaseSettingsWidget::reject()
+ void DatabaseSettingsWidget::transformRoundsBenchmark()
+ {
+     QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+-    int rounds = CompositeKey::transformKeyBenchmark(1000);
++    int rounds;
++    if (m_ui->AlgorithmComboBox->currentIndex() == 0) {
++        rounds = CompositeKey::transformKeyBenchmark(1000, SymmetricCipher::Aes256);
++    }
++    else {
++        rounds = CompositeKey::transformKeyBenchmark(1000, SymmetricCipher::Twofish);
++    }
+     if (rounds != -1) {
+         m_ui->transformRoundsSpinBox->setValue(rounds);
+     }
+diff --git a/src/keys/CompositeKey.cpp b/src/keys/CompositeKey.cpp
+index 5bf9cae5..4326449b 100644
+--- a/src/keys/CompositeKey.cpp
++++ b/src/keys/CompositeKey.cpp
+@@ -145,10 +145,10 @@ void CompositeKey::addKey(const Key& key)
+     m_keys.append(key.clone());
+ }
+ 
+-int CompositeKey::transformKeyBenchmark(int msec)
++int CompositeKey::transformKeyBenchmark(int msec, SymmetricCipher::Algorithm algo)
+ {
+-    TransformKeyBenchmarkThread thread1(msec);
+-    TransformKeyBenchmarkThread thread2(msec);
++    TransformKeyBenchmarkThread thread1(msec, algo);
++    TransformKeyBenchmarkThread thread2(msec, algo);
+ 
+     thread1.start();
+     thread2.start();
+@@ -160,8 +160,9 @@ int CompositeKey::transformKeyBenchmark(int msec)
+ }
+ 
+ 
+-TransformKeyBenchmarkThread::TransformKeyBenchmarkThread(int msec)
++TransformKeyBenchmarkThread::TransformKeyBenchmarkThread(int msec, SymmetricCipher::Algorithm algo)
+     : m_msec(msec)
++    , algo(algo)
+     , m_rounds(0)
+ {
+     Q_ASSERT(msec > 0);
+@@ -178,7 +179,7 @@ void TransformKeyBenchmarkThread::run()
+     QByteArray seed = QByteArray(32, '\x4B');
+     QByteArray iv(16, 0);
+ 
+-    SymmetricCipher cipher(SymmetricCipher::Aes256, SymmetricCipher::Ecb,
++    SymmetricCipher cipher(algo, SymmetricCipher::Ecb,
+                            SymmetricCipher::Encrypt);
+     cipher.init(seed, iv);
+ 
+diff --git a/src/keys/CompositeKey.h b/src/keys/CompositeKey.h
+index 3290d367..0163c914 100644
+--- a/src/keys/CompositeKey.h
++++ b/src/keys/CompositeKey.h
+@@ -20,6 +20,7 @@
+ 
+ #include <QList>
+ 
++#include "crypto/SymmetricCipher.h"
+ #include "keys/Key.h"
+ 
+ class CompositeKey : public Key
+@@ -38,7 +39,7 @@ public:
+                          bool* ok, QString* errorString) const;
+     void addKey(const Key& key);
+ 
+-    static int transformKeyBenchmark(int msec);
++    static int transformKeyBenchmark(int msec, SymmetricCipher::Algorithm algo);
+ 
+ private:
+     static QByteArray transformKeyRaw(const QByteArray& key, const QByteArray& seed,
+diff --git a/src/keys/CompositeKey_p.h b/src/keys/CompositeKey_p.h
+index 27fa7abc..9f321b2c 100644
+--- a/src/keys/CompositeKey_p.h
++++ b/src/keys/CompositeKey_p.h
+@@ -19,19 +19,21 @@
+ #define KEEPASSX_COMPOSITEKEY_P_H
+ 
+ #include <QThread>
++#include "crypto/SymmetricCipher.h"
+ 
+ class TransformKeyBenchmarkThread : public QThread
+ {
+     Q_OBJECT
+ 
+ public:
+-    explicit TransformKeyBenchmarkThread(int msec);
++    explicit TransformKeyBenchmarkThread(int msec, SymmetricCipher::Algorithm algo);
+     int rounds();
+ 
+ protected:
+     void run();
+ 
+ private:
++    SymmetricCipher::Algorithm algo;
+     int m_msec;
+     int m_rounds;
+ };
+-- 
+2.5.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 70cbdafc881d..fa97c6c90306 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,10 +16,12 @@ options=(!emptydirs)
 install=keepassx2.install
 source=("https://www.keepassx.org/dev/attachments/download/100/keepassx-2.0-${pkgver}.tar.gz"
         0001-Add-support-for-Twofish-in-KeePass2-code.patch
-        0002-Add-Algorithm-label-ComboBox-in-Database-settings-fo.patch)
+        0002-Add-Algorithm-label-ComboBox-in-Database-settings-fo.patch
+        0003-Use-the-correct-cipher-for-benchmark.patch)
 sha256sums=('bce1933c48fd33ef8043dd526d769fd9c454d1b63464c82a35e1f7a8689acbf2'
-            '901d4dff35f9e21c77cbd0dfe962ca00873c85cb1566bcccfd6492cada94220f'
-            '99a52bb7f2b9b0c00690a5243d74c09667cc2d6f7580ecfc45b6fd4961a7dfb6')
+            '68cfe8e862e35cd022becf3c81d67d4fa5f8b77fa84543042307e50f512152cd'
+            'db0b0a542fd45a7110f33cf23596c8e4bc70bee7ddf1b6f1c01a204245a1bed8'
+            'f0855957af783a4f7d42331f99a539b4801015c313490cf89c004d37ec1a6f87')
 
 _cmake_keys="-DCMAKE_INSTALL_PREFIX=/usr
              -DCMAKE_INSTALL_LIBDIR=/usr/lib
@@ -30,6 +32,7 @@ prepare() {
 
   patch -Np1 -i "$srcdir/0001-Add-support-for-Twofish-in-KeePass2-code.patch"
   patch -Np1 -i "$srcdir/0002-Add-Algorithm-label-ComboBox-in-Database-settings-fo.patch"
+  patch -Np1 -i "$srcdir/0003-Use-the-correct-cipher-for-benchmark.patch"
 }
 
 build() {