hollalinux
/
slackbuilds
mirror of https://github.com/SlackBuildsOrg/slackbuilds.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libraries/cryptopp: Updated for version 5.6.2. 

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Markus Reichelt 2013-12-26 20:58:56 +01:00 committed by Erik Hanson
parent fb2b2ab24a
commit 0a3b50f54e
3 changed files with 12 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
libraries/cryptopp/cryptopp-5.6.1-gcc-4.7.0.patch
View File

@ -1,97 +0,0 @@
--- cryptopp/algebra.cpp 2010-08-06 18:44:32.000000000 +0300
+++ cryptopp/algebra.cpp 2012-01-05 03:32:21.337004210 +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;
--- cryptopp/eccrypto.cpp 2010-08-06 18:44:28.000000000 +0300
+++ cryptopp/eccrypto.cpp 2012-01-05 04:04:08.055499801 +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 <class EC>
--- cryptopp/eccrypto.h 2010-08-06 18:46:24.000000000 +0300
+++ cryptopp/eccrypto.h 2012-01-05 04:04:54.672022639 +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<EC> &params, 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<EC> &params)
- {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>(ec, G, n));}
+ {this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
// PKCS8PrivateKey
void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
--- cryptopp/panama.cpp 2010-08-09 14:22:42.000000000 +0300
+++ cryptopp/panama.cpp 2012-01-05 04:10:36.356525599 +0200
@@ -422,7 +422,7 @@
{
this->ThrowIfInvalidTruncatedSize(size);
- PadLastBlock(this->BLOCKSIZE, 0x01);
+ this->PadLastBlock(this->BLOCKSIZE, 0x01);
HashEndianCorrectedBlock(this->m_data);
--- cryptopp/secblock.h 2012-01-03 23:15:48.287022036 +0200
+++ cryptopp/secblock.h 2012-01-05 03:22:06.097299323 +0200
@@ -89,7 +89,7 @@
pointer allocate(size_type n, const void * = NULL)
{
- CheckSize(n);
+ this->CheckSize(n);
if (n == 0)
return NULL;

24
libraries/cryptopp/cryptopp.SlackBuild
View File

@ -3,15 +3,11 @@
# Slackware build script for cryptopp
# Written by Iskar Enev (iskar.enev@gmail.com)
#
# Maintained by markus reichelt <slackbuilds@mareichelt.de> 0xCCEEF115
# 2011 Apr 02 - adapt GNUmakefile to v5.6.1
# create proper html documentation (optional via DOC=yes)
# in case you also want man pages installed along html doc,
# read comments below and adapt accordingly
# Maintained by Markus Reichelt <slackbuilds@mareichelt.de> 0xCCEEF115
PRGNAM=cryptopp
VERSION=${VERSION:-5.6.1}
BUILD=${BUILD:-2}
VERSION=${VERSION:-5.6.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -51,10 +47,10 @@ unzip -a -d $PRGNAM-$VERSION $CWD/${PRGNAM}$(echo $VERSION | tr -d .).zip
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
# Fix Makefile to install correctly on x86_64.
sed -i "s%(PREFIX)/lib%(PREFIX)/lib${LIBDIRSUFFIX}%g" GNUmakefile
@ -62,14 +58,10 @@ sed -i "s%(PREFIX)/lib%(PREFIX)/lib${LIBDIRSUFFIX}%g" GNUmakefile
# Fix Makefile to remove copying of non-existent *.so (else make install will fail)
sed -i "/*.so/d" GNUmakefile
# Fix gcc-4.7.x builds
# https://lists.fedoraproject.org/pipermail/devel/2011-December/160723.html
patch -p1 < $CWD/cryptopp-5.6.1-gcc-4.7.0.patch
make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS"
make install PREFIX=$PKG/usr
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION

8
libraries/cryptopp/cryptopp.info
View File

@ -1,10 +1,10 @@
PRGNAM="cryptopp"
VERSION="5.6.1"
VERSION="5.6.2"
HOMEPAGE="http://www.cryptopp.com/"
DOWNLOAD="http://www.cryptopp.com/cryptopp561.zip"
MD5SUM="96cbeba0907562b077e26bcffb483828"
DOWNLOAD="http://www.cryptopp.com/cryptopp562.zip"
MD5SUM="7ed022585698df48e65ce9218f6c6a67"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="markus reichelt"
MAINTAINER="Markus Reichelt"
EMAIL="slackbuilds@mareichelt.de"