aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/pubkey/mce/polyn_gf2m.cpp
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-02-20 05:25:41 -0500
committerJack Lloyd <[email protected]>2016-02-20 05:25:41 -0500
commit5af4a5e714e1a1ca6d205fc199ad80ee5e77a6f9 (patch)
tree187d1f8a598b6b4a3a0bd516fa00061cb4257cdb /src/lib/pubkey/mce/polyn_gf2m.cpp
parentd679355787ed98ca9028f21e24da803910aaad13 (diff)
parent3a8dcbed75892ee63d73e9f9310f811e6267e504 (diff)
Merge GH #427 Fix remaining Wshadow warnings
Diffstat (limited to 'src/lib/pubkey/mce/polyn_gf2m.cpp')
-rw-r--r--src/lib/pubkey/mce/polyn_gf2m.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/pubkey/mce/polyn_gf2m.cpp b/src/lib/pubkey/mce/polyn_gf2m.cpp
index 01a62da7d..a957b8cc1 100644
--- a/src/lib/pubkey/mce/polyn_gf2m.cpp
+++ b/src/lib/pubkey/mce/polyn_gf2m.cpp
@@ -647,16 +647,16 @@ polyn_gf2m::polyn_gf2m(int t, Botan::RandomNumberGenerator& rng, std::shared_ptr
int i;
(*this).set_coef( t, 1);
i = 0;
- int m_deg;
+ int degree = 0;
do
{
for (i = 0; i < t; ++i)
{
(*this).set_coef( i, random_code_element(sp_field->get_cardinality(), rng));
}
- polyn_gf2m::degppf(*this, &m_deg);
+ polyn_gf2m::degppf(*this, &degree);
}
- while (m_deg < t);
+ while (degree < t);
}
@@ -666,15 +666,15 @@ void polyn_gf2m::poly_shiftmod( const polyn_gf2m & g)
{
throw Invalid_Argument("shiftmod cannot be called on polynomials of degree 1 or less");
}
- std::shared_ptr<GF2m_Field> msp_field = g.msp_field;
+ std::shared_ptr<GF2m_Field> field = g.msp_field;
int t = g.get_degree();
- gf2m a = msp_field->gf_div(this->coeff[t-1], g.coeff[t]);
+ gf2m a = field->gf_div(this->coeff[t-1], g.coeff[t]);
for (int i = t - 1; i > 0; --i)
{
this->coeff[i] = this->coeff[i - 1] ^ this->msp_field->gf_mul(a, g.coeff[i]);
}
- this->coeff[0] = msp_field->gf_mul(a, g.coeff[0]);
+ this->coeff[0] = field->gf_mul(a, g.coeff[0]);
}
std::vector<polyn_gf2m> polyn_gf2m::sqrt_mod_init(const polyn_gf2m & g)