wok-current view cryptopp/stuff/cryptopp-5.6.1-gcc-4.7.0.patch @ rev 16805

Up hastapd (2.2)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Jul 06 10:56:03 2014 +0200 (2014-07-06)
parents
children
line source
1 --- cryptopp/algebra.cpp 2010-08-06 18:44:32.000000000 +0300
2 +++ cryptopp/algebra.cpp 2012-01-05 03:32:21.337004210 +0200
3 @@ -58,7 +58,7 @@
4 Element g[3]={b, a};
5 unsigned int i0=0, i1=1, i2=2;
6
7 - while (!Equal(g[i1], this->Identity()))
8 + while (!this->Equal(g[i1], this->Identity()))
9 {
10 g[i2] = Mod(g[i0], g[i1]);
11 unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
12 --- cryptopp/eccrypto.cpp 2010-08-06 18:44:28.000000000 +0300
13 +++ cryptopp/eccrypto.cpp 2012-01-05 04:04:08.055499801 +0200
14 @@ -435,7 +435,7 @@
15 StringSource ssG(param.g, true, new HexDecoder);
16 Element G;
17 bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable());
18 - SetSubgroupGenerator(G);
19 + this->SetSubgroupGenerator(G);
20 assert(result);
21
22 StringSource ssN(param.n, true, new HexDecoder);
23 @@ -591,7 +591,7 @@
24 if (level >= 2 && pass)
25 {
26 const Integer &q = GetSubgroupOrder();
27 - Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q);
28 + Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q);
29 pass = pass && IsIdentity(gq);
30 }
31 return pass;
32 @@ -629,7 +629,7 @@
33 typename EC::Point P;
34 if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
35 BERDecodeError();
36 - SetPublicElement(P);
37 + this->SetPublicElement(P);
38 }
39
40 template <class EC>
41 --- cryptopp/eccrypto.h 2010-08-06 18:46:24.000000000 +0300
42 +++ cryptopp/eccrypto.h 2012-01-05 04:04:54.672022639 +0200
43 @@ -43,7 +43,7 @@
44 void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero())
45 {
46 this->m_groupPrecomputation.SetCurve(ec);
47 - SetSubgroupGenerator(G);
48 + this->SetSubgroupGenerator(G);
49 m_n = n;
50 m_k = k;
51 }
52 @@ -145,9 +145,9 @@
53 typedef typename EC::Point Element;
54
55 void Initialize(const DL_GroupParameters_EC<EC> &params, const Element &Q)
56 - {this->AccessGroupParameters() = params; SetPublicElement(Q);}
57 + {this->AccessGroupParameters() = params; this->SetPublicElement(Q);}
58 void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q)
59 - {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);}
60 + {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);}
61
62 // X509PublicKey
63 void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
64 @@ -166,9 +166,9 @@
65 void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x)
66 {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);}
67 void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> &params)
68 - {GenerateRandom(rng, params);}
69 + {this->GenerateRandom(rng, params);}
70 void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n)
71 - {GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
72 + {this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
73
74 // PKCS8PrivateKey
75 void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
76 --- cryptopp/panama.cpp 2010-08-09 14:22:42.000000000 +0300
77 +++ cryptopp/panama.cpp 2012-01-05 04:10:36.356525599 +0200
78 @@ -422,7 +422,7 @@
79 {
80 this->ThrowIfInvalidTruncatedSize(size);
81
82 - PadLastBlock(this->BLOCKSIZE, 0x01);
83 + this->PadLastBlock(this->BLOCKSIZE, 0x01);
84
85 HashEndianCorrectedBlock(this->m_data);
86
87 --- cryptopp/secblock.h 2012-01-03 23:15:48.287022036 +0200
88 +++ cryptopp/secblock.h 2012-01-05 03:22:06.097299323 +0200
89 @@ -89,7 +89,7 @@
90
91 pointer allocate(size_type n, const void * = NULL)
92 {
93 - CheckSize(n);
94 + this->CheckSize(n);
95 if (n == 0)
96 return NULL;
97