x25519 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb37496fe14ef2bf58826e5b30805597b7031c5b
-  data.tar.gz: 02e5d45c634da965b9d351da48c1213f16de2eb0
+  metadata.gz: 228a5fff8ae6b51e46c91ab6e0fd9fce4ec03fbf
+  data.tar.gz: e2562bda953f96a37e0188820f6139641b715c6b
 SHA512:
-  metadata.gz: f8c40748f5937cba15380f71e729924764ee8e50f2992aff31ae91100d3efad634ee03ba51da02a62d4de5f243e56c7fc31af47d615b4b4a492df7f5ab937e43
-  data.tar.gz: afae5c90642ae8eeec06c2e107d522f0da19b4b74f6c6b22cd386ffe6590ec8bcab665b1affd136505a38a0b1aed3011d6034a9f7ce392bd106f3f2321492858
+  metadata.gz: 2eb051180a4fdf3f4735bcd39aad32a13d117bd3aad7ee1597f2563b7ae3afb3f1056b52caf4ffc7efce335cdeeb79497ce848388ee5d2f663c499f6067ae01a
+  data.tar.gz: 4f850779d9401fcfdfe7bf27bb89637c7848eec13158f5f7a176c7ca98eb8a34f546c116f16a5378b12df179790f86384e292abfb765277eba87a2686ea59358

data/CHANGES.md

@@ -1,3 +1,10 @@
+# [1.0.3] (2017-12-13)
+
+[1.0.3]: https://github.com/cryptosphere/x25519/compare/v1.0.2...v1.0.3
+
+* [#10](https://github.com/cryptosphere/x25519/pull/10)
+  Detect degenerate (i.e. all-zero) public keys (fixes #6)
+
 # [1.0.2] (2017-12-13)
 
 [1.0.2]: https://github.com/cryptosphere/x25519/compare/v1.0.1...v1.0.2

data/lib/x25519.rb

@@ -19,6 +19,9 @@ module X25519
   # Size of an X25519 key (public or private) in bytes
   KEY_SIZE = 32
 
+  # Raised when we detect a degenerate (i.e. all-zero) public key
+  InvalidKeyError = Class.new(StandardError)
+
   # Raised when the built-in self-test fails
   SelfTestFailure = Class.new(StandardError)
 
@@ -35,6 +38,18 @@ module X25519
   # fall back to the ref10 portable C implementation.
   self.provider = X25519::Provider::Precomputed if X25519::Provider::Precomputed.available?
 
+  # Raw fixed-base scalar multiplication function that acts directly on
+  # bytestrings. Calculates the coordinate of the elliptic curve point that
+  # represents the public key for a given scalar.
+  #
+  # @param scalar_bytes [String] a serialized private scalar
+  #
+  # @return [String] compressed Montgomery-u coordinate of the resulting point
+  def calculate_public_key(scalar_bytes)
+    validate_key_bytes(scalar_bytes)
+    provider.scalarmult_base(scalar_bytes)
+  end
+
   # Raw Diffie-Hellman function that acts directly on bytestrings. An
   # alternative to the object-oriented API
   #
@@ -45,7 +60,12 @@ module X25519
   def diffie_hellman(scalar_bytes, montgomery_u_bytes)
     validate_key_bytes(scalar_bytes)
     validate_key_bytes(montgomery_u_bytes)
-    X25519.provider.scalarmult(scalar_bytes, montgomery_u_bytes)
+
+    # The point located at a Montgomery-u coordinate of zero always returns
+    # the point at zero regardless of which scalar it's multiplied with
+    raise InvalidKeyError, "degenerate public key" if montgomery_u_bytes == ("\0" * KEY_SIZE)
+
+    provider.scalarmult(scalar_bytes, montgomery_u_bytes)
   end
 
   # Ensure a serialized key meets the requirements

data/lib/x25519/montgomery_u.rb

@@ -11,6 +11,11 @@ module X25519
     # @param bytes [String] 32-byte compressed Montgomery-u coordinate
     def initialize(bytes)
       X25519.validate_key_bytes(bytes)
+
+      # The point located at a Montgomery-u coordinate of zero always returns
+      # the point at zero regardless of which scalar it's multiplied with
+      raise InvalidKeyError, "degenerate public key" if bytes == ("\0" * KEY_SIZE)
+
       @bytes = bytes
     end
 

data/lib/x25519/scalar.rb

@@ -26,20 +26,20 @@ module X25519
     # @param montgomery_u [X25519::MontgomeryU] coordinate of the public key/point to perform D-H with
     #
     # @return [X25519::MontgomeryU] resulting point (i.e. D-H shared secret)
-    def multiply(montgomery_u)
+    def diffie_hellman(montgomery_u)
       raise TypeError, "expected X25519::MontgomeryU, got #{montgomery_u}" unless montgomery_u.is_a?(MontgomeryU)
-      MontgomeryU.new(X25519.provider.scalarmult(@scalar_bytes, montgomery_u.to_bytes))
+      MontgomeryU.new(X25519.diffie_hellman(@scalar_bytes, montgomery_u.to_bytes))
     end
-    alias diffie_hellman multiply
+    alias multiply diffie_hellman
 
     # Fixed-base scalar multiplication. Calculates a public key from a
     # private scalar
     #
     # @return [X25519::MontgomeryU] resulting point (i.e. public key)
-    def multiply_base
-      MontgomeryU.new(X25519.provider.scalarmult_base(@scalar_bytes))
+    def public_key
+      MontgomeryU.new(X25519.calculate_public_key(@scalar_bytes))
     end
-    alias public_key multiply_base
+    alias multiply_base public_key
 
     # Return a bytestring representation of this scalar
     #

data/lib/x25519/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module X25519
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: x25519
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Tony Arcieri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler