Delete gfp_element.h and remove the gfpmath tests

5 files changed, 0 insertions, 781 deletions

diff --git a/checks/gfpmath.cpp b/checks/gfpmath.cpp
deleted file mode 100644
index 276375fc4..000000000
--- a/checks/gfpmath.cpp
+++ /dev/null
@@ -1,527 +0,0 @@
-/******************************************************
-* gfp_element tests                                   *
-*                                                     *
-* (C) 2007 Patrick Sona                               *
-*                                                     *
-*          Falko Strenzke                             *
-*          [email protected]                     *
-* (C) 2008 Jack Lloyd                                 *
-******************************************************/
-
-#include "validate.h"
-
-#if defined(BOTAN_HAS_BIGINT_GFP)
-
-#include <botan/bigint.h>
-#include <botan/numthry.h>
-#include <botan/gfp_element.h>
-#include <botan/curve_gfp.h>
-#include <botan/ec_dompar.h>
-
-#include <iostream>
-
-using namespace Botan;
-
-std::ostream& operator<<(std::ostream& output, const GFpElement& elem)
-   {
-   return output << '(' << elem.get_value() << ',' << elem.get_p() << ')';
-   }
-
-#define CHECK_MESSAGE(expr, print) if(!(expr)) { std::cout << print << "\n"; pass = false; }
-#define CHECK(expr) if(!(expr)) { std::cout << #expr << "\n"; pass = false; }
-
-namespace {
-
-bool test_turn_on_sp_red_mul()
-   {
-   std::cout << "." << std::flush;
-
-   bool pass = true;
-
-   GFpElement a1(23,15);
-   GFpElement b1(23,18);
-
-   GFpElement c1 = a1*b1;
-
-   GFpElement a2(23,15);
-   GFpElement b2(23,18);
-
-   GFpElement c2 = a2*b2;
-
-   if(c1 != c2)
-      {
-      std::cout << "test_turn_on_sp_red_mul: ";
-      std::cout << "c1 = " << c1 << " != ";
-      std::cout << "c2 = " << c2 << "\n";
-      return false; // test failed
-      }
-
-   return pass; // pass
-   }
-
-bool test_bi_div_even()
-   {
-   std::cout << "." << std::flush;
-
-   bool pass = true;
-
-   std::string str_large("1552518092300708935148979488462502555256886017116696611139052038026050952686323255099158638440248181850494907312621195144895406865083132424709500362534691373159016049946612882688577088900506460909202178541447303914546699487373976586");
-   BigInt to_div(str_large);
-   BigInt half = to_div/2;
-   BigInt should_be_to_div = half*2;
-   CHECK_MESSAGE(should_be_to_div == to_div, "error in division/multiplication of large BigInt");
-
-   // also testing /=...
-   BigInt before_div = to_div;
-   to_div /= 2;
-   BigInt should_be_before(to_div*2);
-   CHECK_MESSAGE(should_be_before == before_div, "error in division/multiplication of large BigInt");
-
-   return pass;
-   }
-
-bool test_bi_div_odd()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string str_large("1552518092300708935148979488462502555256886017116696611139052038026050952686323255099158638440248181850494907312621195144895406865083132424709500362534691373159016049946612882688577088900506460909202178541447303914546699487373976585");
-   BigInt to_div(str_large);
-   BigInt half = to_div/2;
-   BigInt should_be_to_div = half*2;
-   BigInt diff = should_be_to_div-to_div;
-   CHECK_MESSAGE((diff <= 1) && (diff >= BigInt("-1")), "error in division/multiplication (/) of large BigInt, differnce = " << diff);
-
-   // also testing /=...
-   BigInt before_div = to_div;
-   to_div /= 2;
-   BigInt should_be_before(to_div*2);
-   BigInt diff2(should_be_before - before_div);
-   CHECK_MESSAGE((diff2 <= 1) && (diff2 >= BigInt("-1")), "error in division/multiplication (/=) of large BigInt, difference = " << diff2);
-
-   return pass;
-   }
-
-bool test_deep_montgm()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string s_prime = "5334243285367";
-   //std::string s_prime = "5";
-   BigInt bi_prime(s_prime);
-   std::string s_value_a = "3333333333334";
-   //std::string s_value_a = "4";
-   BigInt bi_value_a(s_value_a);
-   std::string s_value_b = "4444444444444";
-   //std::string s_value_b = "3";
-   BigInt bi_value_b(s_value_b);
-
-   GFpElement gfp_a_trf(bi_prime, bi_value_a);
-   GFpElement gfp_a_ntrf(bi_prime, bi_value_a);
-   GFpElement gfp_b_trf(bi_prime, bi_value_b);
-   GFpElement gfp_b_ntrf(bi_prime, bi_value_b);
-
-   GFpElement c_trf(gfp_a_trf * gfp_b_trf);
-   GFpElement c_ntrf(gfp_a_ntrf * gfp_b_ntrf);
-
-   if(c_trf != c_ntrf)
-      {
-      std::cout << "test_deep_montgm - " << c_trf << " != " << c_ntrf << "\n";
-      }
-   return pass; // pass
-   }
-
-bool test_gfp_div_small_numbers()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string s_prime = "13";
-   BigInt bi_prime(s_prime);
-   std::string s_value_a = "2";
-   BigInt bi_value_a(s_value_a);
-   std::string s_value_b = "3";
-   BigInt bi_value_b(s_value_b);
-
-   GFpElement gfp_a(bi_prime, bi_value_a);
-   GFpElement gfp_b(bi_prime, bi_value_b);
-   GFpElement gfp_c(bi_prime, bi_value_b);
-
-   GFpElement res_div_m = gfp_a / gfp_b;
-
-   GFpElement res_div_n = gfp_a / gfp_c;
-
-   CHECK_MESSAGE(res_div_n.get_value() == res_div_m.get_value(), "transformed result is not equal to untransformed result");
-   CHECK_MESSAGE(gfp_a.get_value() == s_value_a, "GFpElement has changed while division operation");
-   CHECK_MESSAGE(gfp_b.get_value() == s_value_b, "GFpElement has changed while division operation");
-   GFpElement inverse_b = inverse(gfp_b);
-   GFpElement res_div_alternative = gfp_a * inverse_b;
-
-   if(res_div_m != res_div_alternative)
-      {
-      std::cout << "test_gfp_div_small_numbers - a/b != a*b^-1 where\n"
-                << "a = " << gfp_a << "\n"
-                << "b = " << gfp_b << "\n"
-                << "b^-1 = " << inverse_b << "\n"
-                << "a*b^-1 = " << res_div_alternative << "\n"
-                << "a/b = " << res_div_n << "\n";
-      pass = false;
-      }
-
-   CHECK_MESSAGE(res_div_m == res_div_alternative, "a/b is not as equal to a * b^-1");
-   //cout << "Div-result transformed:" << res_div_m.get_value() << endl;
-   //cout << "Div-result untransformed:" << res_div_n.get_value() << endl;
-   //cout << "Div-Alternative: " << res_div_alternative.get_value() << endl;
-   return pass;
-   }
-
-bool test_gfp_basics()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string s_prime = "5334243285367";
-   BigInt bi_prime(s_prime);
-   std::string s_value_a = "3333333333333";
-   BigInt bi_value_a(s_value_a);
-
-   GFpElement gfp_a(bi_prime, bi_value_a);
-   CHECK(gfp_a.get_p() == s_prime);
-   CHECK(gfp_a.get_value() == s_value_a);
-   return pass;
-   }
-
-bool test_gfp_addSubNegate()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string s_prime = "5334243285367";
-   BigInt bi_prime(s_prime);
-   std::string s_value_a = "3333333333333";
-   BigInt bi_value_a(s_value_a);
-
-   GFpElement gfp_a(bi_prime, bi_value_a);
-   GFpElement gfp_b(bi_prime, bi_value_a);
-
-   gfp_b.negate();
-   GFpElement zero = gfp_a + gfp_b;
-   BigInt bi_zero("0");
-   CHECK(zero.get_value() == bi_zero);
-   CHECK(gfp_a.get_value() == bi_value_a);
-   return pass;
-   }
-
-bool test_gfp_mult()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string s_prime = "5334243285367";
-   BigInt bi_prime(s_prime);
-   std::string s_value_a = "3333333333333";
-   BigInt bi_value_a(s_value_a);
-   std::string s_value_b = "4444444444444";
-   BigInt bi_value_b(s_value_b);
-
-   GFpElement gfp_a(bi_prime, bi_value_a);
-   GFpElement gfp_b(bi_prime, bi_value_b);
-   GFpElement gfp_c(bi_prime, bi_value_b);
-
-   GFpElement res_mult_m = gfp_a * gfp_b;
-
-   GFpElement res_mult_n = gfp_a * gfp_c;
-
-   if(res_mult_n != res_mult_m)
-      std::cout << gfp_a << " * " << gfp_b << " =? "
-                << "n = " << res_mult_n << " != m = " << res_mult_m << "\n";
-   return pass;
-   }
-
-bool test_gfp_div()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string s_prime = "5334243285367";
-   BigInt bi_prime(s_prime);
-   std::string s_value_a = "3333333333333";
-   BigInt bi_value_a(s_value_a);
-   std::string s_value_b = "4444444444444";
-   BigInt bi_value_b(s_value_b);
-
-   GFpElement gfp_a(bi_prime, bi_value_a);
-   GFpElement gfp_b(bi_prime, bi_value_b);
-   GFpElement gfp_c(bi_prime, bi_value_b);
-
-   GFpElement res_div_m = gfp_a / gfp_b;
-
-   GFpElement res_div_n = gfp_a / gfp_c;
-
-   CHECK_MESSAGE(res_div_n.get_value() == res_div_m.get_value(), "transformed result is not equal to untransformed result");
-   CHECK_MESSAGE(gfp_a.get_value() == s_value_a, "GFpElement has changed while division operation");
-   CHECK_MESSAGE(gfp_b.get_value() == s_value_b, "GFpElement has changed while division operation");
-   GFpElement inverse_b = inverse(gfp_b);
-   GFpElement res_div_alternative = gfp_a * inverse_b;
-   CHECK_MESSAGE(res_div_m == res_div_alternative, "a/b is not as equal to a * b^-1");
-   //cout << "Div-result transformed:" << res_div_m.get_value() << endl;
-   //cout << "Div-result untransformed:" << res_div_n.get_value() << endl;
-   //cout << "Div-Alternative: " << res_div_alternative.get_value() << endl;
-   return pass;
-   }
-
-bool test_gfp_add()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string s_prime = "5334243285367";
-   BigInt bi_prime(s_prime);
-   std::string s_value_a = "3333333333333";
-   BigInt bi_value_a(s_value_a);
-   std::string s_value_b = "4444444444444";
-   BigInt bi_value_b(s_value_b);
-
-   GFpElement gfp_a(bi_prime, bi_value_a);
-   GFpElement gfp_b(bi_prime, bi_value_b);
-   GFpElement gfp_c(bi_prime, bi_value_b);
-
-   GFpElement res_add_m = gfp_a + gfp_b;
-
-   GFpElement res_add_n = gfp_a + gfp_c;
-
-   CHECK(res_add_n.get_value() == res_add_m.get_value());
-   return pass;
-   }
-
-bool test_gfp_sub()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string s_prime = "5334243285367";
-   BigInt bi_prime(s_prime);
-   std::string s_value_a = "3333333333333";
-   BigInt bi_value_a(s_value_a);
-   std::string s_value_b = "4444444444444";
-   BigInt bi_value_b(s_value_b);
-
-   GFpElement gfp_a(bi_prime, bi_value_a);
-   GFpElement gfp_b(bi_prime, bi_value_b);
-   GFpElement gfp_c(bi_prime, bi_value_b);
-
-   GFpElement res_sub_m = gfp_b - gfp_a;
-
-   GFpElement res_sub_n = gfp_c - gfp_a;
-
-   CHECK(res_sub_n.get_value() == res_sub_m.get_value());
-   return pass;
-   }
-
-bool test_more_gfp_div()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   std::string s_prime = "5334243285367";
-   BigInt bi_prime(s_prime);
-   std::string s_value_a = "3333333333333";
-   BigInt bi_value_a(s_value_a);
-   std::string s_value_b = "4444444444444";
-   BigInt bi_value_b(s_value_b);
-
-   GFpElement gfp_a(bi_prime, bi_value_a);
-   GFpElement gfp_b_trf(bi_prime, bi_value_b);
-   GFpElement gfp_b_ntrf(bi_prime, bi_value_b);
-
-   CHECK_MESSAGE(gfp_b_trf == gfp_b_ntrf, "b is not equal to itself (trf)");
-
-   GFpElement b_trf_inv(gfp_b_trf);
-   b_trf_inv.inverse_in_place();
-   GFpElement b_ntrf_inv(gfp_b_ntrf);
-   b_ntrf_inv.inverse_in_place();
-   CHECK_MESSAGE(b_trf_inv == b_ntrf_inv, "b inverted is not equal to itself (trf)");
-
-   CHECK(gfp_b_trf/gfp_b_ntrf == GFpElement(bi_prime, 1));
-   CHECK(gfp_b_trf/gfp_b_trf == GFpElement(bi_prime, 1));
-   CHECK(gfp_b_ntrf/gfp_b_ntrf == GFpElement(bi_prime, 1));
-   GFpElement rhs(gfp_a/gfp_b_trf);
-   GFpElement lhs(gfp_a/gfp_b_ntrf);
-
-   if(lhs != rhs)
-      {
-      std::cout << "test_more_gfp_div - " << lhs << " != " << rhs << "\n";
-      pass = false;
-      }
-
-   return pass;
-   }
-
-bool test_gfp_mult_u32bit()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   /*
-   Botan::EC_Domain_Params parA(Botan::get_EC_Dom_Pars_by_oid("1.2.840.10045.3.1.1"));
-   CurveGFp curve = parA.get_curve();
-   //CurveGFp curve2 = parA.get_curve();
-   BigInt p = curve.get_p();
-   GFpElement a = curve.get_a();
-   GFpElement a_mr = curve.get_mres_a();
-   Botan::u32bit u_x = 134234;
-   BigInt b_x(u_x);
-   GFpElement g_x(p, b_x);
-   CHECK(a*u_x == a*g_x);
-   CHECK(a*u_x == u_x*a);
-   CHECK(a*g_x == g_x*a);
-   CHECK(a_mr*u_x == a*g_x);
-   CHECK(u_x*a_mr == a*g_x);
-   */
-   return pass;
-   }
-
-bool test_gfp_swap()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   BigInt p("173");
-   GFpElement a(p, BigInt("2342"));
-   GFpElement b(p, BigInt("423420"));
-
-   swap(a,b);
-   CHECK_MESSAGE(b.get_value() == 2342%173, "actual value of b was: " << b.get_value() );
-   CHECK_MESSAGE(a.get_value() == 423420%173, "actual value of a was: " << a.get_value() );
-
-   GFpElement c(p, BigInt("2342329"));
-   GFpElement d(1,1);
-   d = c;
-   d += d;
-   c.swap(d);
-   CHECK(d.get_value() == 2342329%173);
-   CHECK(c.get_value() == (d*2).get_value());
-   return pass;
-   }
-
-bool test_inv_in_place()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   BigInt mod(173);
-   GFpElement a1(mod, 288);
-
-   GFpElement a1_inv(a1);
-   a1_inv.inverse_in_place();
-
-   GFpElement a2(mod, 288);
-   GFpElement a2_inv(a2);
-   a2_inv.inverse_in_place();
-
-   /*cout << "a1_inv = " << a1_inv << endl;
-   cout << "a2_inv = " << a2_inv << endl;*/
-   CHECK_MESSAGE(a1_inv == a2_inv, "error with inverting tranformed GFpElement");
-
-   CHECK(a1_inv.inverse_in_place() == a1);
-   CHECK(a2_inv.inverse_in_place() == a2);
-   return pass;
-   }
-
-bool test_op_eq()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   BigInt mod(173);
-   GFpElement a1(mod, 299);
-   GFpElement a2(mod, 288);
-   CHECK_MESSAGE(a1 != a2, "error with GFpElement comparison");
-   return pass;
-   }
-
-bool test_rand_int(RandomNumberGenerator& rng)
-   {
-   bool pass = true;
-
-   for(int i=0; i< 100; i++)
-      {
-      std::cout << '.' << std::flush;
-      BigInt x = BigInt::random_integer(rng, 1,3);
-      //cout << "x = " << x << "\n";  // only 1,2 are put out
-      CHECK(x == 1 || x==2);
-      }
-
-   return pass;
-   }
-
-bool test_bi_bit_access()
-   {
-   std::cout << '.' << std::flush;
-
-   bool pass = true;
-
-   BigInt a(323);
-   CHECK(a.get_bit(1) == 1);
-   CHECK(a.get_bit(1000) == 0);
-   return pass;
-   }
-
-}
-
-u32bit do_gfpmath_tests(Botan::RandomNumberGenerator& rng)
-   {
-   std::cout << "Testing GF(p) math " << std::flush;
-
-   u32bit failed = 0;
-
-   failed += !test_turn_on_sp_red_mul();
-   failed += !test_bi_div_even();
-   failed += !test_bi_div_odd();
-   failed += !test_deep_montgm();
-   failed += !test_gfp_div_small_numbers();
-   failed += !test_gfp_basics();
-   failed += !test_gfp_addSubNegate();
-   failed += !test_gfp_mult();
-   failed += !test_gfp_div();
-   failed += !test_gfp_add();
-   failed += !test_gfp_sub();
-   failed += !test_more_gfp_div();
-   failed += !test_gfp_mult_u32bit();
-   failed += !test_gfp_swap();
-   failed += !test_inv_in_place();
-   failed += !test_op_eq();
-   failed += !test_rand_int(rng);
-   failed += !test_bi_bit_access();
-   //failed += !test_sec_mod_mul();
-   //failed += !test_sec_bi_mul();
-
-#if 0
-   if(failed == 0)
-      std::cout << " OK";
-   else
-      std::cout << ' ' << failed << " failed";
-#endif
-
-   std::cout << std::endl;
-
-   return failed;
-   }
-#else
-u32bit do_gfpmath_tests(Botan::RandomNumberGenerator&) { return 0; }
-#endif
diff --git a/checks/pk.cpp b/checks/pk.cpp
index 9c243f1cf..07e6aeb10 100644
--- a/checks/pk.cpp
+++ b/checks/pk.cpp
@@ -769,7 +769,6 @@ u32bit do_pk_validation_tests(const std::string& filename,
 
    std::cout << std::endl;
 
-   errors += do_gfpmath_tests(rng);
    do_ec_tests(rng);
    errors += do_ecdsa_tests(rng);
    errors += do_eckaeg_tests(rng);
diff --git a/checks/validate.h b/checks/validate.h
index f7cc4bdf9..b0e3565f8 100644
--- a/checks/validate.h
+++ b/checks/validate.h
@@ -17,9 +17,6 @@ u32bit do_validation_tests(const std::string&,
 u32bit do_bigint_tests(const std::string&,
                        RandomNumberGenerator& rng);
 
-u32bit do_gfpmath_tests(RandomNumberGenerator& rng);
-
-
 u32bit do_pk_validation_tests(const std::string&,
                               RandomNumberGenerator&);
 
diff --git a/src/math/gfpmath/gfp_element.h b/src/math/gfpmath/gfp_element.h
deleted file mode 100644
index 17d4d9458..000000000
--- a/src/math/gfpmath/gfp_element.h
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
-* Arithmetic for prime fields GF(p)
-*
-* (C) 2007 Martin Doering, Christoph Ludwig, Falko Strenzke
-*     2008-2010 Jack Lloyd
-*
-* Distributed under the terms of the Botan license
-*/
-
-#ifndef BOTAN_GFP_ELEMENT_H__
-#define BOTAN_GFP_ELEMENT_H__
-
-#include <botan/bigint.h>
-#include <botan/numthry.h>
-
-namespace Botan {
-
-/**
- * This class represents one element in GF(p). Enables the convenient,
- * transparent use of the montgomery multiplication.
- */
-class BOTAN_DLL GFpElement
-   {
-   public:
-
-      /** construct an element of GF(p) with the given value.
-      * use_montg defaults to false and determines wether Montgomery
-      * multiplications will be use when applying operators *, *=
-      * @param p the prime number of the field
-      * @param value the element value
-      */
-      GFpElement(const BigInt& p, const BigInt& value) :
-         mod_p(p), m_value(value % p) {}
-
-      // GFpElement(const GFpElement& other) = default;
-      // const GFpElement& operator=(const GFpElement& other) = default;
-
-      /**
-      * += Operator
-      * @param rhs the GFpElement to add to the local value
-      * @result *this
-      */
-      GFpElement& operator+=(const GFpElement& rhs)
-         {
-         m_value += rhs.m_value;
-         if(m_value >= mod_p)
-            m_value -= mod_p;
-
-         return *this;
-         }
-
-      /**
-      * -= Operator
-      * @param rhs the GFpElement to subtract from the local value
-      * @result *this
-      */
-      GFpElement& operator-=(const GFpElement& rhs)
-         {
-         m_value -= rhs.m_value;
-         if(m_value.is_negative())
-            m_value += mod_p;
-
-         return *this;
-         }
-
-      /**
-      * *= Operator
-      * @param rhs the value to multiply with the local value
-      * @result *this
-      */
-      GFpElement& operator*=(u32bit rhs)
-         {
-         m_value *= rhs;
-         m_value %= mod_p;
-         return *this;
-         }
-
-      /**
-      * *= Operator
-      * @param rhs the GFpElement to multiply with the local value
-      * @result *this
-      */
-      GFpElement& operator*=(const GFpElement& rhs)
-         {
-         m_value *= rhs.m_value;
-         m_value %= mod_p;
-         return *this;
-         }
-
-      /**
-      * /= Operator
-      * @param rhs the GFpElement to divide the local value by
-      * @result *this
-      */
-      GFpElement& operator/=(const GFpElement& rhs)
-         {
-         GFpElement inv_rhs(rhs);
-         inv_rhs.inverse_in_place();
-         *this *= inv_rhs;
-         return *this;
-         }
-
-      /**
-      * Negate internal value(*this *= -1 )
-      * @return *this
-      */
-      GFpElement& negate()
-         {
-         m_value = mod_p - m_value;
-         return *this;
-         }
-
-      /**
-      * Assigns the inverse of *this to *this, i.e.
-      * *this = (*this)^(-1)
-      * @result *this
-      */
-      GFpElement& inverse_in_place()
-         {
-         m_value = inverse_mod(m_value, mod_p);
-         return *this;
-         }
-
-      /**
-      * checks whether the value is zero (without provoking
-      * a backtransformation to the ordinary-residue)
-      * @result true, if the value is zero, false otherwise.
-      */
-      bool is_zero() const { return m_value.is_zero(); }
-
-      /**
-      * return prime number of GF(p)
-      * @result a prime number
-      */
-      const BigInt& get_p() const { return mod_p; }
-
-      /**
-      * Return the represented value in GF(p)
-      * @result The value in GF(p)
-      */
-      const BigInt& get_value() const { return m_value; }
-
-      /**
-      * swaps the states of *this and other, does not throw!
-      * @param other The value to swap with
-      */
-      void swap(GFpElement& other)
-         {
-         std::swap(m_value, other.m_value);
-         std::swap(mod_p, other.mod_p);
-         }
-
-      bool operator==(const GFpElement& other) const
-         {
-         return (m_value == other.m_value && mod_p == other.mod_p);
-         }
-
-   private:
-      BigInt mod_p; // modulus
-      BigInt m_value;
-   };
-
-inline bool operator!=(const GFpElement& lhs, const GFpElement& rhs )
-   {
-   return !(lhs == rhs);
-   }
-
-// arithmetic operators
-inline GFpElement operator+(const GFpElement& lhs, const GFpElement& rhs)
-   {
-   GFpElement result(lhs);
-   result += rhs;
-   return result;
-   }
-
-inline GFpElement operator-(const GFpElement& lhs, const GFpElement& rhs)
-   {
-   GFpElement result(lhs);
-   result -= rhs;
-   return result;
-   }
-
-inline GFpElement operator-(const GFpElement& lhs)
-   {
-   return(GFpElement(lhs)).negate();
-   }
-
-inline GFpElement operator*(const GFpElement& lhs, u32bit rhs)
-   {
-   GFpElement result(lhs);
-   result *= rhs;
-   return result;
-   }
-
-inline GFpElement operator*(const GFpElement& lhs, const GFpElement& rhs)
-   {
-   GFpElement result(lhs);
-   result *= rhs;
-   return result;
-   }
-
-inline GFpElement operator*(u32bit rhs, const GFpElement& lhs)
-   {
-   return rhs*lhs;
-   }
-
-inline GFpElement operator/(const GFpElement& lhs, const GFpElement& rhs)
-   {
-   GFpElement result (lhs);
-   result /= rhs;
-   return result;
-   }
-
-// return (*this)^(-1)
-inline GFpElement inverse(const GFpElement& elem)
-   {
-   return GFpElement(elem).inverse_in_place();
-   }
-
-// encoding and decoding
-inline SecureVector<byte> FE2OSP(const GFpElement& elem)
-   {
-   return BigInt::encode_1363(elem.get_value(), elem.get_p().bytes());
-   }
-
-inline GFpElement OS2FEP(const MemoryRegion<byte>& os, const BigInt& p)
-   {
-   return GFpElement(p, BigInt::decode(os.begin(), os.size()));
-   }
-
-inline void swap(GFpElement& x, GFpElement& y)
-   {
-   x.swap(y);
-   }
-
-}
-
-namespace std {
-
-template<> inline
-void swap<Botan::GFpElement>(Botan::GFpElement& x,
-                             Botan::GFpElement& y)
-   {
-   x.swap(y);
-   }
-
-}
-
-#endif
diff --git a/src/math/gfpmath/info.txt b/src/math/gfpmath/info.txt
index 77d776a5e..482773cda 100644
--- a/src/math/gfpmath/info.txt
+++ b/src/math/gfpmath/info.txt
@@ -2,7 +2,6 @@ define BIGINT_GFP
 
 <header:public>
 curve_gfp.h
-gfp_element.h
 point_gfp.h
 </header:public>