diff options
| author | lloyd <[email protected]> | 2009-09-08 23:59:48 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-09-08 23:59:48 +0000 |
| commit | 91c7165b698e34c9bbdbcaafe1dd28459fc8c804 (patch) | |
| tree | dbe6b0152dbd0e035eebefdf8c98497adec2816d /src/math/gfpmath/point_gfp.cpp | |
| parent | 166e979eebe6e3f136df4deba626b584e1d735ae (diff) | |
| parent | abcfd1cf4b351f856c2df11ed1cd972a3a5155a9 (diff) | |
propagate from branch 'net.randombit.botan' (head 5cadcc57872bef55226579df57349fe09a93d1f5)
to branch 'net.randombit.botan.c++0x' (head d1747f0394aa4442e5b32b9102b830e1a86f0e5a)
Diffstat (limited to 'src/math/gfpmath/point_gfp.cpp')
| -rw-r--r-- | src/math/gfpmath/point_gfp.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/math/gfpmath/point_gfp.cpp b/src/math/gfpmath/point_gfp.cpp index 9139c3ef9..c997ac525 100644 --- a/src/math/gfpmath/point_gfp.cpp +++ b/src/math/gfpmath/point_gfp.cpp @@ -109,7 +109,7 @@ const PointGFp& PointGFp::assign_within_same_curve(PointGFp const& other) return *this; } -void PointGFp::set_shrd_mod(std::tr1::shared_ptr<GFpModulus> p_mod) +void PointGFp::set_shrd_mod(std::shared_ptr<GFpModulus> p_mod) { mX.set_shrd_mod(p_mod); mY.set_shrd_mod(p_mod); @@ -133,7 +133,7 @@ void PointGFp::ensure_worksp() const } } - mp_worksp_gfp_el = std::tr1::shared_ptr<std::vector<GFpElement> >(new std::vector<GFpElement>); + mp_worksp_gfp_el = std::shared_ptr<std::vector<GFpElement> >(new std::vector<GFpElement>); mp_worksp_gfp_el->reserve(9); for (u32bit i=0; i<GFPEL_WKSP_SIZE; i++) { @@ -337,8 +337,8 @@ PointGFp& PointGFp::mult_this_secure(const BigInt& scalar, // use montgomery mult. in this operation this->turn_on_sp_red_mul(); - std::tr1::shared_ptr<PointGFp> H(new PointGFp(this->mC)); - std::tr1::shared_ptr<PointGFp> tmp; // used for AADA + std::shared_ptr<PointGFp> H(new PointGFp(this->mC)); + std::shared_ptr<PointGFp> tmp; // used for AADA PointGFp P(*this); BigInt m(scalar); @@ -477,15 +477,15 @@ PointGFp& PointGFp::operator*=(const BigInt& scalar) return *this; } -inline std::tr1::shared_ptr<PointGFp> PointGFp::mult_loop(int l, +inline std::shared_ptr<PointGFp> PointGFp::mult_loop(int l, const BigInt& m, - std::tr1::shared_ptr<PointGFp> H, - std::tr1::shared_ptr<PointGFp> tmp, + std::shared_ptr<PointGFp> H, + std::shared_ptr<PointGFp> tmp, const PointGFp& P) { //assert(l >= (int)m.bits()- 1); tmp = H; - std::tr1::shared_ptr<PointGFp> to_add(new PointGFp(P)); // we just need some point + std::shared_ptr<PointGFp> to_add(new PointGFp(P)); // we just need some point // so that we can use op= // inside the loop for (int i=l; i >=0; i--) |