From eb82c316daaa1c4bcd34c82268d1cba1790e33dd Mon Sep 17 00:00:00 2001
From: Jason Plum <max@warheads.net>
Date: Wed, 17 Feb 2016 14:03:57 -0500
Subject: [PATCH] extra/crypto++ to 5.6.3-1

https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/crypto%2b%2b&id=47739ef4440a9bd1dd2415fe4bc47fdeb86fc775
---
 extra/crypto++/CVE-2015-2141.patch | 32 ------------------------------
 extra/crypto++/PKGBUILD            | 11 ++++------
 2 files changed, 4 insertions(+), 39 deletions(-)
 delete mode 100644 extra/crypto++/CVE-2015-2141.patch

diff --git a/extra/crypto++/CVE-2015-2141.patch b/extra/crypto++/CVE-2015-2141.patch
deleted file mode 100644
index 32c516460..000000000
--- a/extra/crypto++/CVE-2015-2141.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 9425e16437439e68c7d96abef922167d68fafaff Mon Sep 17 00:00:00 2001
-From: Jeffrey Walton <noloader@gmail.com>
-Date: Sat, 27 Jun 2015 17:56:01 -0400
-Subject: [PATCH] Fix for CVE-2015-2141. Thanks to Evgeny Sidorov for
- reporting. Squaring to satisfy Jacobi requirements suggested by JPM.
-
----
- rw.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/rw.cpp b/rw.cpp
-index cdd9f2d..0b9318b 100644
---- a/rw.cpp
-+++ b/rw.cpp
-@@ -126,10 +126,16 @@ Integer InvertibleRWFunction::CalculateInverse(RandomNumberGenerator &rng, const
- 	DoQuickSanityCheck();
- 	ModularArithmetic modn(m_n);
- 	Integer r, rInv;
--	do {	// do this in a loop for people using small numbers for testing
-+
-+	// do this in a loop for people using small numbers for testing
-+	do {
- 		r.Randomize(rng, Integer::One(), m_n - Integer::One());
-+		// Fix for CVE-2015-2141. Thanks to Evgeny Sidorov for reporting.
-+		// Squaring to satisfy Jacobi requirements suggested by JPM.
-+		r = modn.Square(r);
- 		rInv = modn.MultiplicativeInverse(r);
- 	} while (rInv.IsZero());
-+
- 	Integer re = modn.Square(r);
- 	re = modn.Multiply(re, x);			// blind
- 
diff --git a/extra/crypto++/PKGBUILD b/extra/crypto++/PKGBUILD
index 377853d7f..d14f928cb 100644
--- a/extra/crypto++/PKGBUILD
+++ b/extra/crypto++/PKGBUILD
@@ -10,9 +10,9 @@
 #  - removed making libcryptopp.so, adjusted packaging for .libs
 
 pkgname=crypto++
-pkgver=5.6.2
-_srcver=562
-pkgrel=4
+pkgver=5.6.3
+_srcver=${pkgver//./}
+pkgrel=1
 pkgdesc="A free C++ class library of cryptographic schemes"
 arch=('i686' 'x86_64')
 url="http://www.cryptopp.com/"
@@ -20,16 +20,13 @@ license=('custom')
 depends=('gcc-libs')
 makedepends=('unzip')
 source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
-        'CVE-2015-2141.patch'
         'libcrypto++.pc'
         'fix_build_system.patch')
-md5sums=('7ed022585698df48e65ce9218f6c6a67'
-         '7ff9a215b9244b4f8a17c7185e27beda'
+md5sums=('3c5b70e2ec98b7a24988734446242d07'
          '46de3847c59ad16456fa863eb33e73b2'
          '7ba22254fea73c1a9bd308ff6e034856')
 
 prepare() {
-  patch -p1 -i ${srcdir}/CVE-2015-2141.patch
   patch -p1 -i fix_build_system.patch
 }