[arch-commits] Commit in crypto++/trunk (CVE-2015-2141.patch PKGBUILD)

[Anatol Pomozov]

    Date: Monday, February 15, 2016 @ 20:09:44
  Author: anatolik
Revision: 259337

upgpkg: crypto++ 5.6.3-1

Modified:
  crypto++/trunk/PKGBUILD
Deleted:
  crypto++/trunk/CVE-2015-2141.patch

---------------------+
 CVE-2015-2141.patch |   32 --------------------------------
 PKGBUILD            |   14 ++++----------
 2 files changed, 4 insertions(+), 42 deletions(-)

Deleted: CVE-2015-2141.patch
===================================================================
--- CVE-2015-2141.patch	2016-02-15 19:09:37 UTC (rev 259336)
+++ CVE-2015-2141.patch	2016-02-15 19:09:44 UTC (rev 259337)
@@ -1,32 +0,0 @@
-From 9425e16437439e68c7d96abef922167d68fafaff Mon Sep 17 00:00:00 2001
-From: Jeffrey Walton <noloader at 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
- 

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-15 19:09:37 UTC (rev 259336)
+++ PKGBUILD	2016-02-15 19:09:44 UTC (rev 259337)
@@ -6,9 +6,9 @@
 # Contributor: jlvsimoes <jlvsimoes at oninet.pt>
 
 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/"
@@ -16,16 +16,10 @@
 depends=('gcc-libs')
 makedepends=('unzip')
 source=("http://www.cryptopp.com/cryptopp${_srcver}.zip"
-	'CVE-2015-2141.patch'
         'libcrypto++.pc')
-md5sums=('7ed022585698df48e65ce9218f6c6a67'
-         '7ff9a215b9244b4f8a17c7185e27beda'
+md5sums=('3c5b70e2ec98b7a24988734446242d07'
          '46de3847c59ad16456fa863eb33e73b2')
 
-prepare() {
-  patch -p1 -i ${srcdir}/CVE-2015-2141.patch
-}
-
 build() {
   sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
   export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"