wok annotate cryptopp/stuff/cryptopp-5.6.1-gcc-4.7.0.patch @ rev 19563

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