[arch-commits] Commit in crypto++/trunk (PKGBUILD crypto++.install)
Date: Monday, May 18, 2020 @ 10:53:32
Author: alucryd
Revision: 629441
FS#66692: crypto++ 8.2.0-3
Modified:
crypto++/trunk/PKGBUILD
Deleted:
crypto++/trunk/crypto++.install
--+
PKGBUILD | 79 ++---
crypto++.install |4 --
2 files changed, 39 insertions(+), 44 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2020-05-18 10:53:20 UTC (rev 629440)
+++ PKGBUILD2020-05-18 10:53:32 UTC (rev 629441)
@@ -1,4 +1,5 @@
-# Maintainer: Baptiste Jonglez
+# Maintainer: Maxime Gauduin
+# Contributor: Baptiste Jonglez
# Contributor: Giovanni Scafora
# Contributor: Alexander Rødseth
# Contributor: Andrea Scarpino
@@ -7,56 +8,54 @@
pkgname=crypto++
pkgver=8.2.0
-_srcver=${pkgver//./}
-pkgrel=2
-pkgdesc="A free C++ class library of cryptographic schemes"
-arch=('x86_64')
-url="https://www.cryptopp.com/";
-license=('custom')
-depends=('gcc-libs')
-makedepends=('unzip')
-# Fix https://bugs.archlinux.org/task/56689
-install="crypto++.install"
-source=("https://www.cryptopp.com/cryptopp${_srcver}.zip"{,.sig}
-'libcrypto++.pc'
-'cve-2019-14318.patch')
-# Checksums from https://www.cryptopp.com/release600.html
-sha1sums=('b042d2f0c93410abdec7c12bcd92787d019f8da1'
- 'SKIP'
- 'ef530175d27101dcb23a3f92d3c80a529f1d7b02'
- '4788135c92536cac42a98e59d219a9e859b759e3')
-sha256sums=('03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058'
-'SKIP'
-'8722862336f9fe0181734619c197bf4248f0e07b93bdcd693709f57b2f6aa9e6'
-'d9cabc1eab0dfbab1d4bfff75fa99766995089e52b83a175918e738516efbb41')
-sha512sums=('753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5'
-'SKIP'
-
'3be1569e81af1f9b35e944faae3e9962ee2e492fb38e94fe7f847b85da033a79bbfeff193e0edb2d69f2d893f6e8279be144b9395653db67374300f7feb23276'
-
'c5075963acc0f8f5bac38306bac324e0ca5aa74abed417cf5f626267c4c409f84c31a89e351b07a1880cfd30c1451e0f1e3dd8721050df74c1d3d080097a84d9')
-validpgpkeys=('B8CC19802062211A508B2F5CCE0586AF1F8E37BD') # Jeffrey Walton
(Crypto++ Release)
+pkgrel=3
+pkgdesc='A free C++ class library of cryptographic schemes'
+arch=(x86_64)
+url=https://www.cryptopp.com/
+license=(custom)
+depends=(gcc-libs)
+makedepends=(
+ git
+ unzip
+)
+source=(
+
git+https://github.com/weidai11/cryptopp.git#tag=9dcc26c58213abb8351fbb1b2a7a1d2c667366e4
+
#git+https://github.com/weidai11/cryptopp.git?signed#tag=9dcc26c58213abb8351fbb1b2a7a1d2c667366e4
+ cve-2019-14318.patch
+)
+sha256sums=(
+ SKIP
+ d9cabc1eab0dfbab1d4bfff75fa99766995089e52b83a175918e738516efbb41
+)
+validpgpkeys=(B8CC19802062211A508B2F5CCE0586AF1F8E37BD) # Jeffrey Walton
+pkgver() {
+ cd cryptopp
+
+ git describe --tags | sed 's/^CRYPTOPP_//; s/_/./g'
+}
+
prepare() {
- patch -p0 < "$srcdir"/cve-2019-14318.patch
+ cd cryptopp
+
+ patch -Np0 -i ../cve-2019-14318.patch
}
build() {
- CXXFLAGS+=" -DNDEBUG -fPIC" make dynamic cryptest.exe
+ export CXXFLAGS="$CXXFLAGS -DNDEBUG -fPIC"
+ make -C cryptopp dynamic cryptest.exe libcryptopp.pc
}
check() {
- make test
+ make -C cryptopp test
}
package() {
- make install DESTDIR="$pkgdir" PREFIX="/usr"
- # Install pkgconfig file
- install -d "${pkgdir}/usr/lib/pkgconfig"
- install -m644 "${srcdir}/libcrypto++.pc"
"${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
+ make DESTDIR="${pkgdir}" PREFIX=/usr -C cryptopp install
+ install -Dm 644 cryptopp/License.txt -t
"${pkgdir}"/usr/share/licenses/crypto++/
# Remove cryptest.exe and test files, only needed for check() and bloats the
package
# because cryptest.exe is linked statically.
- rm "${pkgdir}/usr/bin/cryptest.exe"
- rmdir "${pkgdir}/usr/bin/"
- rm -r "${pkgdir}/usr/share/cryptopp/"
- # Install license
- install -D -m644 License.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -rf "${pkgdir}"/usr/{bin,share/cryptopp}
}
+
+# vim: ts=2 sw=2 et:
Deleted: crypto++.install
===
--- crypto++.install2020-05-18 10:53:20 UTC (rev 629440)
+++ crypto++.install2020-05-18 10:53:32 UTC (rev 629441)
@@ -1,4 +0,0 @@
-pre_upgrade() {
- # Up to crypto++ 5.6.5-3, libcryptopp.so.5.6 was not tracked by pacman
(symlinked at install time)
- [ -L /usr/lib/libcryptopp.so.5.6 ] && unlink
/usr/lib/libcryptopp.so.5.6 || true
-}
[arch-commits] Commit in crypto++/trunk (PKGBUILD cve-2019-14318.patch)
Date: Thursday, December 5, 2019 @ 22:31:19
Author: zorun
Revision: 535756
upgpkg: crypto++ 8.2.0-2
Patch for CVE-2019-14318
Added:
crypto++/trunk/cve-2019-14318.patch
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD | 18 -
cve-2019-14318.patch | 640 +
2 files changed, 653 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-12-05 20:55:37 UTC (rev 535755)
+++ PKGBUILD2019-12-05 22:31:19 UTC (rev 535756)
@@ -8,7 +8,7 @@
pkgname=crypto++
pkgver=8.2.0
_srcver=${pkgver//./}
-pkgrel=1
+pkgrel=2
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('x86_64')
url="https://www.cryptopp.com/";
@@ -18,19 +18,27 @@
# Fix https://bugs.archlinux.org/task/56689
install="crypto++.install"
source=("https://www.cryptopp.com/cryptopp${_srcver}.zip"{,.sig}
-'libcrypto++.pc')
+'libcrypto++.pc'
+'cve-2019-14318.patch')
# Checksums from https://www.cryptopp.com/release600.html
sha1sums=('b042d2f0c93410abdec7c12bcd92787d019f8da1'
'SKIP'
- 'ef530175d27101dcb23a3f92d3c80a529f1d7b02')
+ 'ef530175d27101dcb23a3f92d3c80a529f1d7b02'
+ '4788135c92536cac42a98e59d219a9e859b759e3')
sha256sums=('03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058'
'SKIP'
-'8722862336f9fe0181734619c197bf4248f0e07b93bdcd693709f57b2f6aa9e6')
+'8722862336f9fe0181734619c197bf4248f0e07b93bdcd693709f57b2f6aa9e6'
+'d9cabc1eab0dfbab1d4bfff75fa99766995089e52b83a175918e738516efbb41')
sha512sums=('753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5'
'SKIP'
-
'3be1569e81af1f9b35e944faae3e9962ee2e492fb38e94fe7f847b85da033a79bbfeff193e0edb2d69f2d893f6e8279be144b9395653db67374300f7feb23276')
+
'3be1569e81af1f9b35e944faae3e9962ee2e492fb38e94fe7f847b85da033a79bbfeff193e0edb2d69f2d893f6e8279be144b9395653db67374300f7feb23276'
+
'c5075963acc0f8f5bac38306bac324e0ca5aa74abed417cf5f626267c4c409f84c31a89e351b07a1880cfd30c1451e0f1e3dd8721050df74c1d3d080097a84d9')
validpgpkeys=('B8CC19802062211A508B2F5CCE0586AF1F8E37BD') # Jeffrey Walton
(Crypto++ Release)
+prepare() {
+ patch -p0 < "$srcdir"/cve-2019-14318.patch
+}
+
build() {
CXXFLAGS+=" -DNDEBUG -fPIC" make dynamic cryptest.exe
}
Added: cve-2019-14318.patch
===
--- cve-2019-14318.patch(rev 0)
+++ cve-2019-14318.patch2019-12-05 22:31:19 UTC (rev 535756)
@@ -0,0 +1,640 @@
+# Patch for Crypto++ timing leaks in EC gear (GH #869)
+# diff of Crypto++ 8.2 and Master 04b2a20c5da5
+--- pubkey.h
pubkey.h
+@@ -886,7 +886,7 @@
+ /// \brief Retrieves the encoded element's size
+ /// \param reversible flag indicating the encoding format
+ /// \return encoded element's size, in bytes
+- /// \details The format of the encoded element varies by the
underlyinhg type of the element and the
++ /// \details The format of the encoded element varies by the underlying
type of the element and the
+ /// reversible flag. GetEncodedElementSize() must be implemented in a
derived class.
+ /// \sa GetEncodedElementSize(), EncodeElement(), DecodeElement()
+ virtual unsigned int GetEncodedElementSize(bool reversible) const =0;
+@@ -1604,10 +1604,10 @@
+ if (rng.CanIncorporateEntropy())
+ rng.IncorporateEntropy(representative,
representative.size());
+
+- Integer k;
++ Integer k, ks;
++ const Integer& q = params.GetSubgroupOrder();
+ if (alg.IsDeterministic())
+ {
+- const Integer& q = params.GetSubgroupOrder();
+ const Integer& x = key.GetPrivateExponent();
+ const DeterministicSignatureAlgorithm& det =
dynamic_cast(alg);
+ k = det.GenerateRandom(x, q, e);
+@@ -1617,8 +1617,15 @@
+ k.Randomize(rng, 1, params.GetSubgroupOrder()-1);
+ }
+
++ // Due to timing attack on nonce length by Jancar
++ // https://github.com/weidai11/cryptopp/issues/869
++ ks = k + q;
++ if (ks.BitCount() == q.BitCount()) {
++ ks += q;
++ }
++
+ Integer r, s;
+- r = params.ConvertElementToInteger(params.ExponentiateBase(k));
++ r = params.ConvertElementToInteger(params.ExponentiateBase(ks));
+ alg.Sign(params, key.GetPrivateExponent(), k, e, r, s);
+
+ /*
+@@ -1630,7 +1637,7 @@
+ alg.Sign(params, key.GetPrivateExponent(), ma.m_k, e, r, s);
+ */
+
+-
[arch-commits] Commit in crypto++/trunk (PKGBUILD)
Date: Tuesday, April 30, 2019 @ 19:31:18
Author: arojas
Revision: 457056
Update to 8.2.0
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2019-04-30 19:23:11 UTC (rev 457055)
+++ PKGBUILD2019-04-30 19:31:18 UTC (rev 457056)
@@ -6,7 +6,7 @@
# Contributor: jlvsimoes
pkgname=crypto++
-pkgver=7.0.0
+pkgver=8.2.0
_srcver=${pkgver//./}
pkgrel=1
pkgdesc="A free C++ class library of cryptographic schemes"
@@ -17,15 +17,19 @@
makedepends=('unzip')
# Fix https://bugs.archlinux.org/task/56689
install="crypto++.install"
-source=("https://www.cryptopp.com/cryptopp${_srcver}.zip";
+source=("https://www.cryptopp.com/cryptopp${_srcver}.zip"{,.sig}
'libcrypto++.pc')
# Checksums from https://www.cryptopp.com/release600.html
-sha1sums=('1288682ae2f3062ea3a82ca2e90bd06d147568a4'
+sha1sums=('b042d2f0c93410abdec7c12bcd92787d019f8da1'
+ 'SKIP'
'ef530175d27101dcb23a3f92d3c80a529f1d7b02')
-sha256sums=('a4bc939910edd3d29fb819a6fc0dfdc293f686fa62326f61c56d72d0a366ceb0'
+sha256sums=('03f0e2242e11b9d19b28d0ec5a3fa8ed5cc7b27640e6bed365744f593e858058'
+'SKIP'
'8722862336f9fe0181734619c197bf4248f0e07b93bdcd693709f57b2f6aa9e6')
-sha512sums=('8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec'
+sha512sums=('753513a4ec8dd0fff2f551853ce6bd265d82219c28b033565b565b5e567fbee17adb419f4cde58a97e62b7d6533f4099aa4996cd0ba4775c6a2e7ae63a879da5'
+'SKIP'
'3be1569e81af1f9b35e944faae3e9962ee2e492fb38e94fe7f847b85da033a79bbfeff193e0edb2d69f2d893f6e8279be144b9395653db67374300f7feb23276')
+validpgpkeys=('B8CC19802062211A508B2F5CCE0586AF1F8E37BD') # Jeffrey Walton
(Crypto++ Release)
build() {
CXXFLAGS+=" -DNDEBUG -fPIC" make dynamic cryptest.exe
[arch-commits] Commit in crypto++/trunk (PKGBUILD libcrypto++.pc)
Date: Tuesday, April 10, 2018 @ 21:09:21
Author: zorun
Revision: 315632
upgpkg: crypto++ 7.0.0-1
Modified:
crypto++/trunk/PKGBUILD
crypto++/trunk/libcrypto++.pc
+
PKGBUILD | 14 +++---
libcrypto++.pc |4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-04-10 21:07:28 UTC (rev 315631)
+++ PKGBUILD2018-04-10 21:09:21 UTC (rev 315632)
@@ -6,7 +6,7 @@
# Contributor: jlvsimoes
pkgname=crypto++
-pkgver=6.1.0
+pkgver=7.0.0
_srcver=${pkgver//./}
pkgrel=1
pkgdesc="A free C++ class library of cryptographic schemes"
@@ -20,12 +20,12 @@
source=("https://www.cryptopp.com/cryptopp${_srcver}.zip";
'libcrypto++.pc')
# Checksums from https://www.cryptopp.com/release600.html
-sha1sums=('c4e7c14ad17b6fae6a1b84d0824b4365f2a779e6'
- 'f776881de464d591b33eec88b76039bc5da8c1c8')
-sha256sums=('21289d2511101a9350c87c8eb1f4982d4a266e8037b19dab79a32cc13ea108c7'
-'86370744f3191eaba9f334c293fdf1670188a4462edef98ace9389462664b01b')
-sha512sums=('cb01330ffb2f34bf51ca5a9d530b0be987c7cf36ab2be0e562a61bd39748f9fa5533be43050c7505f8be22b03a9dece829c1b27987b9c9c5cb7ecf51d75bf6a3'
-
'e15a5d1e2c3d9e0fd87028848e7174fc0589a1f492d5acc95c1b1d7073bccdfa325d515b6ef3c4aed850b48302b876a754add1a73123e4bc5416dbf0586258a1')
+sha1sums=('1288682ae2f3062ea3a82ca2e90bd06d147568a4'
+ 'ef530175d27101dcb23a3f92d3c80a529f1d7b02')
+sha256sums=('a4bc939910edd3d29fb819a6fc0dfdc293f686fa62326f61c56d72d0a366ceb0'
+'8722862336f9fe0181734619c197bf4248f0e07b93bdcd693709f57b2f6aa9e6')
+sha512sums=('8fd8d680e5ceaf10b3c32cb1504bda4b32abc9fcaa2c6e61e3b5e67aca805c792579884bc6a749c29a99105304c421d03d7fe7909fc58f750b3155c7c5cec8ec'
+
'3be1569e81af1f9b35e944faae3e9962ee2e492fb38e94fe7f847b85da033a79bbfeff193e0edb2d69f2d893f6e8279be144b9395653db67374300f7feb23276')
build() {
CXXFLAGS+=" -DNDEBUG -fPIC" make dynamic cryptest.exe
Modified: libcrypto++.pc
===
--- libcrypto++.pc 2018-04-10 21:07:28 UTC (rev 315631)
+++ libcrypto++.pc 2018-04-10 21:09:21 UTC (rev 315632)
@@ -4,8 +4,8 @@
libdir=${prefix}/lib
includedir=${prefix}/include
-Name: libcrypto++-6.1.0
+Name: libcrypto++-7.0.0
Description: Class library of cryptographic schemes
-Version: 6.1.0
+Version: 7.0.0
Libs: -L${libdir} -lcryptopp
Cflags: -I${includedir}
[arch-commits] Commit in crypto++/trunk (PKGBUILD fix-cxxflags.patch libcrypto++.pc)
Date: Thursday, February 22, 2018 @ 22:29:12
Author: zorun
Revision: 297130
upgpkg: crypto++ 6.1.0-1
The so-name bump needs a rebuild of dependent packages, but fortunately,
starting from this version, the so-name will only bump at major releases
(next one: 7.0.0)
Modified:
crypto++/trunk/PKGBUILD
crypto++/trunk/libcrypto++.pc
Deleted:
crypto++/trunk/fix-cxxflags.patch
+
PKGBUILD | 16
fix-cxxflags.patch | 49 -
libcrypto++.pc |4 ++--
3 files changed, 10 insertions(+), 59 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-02-22 22:20:58 UTC (rev 297129)
+++ PKGBUILD2018-02-22 22:29:12 UTC (rev 297130)
@@ -6,9 +6,9 @@
# Contributor: jlvsimoes
pkgname=crypto++
-pkgver=6.0.0
+pkgver=6.1.0
_srcver=${pkgver//./}
-pkgrel=2
+pkgrel=1
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('x86_64')
url="https://www.cryptopp.com/";
@@ -20,12 +20,12 @@
source=("https://www.cryptopp.com/cryptopp${_srcver}.zip";
'libcrypto++.pc')
# Checksums from https://www.cryptopp.com/release600.html
-sha1sums=('290dfc1948b860b29da40f8c5559f6559ce787db'
- '7a6c6fc7aed96ff7be554eee60450a1914b0cd95')
-sha256sums=('64ac2db96b3f1b7a23675e2be95d16c96055edffa2d5e2de6245fdb6baa92dda'
-'14228b0d1a6f07572090ab17b60bf9829308d174e763eb31966f723b0cb51134')
-sha512sums=('7a60c28be1fc9418adeabe8c66d868b46e65fb3d77d308b9431b16905cde7faa670180619150e849ae44d70f44aa8501a0a0c4354ec84f194fd8138d14aca9bf'
-
'bba4ff9c01e353f0336e01836fd1418a08f43ab9215f678cc80cc94954d689e94e1425c7ed95f9b12d210bfc73574c98d0579b1356232c50f32f342395408ac2')
+sha1sums=('c4e7c14ad17b6fae6a1b84d0824b4365f2a779e6'
+ 'f776881de464d591b33eec88b76039bc5da8c1c8')
+sha256sums=('21289d2511101a9350c87c8eb1f4982d4a266e8037b19dab79a32cc13ea108c7'
+'86370744f3191eaba9f334c293fdf1670188a4462edef98ace9389462664b01b')
+sha512sums=('cb01330ffb2f34bf51ca5a9d530b0be987c7cf36ab2be0e562a61bd39748f9fa5533be43050c7505f8be22b03a9dece829c1b27987b9c9c5cb7ecf51d75bf6a3'
+
'e15a5d1e2c3d9e0fd87028848e7174fc0589a1f492d5acc95c1b1d7073bccdfa325d515b6ef3c4aed850b48302b876a754add1a73123e4bc5416dbf0586258a1')
build() {
CXXFLAGS+=" -DNDEBUG -fPIC" make dynamic cryptest.exe
Deleted: fix-cxxflags.patch
===
--- fix-cxxflags.patch 2018-02-22 22:20:58 UTC (rev 297129)
+++ fix-cxxflags.patch 2018-02-22 22:29:12 UTC (rev 297130)
@@ -1,49 +0,0 @@
-From 733a073d65548848aabc39a45b5addb0e01b68fe Mon Sep 17 00:00:00 2001
-From: Jeffrey Walton
-Date: Thu, 27 Oct 2016 01:01:01 -0400
-Subject: [PATCH] Fix mismatched arch capabilities (Issue 283)
-
- rijndael.cpp | 8
- rijndael.h | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/rijndael.cpp b/rijndael.cpp
-index fb934d08..37237be6 100644
a/rijndael.cpp
-+++ b/rijndael.cpp
-@@ -1345,17 +1345,17 @@ size_t Rijndael::Enc::AdvancedProcessBlocks(const byte
*inBlocks, const byte *xo
-
- #endif
-
--#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
--
-+#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
- size_t Rijndael::Dec::AdvancedProcessBlocks(const byte *inBlocks, const byte
*xorBlocks, byte *outBlocks, size_t length, word32 flags) const
- {
-+#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
- if (HasAESNI())
- return AESNI_AdvancedProcessBlocks(AESNI_Dec_Block,
AESNI_Dec_4_Blocks, (MAYBE_CONST __m128i *)(const void *)m_key.begin(),
m_rounds, inBlocks, xorBlocks, outBlocks, length, flags);
-+#endif
-
- return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks,
outBlocks, length, flags);
- }
--
--#endif// #if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-+#endif// CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
-
- NAMESPACE_END
-
-diff --git a/rijndael.h b/rijndael.h
-index 5b334ffc..bdcf3ed3 100644
a/rijndael.h
-+++ b/rijndael.h
-@@ -69,7 +69,7 @@ class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public
BlockCipherDocumentat
- {
- public:
- void ProcessAndXorBlock(const byte *inBlock, const byte
*xorBlock, byte *outBlock) const;
--#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
-+#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
- size_t AdvancedProcessBlocks(const byte *inBlocks, const byte
*xorBlocks, byte *outBlocks, size_t length, word32 flags) const;
- #endif
- };
Modified: libcrypto++.pc
===
--- libcrypto++.pc 2018-02-22 22:20:58 UTC (rev 297129)
+++ libcrypto++.pc 2018-02-22 22:29:12 UTC (rev 297130)
@@ -4,8 +4,8 @@
libdir=${prefix}/lib
includedir=${prefix}/include
-Name: libcrypto++-6.0.0
+Name: libcrypto++-6.1.0
Description: Class library
[arch-commits] Commit in crypto++/trunk (PKGBUILD fix-simon-speck-simd-build.patch)
Date: Saturday, January 27, 2018 @ 19:00:55
Author: zorun
Revision: 287515
crypto++: simpler build procedure
Modified:
crypto++/trunk/PKGBUILD
Deleted:
crypto++/trunk/fix-simon-speck-simd-build.patch
--+
PKGBUILD | 29 +++---
fix-simon-speck-simd-build.patch | 59 -
2 files changed, 6 insertions(+), 82 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2018-01-27 18:50:31 UTC (rev 287514)
+++ PKGBUILD2018-01-27 19:00:55 UTC (rev 287515)
@@ -8,7 +8,7 @@
pkgname=crypto++
pkgver=6.0.0
_srcver=${pkgver//./}
-pkgrel=1
+pkgrel=2
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('x86_64')
url="https://www.cryptopp.com/";
@@ -18,35 +18,17 @@
# Fix https://bugs.archlinux.org/task/56689
install="crypto++.install"
source=("https://www.cryptopp.com/cryptopp${_srcver}.zip";
-"fix-simon-speck-simd-build.patch"
'libcrypto++.pc')
# Checksums from https://www.cryptopp.com/release600.html
sha1sums=('290dfc1948b860b29da40f8c5559f6559ce787db'
- 'a4be3000116568260a8fe3169b948deca5576fdf'
'7a6c6fc7aed96ff7be554eee60450a1914b0cd95')
sha256sums=('64ac2db96b3f1b7a23675e2be95d16c96055edffa2d5e2de6245fdb6baa92dda'
-'80d43fe472f2ccffa56097eda5e56820d0944c1d585a68d944049a1d00d395c3'
'14228b0d1a6f07572090ab17b60bf9829308d174e763eb31966f723b0cb51134')
sha512sums=('7a60c28be1fc9418adeabe8c66d868b46e65fb3d77d308b9431b16905cde7faa670180619150e849ae44d70f44aa8501a0a0c4354ec84f194fd8138d14aca9bf'
-
'80378bb6b19427fa316892126a3b533a98831405215df6f8c0b251e319b05c625a5d437f7217641ca8e41e5be153a796204686c4844338befdfc42e43a8ece6e'
'bba4ff9c01e353f0336e01836fd1418a08f43ab9215f678cc80cc94954d689e94e1425c7ed95f9b12d210bfc73574c98d0579b1356232c50f32f342395408ac2')
-prepare() {
- patch -p1 < "$srcdir"/fix-simon-speck-simd-build.patch
-}
-
build() {
- make -f GNUmakefile-cross dynamic cryptest.exe \
-CXXFLAGS+=" -DNDEBUG -fPIC" HAS_SOLIB_VERSION=1 \
-ARIA_FLAG="-mssse3" \
-SIMON_FLAG="-mssse3 -msse4.1" \
-SPECK_FLAG="-mssse3 -msse4.1" \
-SSSE3_FLAG="-mssse3" \
-BLAKE2_FLAG="-msse4.2" \
-CRC_FLAG="-msse4.2" \
-GCM_FLAG="-mssse3 -mpclmul" \
-AES_FLAG="-msse4.1 -maes" \
-SHA_FLAG="-msse4.2 -msha"
+ CXXFLAGS+=" -DNDEBUG -fPIC" make dynamic cryptest.exe
}
check() {
@@ -54,14 +36,15 @@
}
package() {
- make -f GNUmakefile-cross install DESTDIR="$pkgdir" PREFIX="/usr"
HAS_SOLIB_VERSION=1
+ make install DESTDIR="$pkgdir" PREFIX="/usr"
# Install pkgconfig file
install -d "${pkgdir}/usr/lib/pkgconfig"
install -m644 "${srcdir}/libcrypto++.pc"
"${pkgdir}/usr/lib/pkgconfig/libcrypto++.pc"
- # Remove crypttest.exe: it's only needed for check(), and does not even work
when
- # installed in /usr/bin (it needs additional files)
+ # Remove cryptest.exe and test files, only needed for check() and bloats the
package
+ # because cryptest.exe is linked statically.
rm "${pkgdir}/usr/bin/cryptest.exe"
rmdir "${pkgdir}/usr/bin/"
+ rm -r "${pkgdir}/usr/share/cryptopp/"
# Install license
install -D -m644 License.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
Deleted: fix-simon-speck-simd-build.patch
===
--- fix-simon-speck-simd-build.patch2018-01-27 18:50:31 UTC (rev 287514)
+++ fix-simon-speck-simd-build.patch2018-01-27 19:00:55 UTC (rev 287515)
@@ -1,59 +0,0 @@
-diff --git a/GNUmakefile-cross b/GNUmakefile-cross
-index 7ab6ccfe..98d10a9a 100755
a/GNUmakefile-cross
-+++ b/GNUmakefile-cross
-@@ -220,12 +220,16 @@ ifeq ($(IS_NEON),1)
- GCM_FLAG += -mfpu=neon
- ARIA_FLAG += -mfpu=neon
- BLAKE2_FLAG += -mfpu=neon
-+SIMON_FLAG += -mfpu=neon
-+SPECK_FLAG += -mfpu=neon
- ifeq ($(IS_ANDROID),1)
- ifeq ($(findstring -mfloat-abi=softfp,$(CXXFLAGS)),)
- NEON_FLAG += -mfloat-abi=softfp
- GCM_FLAG += -mfloat-abi=softfp
- ARIA_FLAG += -mfloat-abi=softfp
- BLAKE2_FLAG += -mfloat-abi=softfp
-+SIMON_FLAG += -mfloat-abi=softfp
-+SPECK_FLAG += -mfloat-abi=softfp
- endif
- endif
- endif
-@@ -238,6 +242,8 @@ ifneq ($(IS_ARMv8),0)
- ARIA_FLAG = -march=armv8-a
- BLAKE2_FLAG = -march=armv8-a
- NEON_FLAG = -march=armv8-a
-+SIMON_FLAG = -march=armv8-a
-+SPECK_FLAG = -march=armv8-a
- endif
- HAVE_CRC := $(shell echo | $(CXX) -x c++ $(CXXFLAGS) -march=armv8-a+crc -dM
-E - 2>/dev/null | $(EGREP) -i -c __ARM_FEATURE_CRC32)
- ifeq ($(HAVE_CRC),1)
-@@ -257,6 +263,13 @@ ifneq ($(IS_i686)$(IS_x86_64),00)
- ifeq ($(HAVE_SSSE3),1)
- ARIA_FLAG = -mssse3
- SSSE3_FLAG = -mssse3
-+SIMON_FLAG = -mssse3
-+SPECK_FLAG = -mssse3
-+ endif
-+ HAVE_SSE4 = $(shell echo | $(CXX) -x c++ $(CXXFLAGS) -msse4.1 -dM -E -
[arch-commits] Commit in crypto++/trunk (PKGBUILD fix-cxxflags.patch libcrypto++.pc)
Date: Thursday, June 15, 2017 @ 07:15:26
Author: zorun
Revision: 237109
upgpkg: crypto++ 5.6.5-3
Fix FS#51605 and various cleanup: use upstream hashes, fetch source from
HTTPS, fix version in libcrypto++.pc.
Added:
crypto++/trunk/fix-cxxflags.patch
Modified:
crypto++/trunk/PKGBUILD
crypto++/trunk/libcrypto++.pc
+
PKGBUILD | 22 ++
fix-cxxflags.patch | 49 +
libcrypto++.pc |4 ++--
3 files changed, 69 insertions(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2017-06-15 07:09:32 UTC (rev 237108)
+++ PKGBUILD2017-06-15 07:15:26 UTC (rev 237109)
@@ -8,7 +8,7 @@
pkgname=crypto++
pkgver=5.6.5
_srcver=${pkgver//./}
-pkgrel=2
+pkgrel=3
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/";
@@ -15,11 +15,25 @@
license=('custom')
depends=('gcc-libs')
makedepends=('unzip')
-source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
+source=("https://www.cryptopp.com/cryptopp${_srcver}.zip";
+"fix-cxxflags.patch"
'libcrypto++.pc')
-md5sums=('df5ef4647b4e978bba0cac79a83aaed5'
- 'ea27f28fe0303fcaa24d83cf4a964d53')
+# Checksums from https://www.cryptopp.com/release565.html
+sha1sums=('a74f207a315b6a133af9640a45bde9d6e378af4d'
+ 'f044b55c615ed0d6c0239bd43dda67db1fdb4cca'
+ 'e4e2fc3172b4a85bffad812a0de8531843912ff1')
+sha256sums=('a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34'
+'e27679cd5e1068e84c84c18395d4f32254fa900887ee89a15c38580236490dc5'
+'aee5ca989bfd25236095fccb245a5c7f559eae97c41979e952ac35b29453d8b5')
+sha512sums=('f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7'
+
'49a81998489e65dcb270de77f6149a3dcf03c9a04bd2c9baf2e92f6bd749fe69aca5de0803b94757778f272357d2357e873b652c9bb06e8f03b7bf9b55bbc9d4'
+
'798ff42e3dcc4edd33b9fb1b605e608dd53a668afb28032620927b49f17fcb5b212f6cf4e9af30cc2b36bf74bb9f0152dad4f40fdb19d8f557dfed196ea0921d')
+prepare() {
+ # Upstream patch for https://bugs.archlinux.org/task/51605
+ patch -p1 < "$srcdir"/fix-cxxflags.patch
+}
+
build() {
CXXFLAGS+=" -DNDEBUG -fPIC" make -f GNUmakefile-cross
make libcryptopp.so
Added: fix-cxxflags.patch
===
--- fix-cxxflags.patch (rev 0)
+++ fix-cxxflags.patch 2017-06-15 07:15:26 UTC (rev 237109)
@@ -0,0 +1,49 @@
+From 733a073d65548848aabc39a45b5addb0e01b68fe Mon Sep 17 00:00:00 2001
+From: Jeffrey Walton
+Date: Thu, 27 Oct 2016 01:01:01 -0400
+Subject: [PATCH] Fix mismatched arch capabilities (Issue 283)
+
+---
+ rijndael.cpp | 8
+ rijndael.h | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/rijndael.cpp b/rijndael.cpp
+index fb934d08..37237be6 100644
+--- a/rijndael.cpp
b/rijndael.cpp
+@@ -1345,17 +1345,17 @@ size_t Rijndael::Enc::AdvancedProcessBlocks(const byte
*inBlocks, const byte *xo
+
+ #endif
+
+-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
+-
++#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
+ size_t Rijndael::Dec::AdvancedProcessBlocks(const byte *inBlocks, const byte
*xorBlocks, byte *outBlocks, size_t length, word32 flags) const
+ {
++#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
+ if (HasAESNI())
+ return AESNI_AdvancedProcessBlocks(AESNI_Dec_Block,
AESNI_Dec_4_Blocks, (MAYBE_CONST __m128i *)(const void *)m_key.begin(),
m_rounds, inBlocks, xorBlocks, outBlocks, length, flags);
++#endif
+
+ return BlockTransformation::AdvancedProcessBlocks(inBlocks, xorBlocks,
outBlocks, length, flags);
+ }
+-
+-#endif// #if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
++#endif// CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
+
+ NAMESPACE_END
+
+diff --git a/rijndael.h b/rijndael.h
+index 5b334ffc..bdcf3ed3 100644
+--- a/rijndael.h
b/rijndael.h
+@@ -69,7 +69,7 @@ class CRYPTOPP_DLL Rijndael : public Rijndael_Info, public
BlockCipherDocumentat
+ {
+ public:
+ void ProcessAndXorBlock(const byte *inBlock, const byte
*xorBlock, byte *outBlock) const;
+-#if CRYPTOPP_BOOL_AESNI_INTRINSICS_AVAILABLE
++#if CRYPTOPP_BOOL_X64 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X86
+ size_t AdvancedProcessBlocks(const byte *inBlocks, const byte
*xorBlocks, byte *outBlocks, size_t length, word32 flags) const;
+ #endif
+ };
Modified: libcrypto++.pc
===
--- libcrypto++.pc 2017-06-15 07:09:32 UTC (rev 237108)
+++ libcrypto++.pc 2017-06-15 07:15:26 UTC (rev 237109)
@@ -4,8 +4,8 @@
libdir=${prefix}/lib
includedir=${prefix}/include
-Name: libcrypto++-5.6.4
+Name: libcrypto++-5.6.5
Description:
[arch-commits] Commit in crypto++/trunk (PKGBUILD)
Date: Tuesday, October 11, 2016 @ 22:05:11
Author: arojas
Revision: 278301
Build with -DNDEBUG (FS#51331)
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-10-11 21:33:57 UTC (rev 278300)
+++ PKGBUILD2016-10-11 22:05:11 UTC (rev 278301)
@@ -8,7 +8,7 @@
pkgname=crypto++
pkgver=5.6.5
_srcver=${pkgver//./}
-pkgrel=1
+pkgrel=2
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/";
@@ -21,7 +21,7 @@
'ea27f28fe0303fcaa24d83cf4a964d53')
build() {
- CXXFLAGS+=" -fPIC" make -f GNUmakefile-cross
+ CXXFLAGS+=" -DNDEBUG -fPIC" make -f GNUmakefile-cross
make libcryptopp.so
}
[arch-commits] Commit in crypto++/trunk (PKGBUILD)
Date: Tuesday, October 11, 2016 @ 18:37:06
Author: arojas
Revision: 278284
Update to 5.6.5
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-10-11 18:34:43 UTC (rev 278283)
+++ PKGBUILD2016-10-11 18:37:06 UTC (rev 278284)
@@ -6,9 +6,9 @@
# Contributor: jlvsimoes
pkgname=crypto++
-pkgver=5.6.4
+pkgver=5.6.5
_srcver=${pkgver//./}
-pkgrel=2
+pkgrel=1
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/";
@@ -17,7 +17,7 @@
makedepends=('unzip')
source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
'libcrypto++.pc')
-md5sums=('4ee7e5cdd4a45a14756c169eaf2a77fc'
+md5sums=('df5ef4647b4e978bba0cac79a83aaed5'
'ea27f28fe0303fcaa24d83cf4a964d53')
build() {
[arch-commits] Commit in crypto++/trunk (PKGBUILD)
Date: Sunday, September 18, 2016 @ 08:38:12
Author: arojas
Revision: 276670
Use generic compilation flags (FS#50817)
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD |6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-09-18 07:25:30 UTC (rev 276669)
+++ PKGBUILD2016-09-18 08:38:12 UTC (rev 276670)
@@ -8,7 +8,7 @@
pkgname=crypto++
pkgver=5.6.4
_srcver=${pkgver//./}
-pkgrel=1
+pkgrel=2
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/";
@@ -21,9 +21,7 @@
'ea27f28fe0303fcaa24d83cf4a964d53')
build() {
- sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
- export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
- make -f GNUmakefile
+ CXXFLAGS+=" -fPIC" make -f GNUmakefile-cross
make libcryptopp.so
}
[arch-commits] Commit in crypto++/trunk (PKGBUILD libcrypto++.pc)
Date: Saturday, September 17, 2016 @ 09:09:36
Author: arojas
Revision: 276631
Update to 5.6.4
Modified:
crypto++/trunk/PKGBUILD
crypto++/trunk/libcrypto++.pc
+
PKGBUILD |6 +++---
libcrypto++.pc |4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2016-09-17 07:26:09 UTC (rev 276630)
+++ PKGBUILD2016-09-17 09:09:36 UTC (rev 276631)
@@ -6,7 +6,7 @@
# Contributor: jlvsimoes
pkgname=crypto++
-pkgver=5.6.3
+pkgver=5.6.4
_srcver=${pkgver//./}
pkgrel=1
pkgdesc="A free C++ class library of cryptographic schemes"
@@ -17,8 +17,8 @@
makedepends=('unzip')
source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
'libcrypto++.pc')
-md5sums=('3c5b70e2ec98b7a24988734446242d07'
- '46de3847c59ad16456fa863eb33e73b2')
+md5sums=('4ee7e5cdd4a45a14756c169eaf2a77fc'
+ 'ea27f28fe0303fcaa24d83cf4a964d53')
build() {
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
Modified: libcrypto++.pc
===
--- libcrypto++.pc 2016-09-17 07:26:09 UTC (rev 276630)
+++ libcrypto++.pc 2016-09-17 09:09:36 UTC (rev 276631)
@@ -4,8 +4,8 @@
libdir=${prefix}/lib
includedir=${prefix}/include
-Name: libcrypto++-5.6.2
+Name: libcrypto++-5.6.4
Description: Class library of cryptographic schemes
-Version: 5.6.2
+Version: 5.6.4
Libs: -L${libdir} -lcryptopp
Cflags: -I${includedir}
[arch-commits] Commit in crypto++/trunk (PKGBUILD)
Date: Saturday, December 5, 2015 @ 18:10:08
Author: bpiotrowski
Revision: 252484
C++11 ABI rebuild
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-12-05 17:05:59 UTC (rev 252483)
+++ PKGBUILD2015-12-05 17:10:08 UTC (rev 252484)
@@ -8,7 +8,7 @@
pkgname=crypto++
pkgver=5.6.2
_srcver=562
-pkgrel=3
+pkgrel=4
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/";
[arch-commits] Commit in crypto++/trunk (PKGBUILD)
Date: Friday, January 3, 2014 @ 10:15:03
Author: bpiotrowski
Revision: 203062
upgpkg: crypto++ 5.6.2-2
remove static libraries
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD |7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-01-03 09:08:54 UTC (rev 203061)
+++ PKGBUILD2014-01-03 09:15:03 UTC (rev 203062)
@@ -8,7 +8,7 @@
pkgname=crypto++
pkgver=5.6.2
_srcver=562
-pkgrel=1
+pkgrel=2
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/";
@@ -21,8 +21,6 @@
'46de3847c59ad16456fa863eb33e73b2')
build() {
- cd ${srcdir}
-
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
make -f GNUmakefile
@@ -30,11 +28,8 @@
}
package() {
- cd ${srcdir}
-
install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
install -m644 *.h ${pkgdir}/usr/include/cryptopp/
- install -m644 libcryptopp.a "${pkgdir}/usr/lib/libcryptopp.a"
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"
[arch-commits] Commit in crypto++/trunk (PKGBUILD gcc4.7.patch libcrypto++.pc)
Date: Tuesday, March 5, 2013 @ 18:32:48
Author: giovanni
Revision: 179500
upgpkg: crypto++ 5.6.2-1
upstream release
Modified:
crypto++/trunk/PKGBUILD
crypto++/trunk/libcrypto++.pc
Deleted:
crypto++/trunk/gcc4.7.patch
+
PKGBUILD | 17 +++--
gcc4.7.patch | 97 ---
libcrypto++.pc |4 +-
3 files changed, 8 insertions(+), 110 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-03-05 17:08:31 UTC (rev 179499)
+++ PKGBUILD2013-03-05 17:32:48 UTC (rev 179500)
@@ -6,9 +6,9 @@
# Contributor: jlvsimoes
pkgname=crypto++
-pkgver=5.6.1
-_srcver=561
-pkgrel=4
+pkgver=5.6.2
+_srcver=562
+pkgrel=1
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/";
@@ -16,18 +16,13 @@
depends=('gcc-libs')
makedepends=('unzip')
source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
-'libcrypto++.pc'
-'gcc4.7.patch')
-md5sums=('96cbeba0907562b077e26bcffb483828'
- '2337c6edbc552d9142cae8e0854715e7'
- 'cf26a783d9432e7f9ab7f14d3db3f196')
+'libcrypto++.pc')
+md5sums=('7ed022585698df48e65ce9218f6c6a67'
+ '46de3847c59ad16456fa863eb33e73b2')
build() {
cd ${srcdir}
- # Fix gcc 4.7 build
- patch -Np1 -i "${srcdir}/gcc4.7.patch"
-
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
make -f GNUmakefile
Deleted: gcc4.7.patch
===
--- gcc4.7.patch2013-03-05 17:08:31 UTC (rev 179499)
+++ gcc4.7.patch2013-03-05 17:32:48 UTC (rev 179500)
@@ -1,97 +0,0 @@
a/algebra.cpp 2010-08-06 18:44:32.0 +0200
-+++ b/algebra.cpp 2012-04-10 13:16:53.0 +0200
-@@ -58,7 +58,7 @@
- Element g[3]={b, a};
- unsigned int i0=0, i1=1, i2=2;
-
-- while (!Equal(g[i1], this->Identity()))
-+ while (!this->Equal(g[i1], this->Identity()))
- {
- g[i2] = Mod(g[i0], g[i1]);
- unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
a/eccrypto.cpp 2010-08-06 18:44:28.0 +0200
-+++ b/eccrypto.cpp 2012-04-10 13:19:36.0 +0200
-@@ -435,7 +435,7 @@
- StringSource ssG(param.g, true, new HexDecoder);
- Element G;
- bool result = GetCurve().DecodePoint(G, ssG,
(size_t)ssG.MaxRetrievable());
-- SetSubgroupGenerator(G);
-+ this->SetSubgroupGenerator(G);
- assert(result);
-
- StringSource ssN(param.n, true, new HexDecoder);
-@@ -591,7 +591,7 @@
- if (level >= 2 && pass)
- {
- const Integer &q = GetSubgroupOrder();
-- Element gq = gpc ?
gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g,
q);
-+ Element gq = gpc ?
gpc->Exponentiate(this->GetGroupPrecomputation(), q) :
this->ExponentiateElement(g, q);
- pass = pass && IsIdentity(gq);
- }
- return pass;
-@@ -629,7 +629,7 @@
- typename EC::Point P;
- if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
- BERDecodeError();
-- SetPublicElement(P);
-+ this->SetPublicElement(P);
- }
-
- template
a/eccrypto.h 2010-08-06 18:46:24.0 +0200
-+++ b/eccrypto.h 2012-04-10 13:23:09.0 +0200
-@@ -43,7 +43,7 @@
- void Initialize(const EllipticCurve &ec, const Point &G, const Integer
&n, const Integer &k = Integer::Zero())
- {
- this->m_groupPrecomputation.SetCurve(ec);
-- SetSubgroupGenerator(G);
-+ this->SetSubgroupGenerator(G);
- m_n = n;
- m_k = k;
- }
-@@ -145,9 +145,9 @@
- typedef typename EC::Point Element;
-
- void Initialize(const DL_GroupParameters_EC ¶ms, const Element
&Q)
-- {this->AccessGroupParameters() = params; SetPublicElement(Q);}
-+ {this->AccessGroupParameters() = params;
this->SetPublicElement(Q);}
- void Initialize(const EC &ec, const Element &G, const Integer &n, const
Element &Q)
-- {this->AccessGroupParameters().Initialize(ec, G, n);
SetPublicElement(Q);}
-+ {this->AccessGroupParameters().Initialize(ec, G, n);
this->SetPublicElement(Q);}
-
- // X509PublicKey
- void BERDecodePublicKey(BufferedTransformation &bt, bool
parametersPresent, size_t size);
-@@ -166,9 +166,9 @@
- void Initialize(const EC &ec, const Element &G, const Integer &n, const
Integer &x)
- {this->AccessGroupParameters().Initialize(ec, G, n);
this->SetPrivateExponent(x);}
- void Initialize(RandomNumberGenerator &rng, const
DL_GroupParameters_EC ¶ms)
-- {GenerateRandom(rng, params);}
-+ {this->GenerateRandom(rng, params);}
- void Initialize(RandomNumberGenerator &rng, const EC &ec
[arch-commits] Commit in crypto++/trunk (PKGBUILD gcc4.7.patch)
Date: Tuesday, April 10, 2012 @ 16:46:26
Author: giovanni
Revision: 155987
upgpkg: crypto++ 5.6.1-4
Fixed FS29365 - fixed compile failure against gcc-4.7.0
Added:
crypto++/trunk/gcc4.7.patch
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD | 11 --
gcc4.7.patch | 97 +
2 files changed, 105 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2012-04-10 19:56:22 UTC (rev 155986)
+++ PKGBUILD2012-04-10 20:46:26 UTC (rev 155987)
@@ -8,7 +8,7 @@
pkgname=crypto++
pkgver=5.6.1
_srcver=561
-pkgrel=3
+pkgrel=4
pkgdesc="A free C++ class library of cryptographic schemes"
arch=('i686' 'x86_64')
url="http://www.cryptopp.com/";
@@ -16,13 +16,18 @@
depends=('gcc-libs')
makedepends=('unzip')
source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
-'libcrypto++.pc')
+'libcrypto++.pc'
+'gcc4.7.patch')
md5sums=('96cbeba0907562b077e26bcffb483828'
- '2337c6edbc552d9142cae8e0854715e7')
+ '2337c6edbc552d9142cae8e0854715e7'
+ 'cf26a783d9432e7f9ab7f14d3db3f196')
build() {
cd ${srcdir}
+ # Fix gcc 4.7 build
+ patch -Np1 -i "${srcdir}/gcc4.7.patch"
+
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
make -f GNUmakefile
Added: gcc4.7.patch
===
--- gcc4.7.patch(rev 0)
+++ gcc4.7.patch2012-04-10 20:46:26 UTC (rev 155987)
@@ -0,0 +1,97 @@
+--- a/algebra.cpp 2010-08-06 18:44:32.0 +0200
b/algebra.cpp 2012-04-10 13:16:53.0 +0200
+@@ -58,7 +58,7 @@
+ Element g[3]={b, a};
+ unsigned int i0=0, i1=1, i2=2;
+
+- while (!Equal(g[i1], this->Identity()))
++ while (!this->Equal(g[i1], this->Identity()))
+ {
+ g[i2] = Mod(g[i0], g[i1]);
+ unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
+--- a/eccrypto.cpp 2010-08-06 18:44:28.0 +0200
b/eccrypto.cpp 2012-04-10 13:19:36.0 +0200
+@@ -435,7 +435,7 @@
+ StringSource ssG(param.g, true, new HexDecoder);
+ Element G;
+ bool result = GetCurve().DecodePoint(G, ssG,
(size_t)ssG.MaxRetrievable());
+- SetSubgroupGenerator(G);
++ this->SetSubgroupGenerator(G);
+ assert(result);
+
+ StringSource ssN(param.n, true, new HexDecoder);
+@@ -591,7 +591,7 @@
+ if (level >= 2 && pass)
+ {
+ const Integer &q = GetSubgroupOrder();
+- Element gq = gpc ?
gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g,
q);
++ Element gq = gpc ?
gpc->Exponentiate(this->GetGroupPrecomputation(), q) :
this->ExponentiateElement(g, q);
+ pass = pass && IsIdentity(gq);
+ }
+ return pass;
+@@ -629,7 +629,7 @@
+ typename EC::Point P;
+ if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
+ BERDecodeError();
+- SetPublicElement(P);
++ this->SetPublicElement(P);
+ }
+
+ template
+--- a/eccrypto.h 2010-08-06 18:46:24.0 +0200
b/eccrypto.h 2012-04-10 13:23:09.0 +0200
+@@ -43,7 +43,7 @@
+ void Initialize(const EllipticCurve &ec, const Point &G, const Integer
&n, const Integer &k = Integer::Zero())
+ {
+ this->m_groupPrecomputation.SetCurve(ec);
+- SetSubgroupGenerator(G);
++ this->SetSubgroupGenerator(G);
+ m_n = n;
+ m_k = k;
+ }
+@@ -145,9 +145,9 @@
+ typedef typename EC::Point Element;
+
+ void Initialize(const DL_GroupParameters_EC ¶ms, const Element
&Q)
+- {this->AccessGroupParameters() = params; SetPublicElement(Q);}
++ {this->AccessGroupParameters() = params;
this->SetPublicElement(Q);}
+ void Initialize(const EC &ec, const Element &G, const Integer &n, const
Element &Q)
+- {this->AccessGroupParameters().Initialize(ec, G, n);
SetPublicElement(Q);}
++ {this->AccessGroupParameters().Initialize(ec, G, n);
this->SetPublicElement(Q);}
+
+ // X509PublicKey
+ void BERDecodePublicKey(BufferedTransformation &bt, bool
parametersPresent, size_t size);
+@@ -166,9 +166,9 @@
+ void Initialize(const EC &ec, const Element &G, const Integer &n, const
Integer &x)
+ {this->AccessGroupParameters().Initialize(ec, G, n);
this->SetPrivateExponent(x);}
+ void Initialize(RandomNumberGenerator &rng, const
DL_GroupParameters_EC ¶ms)
+- {GenerateRandom(rng, params);}
++ {this->GenerateRandom(rng, params);}
+ void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element
&G, const Integer &n)
+- {GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));}
++ {this->G
[arch-commits] Commit in crypto++/trunk (PKGBUILD)
Date: Monday, November 28, 2011 @ 12:06:30
Author: giovanni
Revision: 143720
upgpkg: crypto++ 5.6.1-3
rebuild
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD | 22 ++
1 file changed, 14 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-11-28 16:57:25 UTC (rev 143719)
+++ PKGBUILD2011-11-28 17:06:30 UTC (rev 143720)
@@ -8,28 +8,34 @@
pkgname=crypto++
pkgver=5.6.1
_srcver=561
-pkgrel=2
-pkgdesc="A free C++ class library of cryptographic schemes."
+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
-libcrypto++.pc)
+source=("http://www.cryptopp.com/cryptopp${_srcver}.zip";
+'libcrypto++.pc')
md5sums=('96cbeba0907562b077e26bcffb483828'
- '2337c6edbc552d9142cae8e0854715e7')
+ '2337c6edbc552d9142cae8e0854715e7')
build() {
cd ${srcdir}
+
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
make -f GNUmakefile
make libcryptopp.so
+}
+
+package() {
+ cd ${srcdir}
+
install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
install -m644 *.h ${pkgdir}/usr/include/cryptopp/
- install -m644 libcryptopp.a ${pkgdir}/usr/lib/libcryptopp.a
- install -m644 libcryptopp.so ${pkgdir}/usr/lib/libcryptopp.so
+ install -m644 libcryptopp.a "${pkgdir}/usr/lib/libcryptopp.a"
+ 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
+ install -D -m644 License.txt
"${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
[arch-commits] Commit in crypto++/trunk (PKGBUILD libcrypto++.pc)
Date: Sunday, March 6, 2011 @ 09:15:54
Author: giovanni
Revision: 112753
upgpkg: crypto++ 5.6.1-2
Fixed FS23005 and FS23008
Added:
crypto++/trunk/libcrypto++.pc
Modified:
crypto++/trunk/PKGBUILD
+
PKGBUILD | 22 +++---
libcrypto++.pc | 11 +++
2 files changed, 26 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2011-03-06 13:10:51 UTC (rev 112752)
+++ PKGBUILD2011-03-06 14:15:54 UTC (rev 112753)
@@ -1,5 +1,6 @@
# $Id$
# Maintainer: Giovanni Scafora
+# Contributor: Alexander Rødseth
# Contributor: Andrea Scarpino
# Contributor: Kritoke
# Contributor: jlvsimoes
@@ -7,21 +8,28 @@
pkgname=crypto++
pkgver=5.6.1
_srcver=561
-pkgrel=1
+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')
-url="http://www.cryptopp.com/";
-source=(http://www.cryptopp.com/cryptopp${_srcver}.zip)
-md5sums=('96cbeba0907562b077e26bcffb483828')
+source=(http://www.cryptopp.com/cryptopp${_srcver}.zip
+libcrypto++.pc)
+md5sums=('96cbeba0907562b077e26bcffb483828'
+ '2337c6edbc552d9142cae8e0854715e7')
build() {
cd ${srcdir}
sed -i -e 's/^CXXFLAGS/#CXXFLAGS/' GNUmakefile
- make -f GNUmakefile || return 1
- install -d ${pkgdir}/usr/{lib,include/cryptopp}
+ export CXXFLAGS="${CXXFLAGS} -DNDEBUG -fPIC"
+ make -f GNUmakefile
+ make libcryptopp.so
+ install -d ${pkgdir}/usr/{lib/pkgconfig,include/cryptopp}
install -m644 *.h ${pkgdir}/usr/include/cryptopp/
- install -m644 libcryptopp.a ${pkgdir}/usr/lib/
+ install -m644 libcryptopp.a ${pkgdir}/usr/lib/libcryptopp.a
+ 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
}
Added: libcrypto++.pc
===
--- libcrypto++.pc (rev 0)
+++ libcrypto++.pc 2011-03-06 14:15:54 UTC (rev 112753)
@@ -0,0 +1,11 @@
+# Written by Alexander Rødseth
+
+prefix=/usr
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: libcrypto++-5.6.1
+Description: Class library of cryptographic schemes
+Version: 5.6.1
+Libs: -L${libdir} -lcryptopp
+Cflags: -I${includedir}
[arch-commits] Commit in crypto++/trunk (PKGBUILD)
Date: Saturday, November 6, 2010 @ 06:51:05
Author: giovanni
Revision: 98274
upgpkg: crypto++ 5.6.1-1
upstream release
Modified:
crypto++/trunk/PKGBUILD
--+
PKGBUILD |8
1 file changed, 4 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2010-11-06 08:15:00 UTC (rev 98273)
+++ PKGBUILD2010-11-06 10:51:05 UTC (rev 98274)
@@ -5,16 +5,16 @@
# Contributor: jlvsimoes
pkgname=crypto++
-pkgver=5.6.0
-_srcver=560
-pkgrel=2
+pkgver=5.6.1
+_srcver=561
+pkgrel=1
pkgdesc="A free C++ class library of cryptographic schemes."
arch=('i686' 'x86_64')
license=('custom')
makedepends=('unzip')
url="http://www.cryptopp.com/";
source=(http://www.cryptopp.com/cryptopp${_srcver}.zip)
-md5sums=('36f35789ad60489d58003d3c849807e8')
+md5sums=('96cbeba0907562b077e26bcffb483828')
build() {
cd ${srcdir}
[arch-commits] Commit in crypto++/trunk (PKGBUILD)
Date: Wednesday, February 10, 2010 @ 09:23:08 Author: giovanni Revision: 68023 Modified: crypto++/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-10 14:13:39 UTC (rev 68022) +++ PKGBUILD2010-02-10 14:23:08 UTC (rev 68023) @@ -1,6 +1,6 @@ # $Id$ -# Maintainer: Andrea Scarpino -# Contributor: Damir +# Maintainer: Giovanni Scafora +# Contributor: Andrea Scarpino # Contributor: Kritoke # Contributor: jlvsimoes
