[arch-commits] Commit in crypto++/repos (8 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Sat Dec 5 17:10:17 UTC 2015
Date: Saturday, December 5, 2015 @ 18:10:17
Author: bpiotrowski
Revision: 252485
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
crypto++/repos/staging-i686/
crypto++/repos/staging-i686/CVE-2015-2141.patch
(from rev 252484, crypto++/trunk/CVE-2015-2141.patch)
crypto++/repos/staging-i686/PKGBUILD
(from rev 252484, crypto++/trunk/PKGBUILD)
crypto++/repos/staging-i686/libcrypto++.pc
(from rev 252484, crypto++/trunk/libcrypto++.pc)
crypto++/repos/staging-x86_64/
crypto++/repos/staging-x86_64/CVE-2015-2141.patch
(from rev 252484, crypto++/trunk/CVE-2015-2141.patch)
crypto++/repos/staging-x86_64/PKGBUILD
(from rev 252484, crypto++/trunk/PKGBUILD)
crypto++/repos/staging-x86_64/libcrypto++.pc
(from rev 252484, crypto++/trunk/libcrypto++.pc)
------------------------------------+
staging-i686/CVE-2015-2141.patch | 32 ++++++++++++++++++++++++++
staging-i686/PKGBUILD | 42 +++++++++++++++++++++++++++++++++++
staging-i686/libcrypto++.pc | 11 +++++++++
staging-x86_64/CVE-2015-2141.patch | 32 ++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 42 +++++++++++++++++++++++++++++++++++
staging-x86_64/libcrypto++.pc | 11 +++++++++
6 files changed, 170 insertions(+)
Copied: crypto++/repos/staging-i686/CVE-2015-2141.patch (from rev 252484, crypto++/trunk/CVE-2015-2141.patch)
===================================================================
--- staging-i686/CVE-2015-2141.patch (rev 0)
+++ staging-i686/CVE-2015-2141.patch 2015-12-05 17:10:17 UTC (rev 252485)
@@ -0,0 +1,32 @@
+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
+
Copied: crypto++/repos/staging-i686/PKGBUILD (from rev 252484, crypto++/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-12-05 17:10:17 UTC (rev 252485)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Kritoke <kritoke at gamebox.net>
+# Contributor: jlvsimoes <jlvsimoes at oninet.pt>
+
+pkgname=crypto++
+pkgver=5.6.2
+_srcver=562
+pkgrel=4
+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"
+}
Copied: crypto++/repos/staging-i686/libcrypto++.pc (from rev 252484, crypto++/trunk/libcrypto++.pc)
===================================================================
--- staging-i686/libcrypto++.pc (rev 0)
+++ staging-i686/libcrypto++.pc 2015-12-05 17:10:17 UTC (rev 252485)
@@ -0,0 +1,11 @@
+# Written by Alexander Rødseth <rodseth at gmail.com>
+
+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/staging-x86_64/CVE-2015-2141.patch (from rev 252484, crypto++/trunk/CVE-2015-2141.patch)
===================================================================
--- staging-x86_64/CVE-2015-2141.patch (rev 0)
+++ staging-x86_64/CVE-2015-2141.patch 2015-12-05 17:10:17 UTC (rev 252485)
@@ -0,0 +1,32 @@
+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
+
Copied: crypto++/repos/staging-x86_64/PKGBUILD (from rev 252484, crypto++/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-12-05 17:10:17 UTC (rev 252485)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Kritoke <kritoke at gamebox.net>
+# Contributor: jlvsimoes <jlvsimoes at oninet.pt>
+
+pkgname=crypto++
+pkgver=5.6.2
+_srcver=562
+pkgrel=4
+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"
+}
Copied: crypto++/repos/staging-x86_64/libcrypto++.pc (from rev 252484, crypto++/trunk/libcrypto++.pc)
===================================================================
--- staging-x86_64/libcrypto++.pc (rev 0)
+++ staging-x86_64/libcrypto++.pc 2015-12-05 17:10:17 UTC (rev 252485)
@@ -0,0 +1,11 @@
+# Written by Alexander Rødseth <rodseth at gmail.com>
+
+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}
More information about the arch-commits
mailing list