wok-6.x rev 13679
cryptopp: up 5.6.1
author | Samuel Trassare <samuel_trassare@yahoo.com> |
---|---|
date | Tue Nov 27 09:57:29 2012 -0800 (2012-11-27) |
parents | 57dede92d7fe |
children | ce9c00ae0e36 |
files | cryptopp/receipt cryptopp/stuff/cryptopp-5.6.1-gcc-4.7.0.patch |
line diff
1.1 --- a/cryptopp/receipt Mon Nov 26 20:16:31 2012 +0000 1.2 +++ b/cryptopp/receipt Tue Nov 27 09:57:29 2012 -0800 1.3 @@ -1,19 +1,21 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="cryptopp" 1.7 -VERSION="5.6.0" 1.8 +VERSION="5.6.1" 1.9 CATEGORY="security" 1.10 SHORT_DESC="C++ class library of cryptographic schemes." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 -TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.13 -WEB_SITE="http://www.cryptopp.com/" 1.14 -WGET_URL="http://mirror.slitaz.org/sources/packages/c/$TARBALL" 1.15 +TARBALL="${PACKAGE}561.zip" 1.16 +WEB_SITE="http://www.cryptopp.com" 1.17 +WGET_URL="$WEB_SITE/$TARBALL" 1.18 1.19 # Rules to configure and make the package. 1.20 compile_rules() 1.21 { 1.22 cd $src 1.23 - make && 1.24 + patch -Np1 < $stuff/$PACKAGE-$VERSION-gcc-4.7.0.patch 1.25 + make 1.26 + make libcryptopp.so 1.27 make PREFIX=$PWD/_pkg/usr install 1.28 } 1.29 1.30 @@ -21,8 +23,8 @@ 1.31 genpkg_rules() 1.32 { 1.33 mkdir -p $fs/usr/share/doc/$PACKAGE 1.34 - cp -a $_pkg/usr/lib $fs/usr 1.35 - cp -a $_pkg/usr/include $fs/usr 1.36 + cp -a $INSTALL/usr/lib $fs/usr 1.37 + cp -a $INSTALL/usr/include $fs/usr 1.38 cp $src/License.txt $fs/usr/share/doc/$PACKAGE 1.39 cp $src/Readme.txt $fs/usr/share/doc/$PACKAGE 1.40 }
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/cryptopp/stuff/cryptopp-5.6.1-gcc-4.7.0.patch Tue Nov 27 09:57:29 2012 -0800 2.3 @@ -0,0 +1,97 @@ 2.4 +--- cryptopp/algebra.cpp 2010-08-06 18:44:32.000000000 +0300 2.5 ++++ cryptopp/algebra.cpp 2012-01-05 03:32:21.337004210 +0200 2.6 +@@ -58,7 +58,7 @@ 2.7 + Element g[3]={b, a}; 2.8 + unsigned int i0=0, i1=1, i2=2; 2.9 + 2.10 +- while (!Equal(g[i1], this->Identity())) 2.11 ++ while (!this->Equal(g[i1], this->Identity())) 2.12 + { 2.13 + g[i2] = Mod(g[i0], g[i1]); 2.14 + unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; 2.15 +--- cryptopp/eccrypto.cpp 2010-08-06 18:44:28.000000000 +0300 2.16 ++++ cryptopp/eccrypto.cpp 2012-01-05 04:04:08.055499801 +0200 2.17 +@@ -435,7 +435,7 @@ 2.18 + StringSource ssG(param.g, true, new HexDecoder); 2.19 + Element G; 2.20 + bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable()); 2.21 +- SetSubgroupGenerator(G); 2.22 ++ this->SetSubgroupGenerator(G); 2.23 + assert(result); 2.24 + 2.25 + StringSource ssN(param.n, true, new HexDecoder); 2.26 +@@ -591,7 +591,7 @@ 2.27 + if (level >= 2 && pass) 2.28 + { 2.29 + const Integer &q = GetSubgroupOrder(); 2.30 +- Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q); 2.31 ++ Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q); 2.32 + pass = pass && IsIdentity(gq); 2.33 + } 2.34 + return pass; 2.35 +@@ -629,7 +629,7 @@ 2.36 + typename EC::Point P; 2.37 + if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) 2.38 + BERDecodeError(); 2.39 +- SetPublicElement(P); 2.40 ++ this->SetPublicElement(P); 2.41 + } 2.42 + 2.43 + template <class EC> 2.44 +--- cryptopp/eccrypto.h 2010-08-06 18:46:24.000000000 +0300 2.45 ++++ cryptopp/eccrypto.h 2012-01-05 04:04:54.672022639 +0200 2.46 +@@ -43,7 +43,7 @@ 2.47 + void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) 2.48 + { 2.49 + this->m_groupPrecomputation.SetCurve(ec); 2.50 +- SetSubgroupGenerator(G); 2.51 ++ this->SetSubgroupGenerator(G); 2.52 + m_n = n; 2.53 + m_k = k; 2.54 + } 2.55 +@@ -145,9 +145,9 @@ 2.56 + typedef typename EC::Point Element; 2.57 + 2.58 + void Initialize(const DL_GroupParameters_EC<EC> ¶ms, const Element &Q) 2.59 +- {this->AccessGroupParameters() = params; SetPublicElement(Q);} 2.60 ++ {this->AccessGroupParameters() = params; this->SetPublicElement(Q);} 2.61 + void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q) 2.62 +- {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);} 2.63 ++ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);} 2.64 + 2.65 + // X509PublicKey 2.66 + void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); 2.67 +@@ -166,9 +166,9 @@ 2.68 + void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x) 2.69 + {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);} 2.70 + void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> ¶ms) 2.71 +- {GenerateRandom(rng, params);} 2.72 ++ {this->GenerateRandom(rng, params);} 2.73 + void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n) 2.74 +- {GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));} 2.75 ++ {this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));} 2.76 + 2.77 + // PKCS8PrivateKey 2.78 + void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); 2.79 +--- cryptopp/panama.cpp 2010-08-09 14:22:42.000000000 +0300 2.80 ++++ cryptopp/panama.cpp 2012-01-05 04:10:36.356525599 +0200 2.81 +@@ -422,7 +422,7 @@ 2.82 + { 2.83 + this->ThrowIfInvalidTruncatedSize(size); 2.84 + 2.85 +- PadLastBlock(this->BLOCKSIZE, 0x01); 2.86 ++ this->PadLastBlock(this->BLOCKSIZE, 0x01); 2.87 + 2.88 + HashEndianCorrectedBlock(this->m_data); 2.89 + 2.90 +--- cryptopp/secblock.h 2012-01-03 23:15:48.287022036 +0200 2.91 ++++ cryptopp/secblock.h 2012-01-05 03:22:06.097299323 +0200 2.92 +@@ -89,7 +89,7 @@ 2.93 + 2.94 + pointer allocate(size_type n, const void * = NULL) 2.95 + { 2.96 +- CheckSize(n); 2.97 ++ this->CheckSize(n); 2.98 + if (n == 0) 2.99 + return NULL; 2.100 +