wok-6.x diff cryptopp/stuff/cryptopp-5.6.1-gcc-4.7.0.patch @ rev 13719
galculator: try to fix patching; lxappearance, gsynaptics: tidy gtk+ depends
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Fri Dec 21 04:34:21 2012 +0000 (2012-12-21) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/cryptopp/stuff/cryptopp-5.6.1-gcc-4.7.0.patch Fri Dec 21 04:34:21 2012 +0000 1.3 @@ -0,0 +1,97 @@ 1.4 +--- cryptopp/algebra.cpp 2010-08-06 18:44:32.000000000 +0300 1.5 ++++ cryptopp/algebra.cpp 2012-01-05 03:32:21.337004210 +0200 1.6 +@@ -58,7 +58,7 @@ 1.7 + Element g[3]={b, a}; 1.8 + unsigned int i0=0, i1=1, i2=2; 1.9 + 1.10 +- while (!Equal(g[i1], this->Identity())) 1.11 ++ while (!this->Equal(g[i1], this->Identity())) 1.12 + { 1.13 + g[i2] = Mod(g[i0], g[i1]); 1.14 + unsigned int t = i0; i0 = i1; i1 = i2; i2 = t; 1.15 +--- cryptopp/eccrypto.cpp 2010-08-06 18:44:28.000000000 +0300 1.16 ++++ cryptopp/eccrypto.cpp 2012-01-05 04:04:08.055499801 +0200 1.17 +@@ -435,7 +435,7 @@ 1.18 + StringSource ssG(param.g, true, new HexDecoder); 1.19 + Element G; 1.20 + bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable()); 1.21 +- SetSubgroupGenerator(G); 1.22 ++ this->SetSubgroupGenerator(G); 1.23 + assert(result); 1.24 + 1.25 + StringSource ssN(param.n, true, new HexDecoder); 1.26 +@@ -591,7 +591,7 @@ 1.27 + if (level >= 2 && pass) 1.28 + { 1.29 + const Integer &q = GetSubgroupOrder(); 1.30 +- Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q); 1.31 ++ Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q); 1.32 + pass = pass && IsIdentity(gq); 1.33 + } 1.34 + return pass; 1.35 +@@ -629,7 +629,7 @@ 1.36 + typename EC::Point P; 1.37 + if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) 1.38 + BERDecodeError(); 1.39 +- SetPublicElement(P); 1.40 ++ this->SetPublicElement(P); 1.41 + } 1.42 + 1.43 + template <class EC> 1.44 +--- cryptopp/eccrypto.h 2010-08-06 18:46:24.000000000 +0300 1.45 ++++ cryptopp/eccrypto.h 2012-01-05 04:04:54.672022639 +0200 1.46 +@@ -43,7 +43,7 @@ 1.47 + void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero()) 1.48 + { 1.49 + this->m_groupPrecomputation.SetCurve(ec); 1.50 +- SetSubgroupGenerator(G); 1.51 ++ this->SetSubgroupGenerator(G); 1.52 + m_n = n; 1.53 + m_k = k; 1.54 + } 1.55 +@@ -145,9 +145,9 @@ 1.56 + typedef typename EC::Point Element; 1.57 + 1.58 + void Initialize(const DL_GroupParameters_EC<EC> ¶ms, const Element &Q) 1.59 +- {this->AccessGroupParameters() = params; SetPublicElement(Q);} 1.60 ++ {this->AccessGroupParameters() = params; this->SetPublicElement(Q);} 1.61 + void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q) 1.62 +- {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);} 1.63 ++ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);} 1.64 + 1.65 + // X509PublicKey 1.66 + void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size); 1.67 +@@ -166,9 +166,9 @@ 1.68 + void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x) 1.69 + {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);} 1.70 + void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> ¶ms) 1.71 +- {GenerateRandom(rng, params);} 1.72 ++ {this->GenerateRandom(rng, params);} 1.73 + void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n) 1.74 +- {GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));} 1.75 ++ {this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));} 1.76 + 1.77 + // PKCS8PrivateKey 1.78 + void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); 1.79 +--- cryptopp/panama.cpp 2010-08-09 14:22:42.000000000 +0300 1.80 ++++ cryptopp/panama.cpp 2012-01-05 04:10:36.356525599 +0200 1.81 +@@ -422,7 +422,7 @@ 1.82 + { 1.83 + this->ThrowIfInvalidTruncatedSize(size); 1.84 + 1.85 +- PadLastBlock(this->BLOCKSIZE, 0x01); 1.86 ++ this->PadLastBlock(this->BLOCKSIZE, 0x01); 1.87 + 1.88 + HashEndianCorrectedBlock(this->m_data); 1.89 + 1.90 +--- cryptopp/secblock.h 2012-01-03 23:15:48.287022036 +0200 1.91 ++++ cryptopp/secblock.h 2012-01-05 03:22:06.097299323 +0200 1.92 +@@ -89,7 +89,7 @@ 1.93 + 1.94 + pointer allocate(size_type n, const void * = NULL) 1.95 + { 1.96 +- CheckSize(n); 1.97 ++ this->CheckSize(n); 1.98 + if (n == 0) 1.99 + return NULL; 1.100 +