X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/c3caa2face1cda7002eb58245ad75865bf437455..025c5f4aa5ffbf8948482a4233318db81c2df5d2:/calc/ecp.cal

diff --git a/calc/ecp.cal b/calc/ecp.cal
index 7c560c5..0163d5e 100644
--- a/calc/ecp.cal
+++ b/calc/ecp.cal
@@ -1,6 +1,6 @@
 /* -*-apcalc-*-
  *
- * $Id: ecp.cal,v 1.2 2004/03/21 22:52:06 mdw Exp $
+ * $Id: ecp.cal,v 1.5 2004/04/08 01:36:15 mdw Exp $
  *
  * Testbed for elliptic curve arithmetic over prime fields
  *
@@ -27,28 +27,10 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: ecp.cal,v $
- * Revision 1.2  2004/03/21 22:52:06  mdw
- * Merge and close elliptic curve branch.
- *
- * Revision 1.1.4.2  2004/03/20 00:13:31  mdw
- * Projective coordinates for prime curves
- *
- * Revision 1.1.4.1  2003/06/10 13:43:53  mdw
- * Simple (non-projective) curves over prime fields now seem to work.
- *
- * Revision 1.1  2000/10/08 16:01:37  mdw
- * Prototypes of various bits of code.
- *
- */
-
 /*----- Object types ------------------------------------------------------*/
 
 obj ecp_curve { a, b, p };
 obj ecp_pt { x, y, e };
-obj ecpp_pt { x, y, z, e };
 
 /*----- Main code ---------------------------------------------------------*/
 
@@ -70,72 +52,6 @@ define ecp_pt(x, y, e)
   return (p);
 }
 
-define ecpp_pt(p)
-{
-  local obj ecpp_pt pp;
-  if (istype(p, 1))
-    return (0);
-  pp.x = p.x;
-  pp.y = p.y;
-  pp.z = 1;
-  pp.e = p.e;
-  return (pp);
-}
-
-define ecpp_fix(pp)
-{
-  local obj ecp_pt p;
-  local e, zi, z2, z3;
-  if (istype(pp, 1) || pp.z == 0)
-    return (0);
-  e = pp.e;
-  zi = minv(pp.z, e.p);
-  z2 = zi * zi;
-  z3 = zi * z2;
-  p.x = pp.x * z2 % e.p;
-  p.y = pp.y * z3 % e.p;
-  p.e = e;
-  return (p);
-}
-
-define ecpp_dbl(a)
-{
-  local m, s, t, y2;
-  local e;
-  local obj ecpp_pt d;
-  if (istype(a, 1) || a.y == 0)
-    return (0);
-  e = a.e;
-  if (e.a % e.p == e.p - 3) {
-    m = a.z^3 % e.p;
-    m = 3 * (a.x + t4) * (a.x - t4) % e.p;
-  } else {
-    m = (3 * a.x^2 - e.a * a.z^4) % e.p;
-  }
-  d.z = 2 * a.y * a.z % e.p;
-  y2 = a.y^2 % e.p;
-  s = 4 * a.x * a.y % e.p;
-  d.x = (m^2 - 2 * s) % e.p;
-  d.y = (m * (s - d.x) - y * y2^2) % e.p;
-  d.e = e;
-  return (d);
-}
-
-define ecpp_add(a, b)
-{
-  if (a == 0)
-    d = b;
-  else if (b == 0)
-    d = a;
-  else if (!istype(a, b))
-    quit "bad type arguments to ecp_pt_add";
-  else if (a.e != b.e)
-    quit "points from different curves in ecp_pt_add";
-  else {
-    e = a.e;
-    
-}
-
 define ecp_pt_print(a)
 {
   print "(" : a.x : ", " : a.y : ")" :;
@@ -190,7 +106,7 @@ define ecp_pt_neg(a)
 {
   local obj ecp_pt d;
   d.x = a.x;
-  d.y = -a.y;
+  d.y = a.e.p - a.y;
   d.e = a.e;
   return (d);
 }