elliptic_curve 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7fdf2755e2f03cc6623c7647268b39129c98bfa2
-  data.tar.gz: 108fddf54a5bec531c59edf61c1f8e36561cfea8
+  metadata.gz: db57f3625d3dd2ed4d017d7a5ac8bcfe469cc6a7
+  data.tar.gz: a9b590fb8e516aef2531171d95024a6f394e904e
 SHA512:
-  metadata.gz: a1e2dca08a4adb58a31c16ed61083a24bfc176e71a2fb5e87aedbb04e8a455f3469ca5497db971108416c968994f49bd80b5b1655a475d7777fe916fec6b5994
-  data.tar.gz: 31a9813ca2b05350f4a1e25583add234b2da74ee0862c714f9a8a6f589420e1b99fa4d89035056af44f2d2cd9bbb796bb1ec46c3caff39521d1c42c17e7bbaaa
+  metadata.gz: 88ed2e75f60cbdf1689dd1681c59a84eb107981493ad257a086dfad655668d553ce59fc037c7785b9ea06be34269a288df994c32cab440b46381195cfe892405
+  data.tar.gz: 28cb354ed7193a57a0f65d26e1f8590319cafe4bacd109520dc655764b4d0f945bf787c908ab45c97e0a15b9f0fe74972ce3d2d5f4f8bd0c42d6e0caa0246228

data/lib/elliptic_curve.rb

@@ -35,6 +35,28 @@ module EllipticCurve
         return t
       end
     end
+
+    # Adds two points together - searches the third point on a line between the two
+    # points
+    def add(p1, p2)
+      if p2.is_infinity?
+        return p1
+      elsif p1.is_infinity?
+        return p2
+      elsif p1.x == p2.x
+        if p1.y == -p2.y
+          return P.new(ec, Float::INFINITY, Float::INFINITY)
+        else
+          k = (3 * p1.x**2+@a) * get_inv_p(2 * p1.y)
+          x = (k**2 - 2 * p1.x) % @p
+          return P.new(self, x, (k*(p1.x-x)-p1.y) % @p)
+        end
+      else
+        k = (p2.y-p1.y) * get_inv_p(p2.x-p1.x)
+        x = (k**2-p1.x-p2.x) % @p
+        return P.new(self, x, (k * (p1.x-x)-p1.y) % @p)
+      end
+    end
   end
 
   # A point on an elliptic curve
@@ -55,23 +77,7 @@ module EllipticCurve
 
     # Adds p2 to self
     def +(p2)
-      if p2.is_infinity?
-        return self
-      elsif is_infinity?
-        return p2
-      elsif @x == p2.x
-        if @y == -p2.y
-          return P.new(ec, Float::INFINITY, Float::INFINITY)
-        else
-          k = (3 * @x**2+@ec.a) * @ec.get_inv_p(2 * @y)
-          x = (k**2 - 2 * @x) % @ec.p
-          return P.new(@ec, x, (k*(@x-x)-@y) % @ec.p)
-        end
-      else
-        k = (p2.y-@y) * @ec.get_inv_p(p2.x-@x)
-        x = (k**2-@x-p2.x) % @ec.p
-        return P.new(@ec, x, (k * (@x-x)-@y) % @ec.p)
-      end
+      @ec.add(self, p2)
     end
 
     # Multiplies itself by d

data/lib/elliptic_curve/version.rb

@@ -1,3 +1,3 @@
 module EllipticCurve
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elliptic_curve
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Linus Gasser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler