Date: Friday, July 24, 2015 @ 13:59:01
Author: allan
Revision: 242479
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
crypto++/repos/extra-i686/CVE-2015-2141.patch
(from rev 242478, crypto++/trunk/CVE-2015-2141.patch)
crypto++/repos/extra-i686/PKGBUILD
(from rev 242478, crypto++/trunk/PKGBUILD)
crypto++/repos/extra-i686/libcrypto++.pc
(from rev 242478, crypto++/trunk/libcrypto++.pc)
crypto++/repos/extra-x86_64/CVE-2015-2141.patch
(from rev 242478, crypto++/trunk/CVE-2015-2141.patch)
crypto++/repos/extra-x86_64/PKGBUILD
(from rev 242478, crypto++/trunk/PKGBUILD)
crypto++/repos/extra-x86_64/libcrypto++.pc
(from rev 242478, crypto++/trunk/libcrypto++.pc)
Deleted:
crypto++/repos/extra-i686/PKGBUILD
crypto++/repos/extra-i686/libcrypto++.pc
crypto++/repos/extra-x86_64/PKGBUILD
crypto++/repos/extra-x86_64/libcrypto++.pc
----------------------------------+
/PKGBUILD | 84 +++++++++++++++++++++++++++++++++++++
/libcrypto++.pc | 22 +++++++++
extra-i686/CVE-2015-2141.patch | 32 ++++++++++++++
extra-i686/PKGBUILD | 36 ---------------
extra-i686/libcrypto++.pc | 11 ----
extra-x86_64/CVE-2015-2141.patch | 32 ++++++++++++++
extra-x86_64/PKGBUILD | 36 ---------------
extra-x86_64/libcrypto++.pc | 11 ----
8 files changed, 170 insertions(+), 94 deletions(-)
Copied: crypto++/repos/extra-i686/CVE-2015-2141.patch (from rev 242478,
crypto++/trunk/CVE-2015-2141.patch)
===================================================================
--- extra-i686/CVE-2015-2141.patch (rev 0)
+++ extra-i686/CVE-2015-2141.patch 2015-07-24 11:59:01 UTC (rev 242479)
@@ -0,0 +1,32 @@
+From 9425e16437439e68c7d96abef922167d68fafaff Mon Sep 17 00:00:00 2001
+From: Jeffrey Walton <[email protected]>
+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
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-07-24 11:57:33 UTC (rev 242478)
+++ extra-i686/PKGBUILD 2015-07-24 11:59:01 UTC (rev 242479)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <[email protected]>
-# Contributor: Alexander Rødseth <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-# Contributor: Kritoke <[email protected]>
-# Contributor: jlvsimoes <[email protected]>
-
-pkgname=crypto++
-pkgver=5.6.2
-_srcver=562
-pkgrel=2
-pkgdesc="A free C++ class library of cryptographic schemes"
-arch=('i686' 'x86_64')
-url="http://www.cryptopp.com/";
-license=('custom')
-depends=('gcc-libs')
-makedepends=('unzip')
-source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
- 'libcrypto++.pc')
-md5sums=('7ed022585698df48e65ce9218f6c6a67'
- '46de3847c59ad16456fa863eb33e73b2')
-
-build() {
- sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
- export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
- make -f GNUmakefile
- make libcryptopp.so
-}
-
-package() {
- install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
- install -m644 *.h ${pkgdir}/usr/include/cryptopp/
- install -m644 libcryptopp.so "${pkgdir}/usr/lib/libcryptopp.so"
- install -m644 ${srcdir}/libcrypto++.pc
"${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
- install -D -m644 License.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: crypto++/repos/extra-i686/PKGBUILD (from rev 242478,
crypto++/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-07-24 11:59:01 UTC (rev 242479)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Giovanni Scafora <[email protected]>
+# Contributor: Alexander Rødseth <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: Kritoke <[email protected]>
+# Contributor: jlvsimoes <[email protected]>
+
+pkgname=crypto++
+pkgver=5.6.2
+_srcver=562
+pkgrel=3
+pkgdesc="A free C++ class library of cryptographic schemes"
+arch=('i686' 'x86_64')
+url="http://www.cryptopp.com/";
+license=('custom')
+depends=('gcc-libs')
+makedepends=('unzip')
+source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
+ 'CVE-2015-2141.patch'
+ 'libcrypto++.pc')
+md5sums=('7ed022585698df48e65ce9218f6c6a67'
+ '7ff9a215b9244b4f8a17c7185e27beda'
+ '46de3847c59ad16456fa863eb33e73b2')
+
+prepare() {
+ patch -p1 -i ${srcdir}/CVE-2015-2141.patch
+}
+
+build() {
+ sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
+ export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
+ make -f GNUmakefile
+ make libcryptopp.so
+}
+
+package() {
+ install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
+ install -m644 *.h ${pkgdir}/usr/include/cryptopp/
+ install -m644 libcryptopp.so "${pkgdir}/usr/lib/libcryptopp.so"
+ install -m644 ${srcdir}/libcrypto++.pc
"${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
+ install -D -m644 License.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-i686/libcrypto++.pc
===================================================================
--- extra-i686/libcrypto++.pc 2015-07-24 11:57:33 UTC (rev 242478)
+++ extra-i686/libcrypto++.pc 2015-07-24 11:59:01 UTC (rev 242479)
@@ -1,11 +0,0 @@
-# Written by Alexander Rødseth <[email protected]>
-
-prefix=/usr
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libcrypto++-5.6.2
-Description: Class library of cryptographic schemes
-Version: 5.6.2
-Libs: -L${libdir} -lcryptopp
-Cflags: -I${includedir}
Copied: crypto++/repos/extra-i686/libcrypto++.pc (from rev 242478,
crypto++/trunk/libcrypto++.pc)
===================================================================
--- extra-i686/libcrypto++.pc (rev 0)
+++ extra-i686/libcrypto++.pc 2015-07-24 11:59:01 UTC (rev 242479)
@@ -0,0 +1,11 @@
+# Written by Alexander Rødseth <[email protected]>
+
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libcrypto++-5.6.2
+Description: Class library of cryptographic schemes
+Version: 5.6.2
+Libs: -L${libdir} -lcryptopp
+Cflags: -I${includedir}
Copied: crypto++/repos/extra-x86_64/CVE-2015-2141.patch (from rev 242478,
crypto++/trunk/CVE-2015-2141.patch)
===================================================================
--- extra-x86_64/CVE-2015-2141.patch (rev 0)
+++ extra-x86_64/CVE-2015-2141.patch 2015-07-24 11:59:01 UTC (rev 242479)
@@ -0,0 +1,32 @@
+From 9425e16437439e68c7d96abef922167d68fafaff Mon Sep 17 00:00:00 2001
+From: Jeffrey Walton <[email protected]>
+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
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-07-24 11:57:33 UTC (rev 242478)
+++ extra-x86_64/PKGBUILD 2015-07-24 11:59:01 UTC (rev 242479)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <[email protected]>
-# Contributor: Alexander Rødseth <[email protected]>
-# Contributor: Andrea Scarpino <[email protected]>
-# Contributor: Kritoke <[email protected]>
-# Contributor: jlvsimoes <[email protected]>
-
-pkgname=crypto++
-pkgver=5.6.2
-_srcver=562
-pkgrel=2
-pkgdesc="A free C++ class library of cryptographic schemes"
-arch=('i686' 'x86_64')
-url="http://www.cryptopp.com/";
-license=('custom')
-depends=('gcc-libs')
-makedepends=('unzip')
-source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
- 'libcrypto++.pc')
-md5sums=('7ed022585698df48e65ce9218f6c6a67'
- '46de3847c59ad16456fa863eb33e73b2')
-
-build() {
- sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
- export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
- make -f GNUmakefile
- make libcryptopp.so
-}
-
-package() {
- install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
- install -m644 *.h ${pkgdir}/usr/include/cryptopp/
- install -m644 libcryptopp.so "${pkgdir}/usr/lib/libcryptopp.so"
- install -m644 ${srcdir}/libcrypto++.pc
"${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
- install -D -m644 License.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
Copied: crypto++/repos/extra-x86_64/PKGBUILD (from rev 242478,
crypto++/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-07-24 11:59:01 UTC (rev 242479)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Giovanni Scafora <[email protected]>
+# Contributor: Alexander Rødseth <[email protected]>
+# Contributor: Andrea Scarpino <[email protected]>
+# Contributor: Kritoke <[email protected]>
+# Contributor: jlvsimoes <[email protected]>
+
+pkgname=crypto++
+pkgver=5.6.2
+_srcver=562
+pkgrel=3
+pkgdesc="A free C++ class library of cryptographic schemes"
+arch=('i686' 'x86_64')
+url="http://www.cryptopp.com/";
+license=('custom')
+depends=('gcc-libs')
+makedepends=('unzip')
+source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
+ 'CVE-2015-2141.patch'
+ 'libcrypto++.pc')
+md5sums=('7ed022585698df48e65ce9218f6c6a67'
+ '7ff9a215b9244b4f8a17c7185e27beda'
+ '46de3847c59ad16456fa863eb33e73b2')
+
+prepare() {
+ patch -p1 -i ${srcdir}/CVE-2015-2141.patch
+}
+
+build() {
+ sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
+ export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
+ make -f GNUmakefile
+ make libcryptopp.so
+}
+
+package() {
+ install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
+ install -m644 *.h ${pkgdir}/usr/include/cryptopp/
+ install -m644 libcryptopp.so "${pkgdir}/usr/lib/libcryptopp.so"
+ install -m644 ${srcdir}/libcrypto++.pc
"${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
+ install -D -m644 License.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
Deleted: extra-x86_64/libcrypto++.pc
===================================================================
--- extra-x86_64/libcrypto++.pc 2015-07-24 11:57:33 UTC (rev 242478)
+++ extra-x86_64/libcrypto++.pc 2015-07-24 11:59:01 UTC (rev 242479)
@@ -1,11 +0,0 @@
-# Written by Alexander Rødseth <[email protected]>
-
-prefix=/usr
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libcrypto++-5.6.2
-Description: Class library of cryptographic schemes
-Version: 5.6.2
-Libs: -L${libdir} -lcryptopp
-Cflags: -I${includedir}
Copied: crypto++/repos/extra-x86_64/libcrypto++.pc (from rev 242478,
crypto++/trunk/libcrypto++.pc)
===================================================================
--- extra-x86_64/libcrypto++.pc (rev 0)
+++ extra-x86_64/libcrypto++.pc 2015-07-24 11:59:01 UTC (rev 242479)
@@ -0,0 +1,11 @@
+# Written by Alexander Rødseth <[email protected]>
+
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libcrypto++-5.6.2
+Description: Class library of cryptographic schemes
+Version: 5.6.2
+Libs: -L${libdir} -lcryptopp
+Cflags: -I${includedir}
