ed25519 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dd01d95fcca1455ac061773818f610621a07f9a
-  data.tar.gz: 67daf64a3b6f8fc1a8e3e9ea9a8c13e0bef540f1
+  metadata.gz: 37c2f958c2f62a1bee8128cf0d5976813d52c7af
+  data.tar.gz: 89dcd85d4394c157728c734fcabaa2faa58fc404
 SHA512:
-  metadata.gz: 5e4e35563c5f28c6a898f1c0a927b66c263e388e1ea8b37ca0ee931eb35d6e32ac4d62a84b6126b668c089f07573186e7c452a5a5e29b2d94abe58f658162f7e
-  data.tar.gz: 34c896eba986c2023ddbadb56120608639acc9d7736f6d289679c6abe64e1a4a4590165589c662d2e70304657103e95db9201e790aec0066643900627ef06203
+  metadata.gz: 97c97a3102ea908aaa3307214cf6f0f309d3afc1b2e22940291970eae3aeab4c1bdda1bb782ae23072fc24d2f282d2e5c5968f5dbaf8c92e98335fc07adfc861
+  data.tar.gz: a951d6f5555edb3d70d726957b6215464d7716df63e4b58e078ce6f665641d3fc86ccd6c4abb3ee2c22f98d480585ab8f759240cb33e6f3bb3deb5593aa05686

data/CHANGES.md

@@ -1,3 +1,13 @@
+# [1.2.0] (2017-12-15)
+
+[1.2.0]: https://github.com/cryptosphere/x25519/compare/v1.1.0...v1.2.0
+
+* [#13](https://github.com/cryptosphere/ed25519/pull/13)
+  Add `Ed25519::SigningKey.from_keypair`
+
+* [#12](https://github.com/cryptosphere/ed25519/pull/12)
+  Add `Ed25519.validate_key_bytes` method
+
 # [1.1.0] (2017-12-13)
 
 [1.1.0]: https://github.com/cryptosphere/x25519/compare/v1.0.0...v1.1.0

data/README.md

@@ -5,7 +5,7 @@
 [build-image]: https://travis-ci.org/cryptosphere/ed25519.svg?branch=master
 [build-link]: https://travis-ci.org/cryptosphere/ed25519
 [docs-image]: https://img.shields.io/badge/yard-docs-blue.svg
-[docs-link]: http://www.rubydoc.info/gems/ed25519
+[docs-link]: http://www.rubydoc.info/gems/ed25519/1.2.0
 [license-image]: https://img.shields.io/badge/license-MIT-blue.svg
 [license-link]: https://github.com/cryptosphere/ed25519/blob/master/LICENSE
 

data/lib/ed25519.rb

@@ -35,6 +35,13 @@ module Ed25519
     self.provider = Ed25519::Provider::Ref10
   end
 
+  # Ensure a serialized key meets the requirements
+  def validate_key_bytes(key_bytes)
+    raise TypeError, "expected String, got #{key_bytes.class}" unless key_bytes.is_a?(String)
+    return true if key_bytes.bytesize == KEY_SIZE
+    raise ArgumentError, "expected #{KEY_SIZE}-byte String, got #{key_bytes.bytesize}"
+  end
+
   # Perform a self-test to ensure the selected provider is working
   def self_test
     signature_key = Ed25519::SigningKey.new("A" * 32)

data/lib/ed25519/signing_key.rb

@@ -12,13 +12,25 @@ module Ed25519
       new SecureRandom.random_bytes(Ed25519::KEY_SIZE)
     end
 
+    # Create a SigningKey from a 64-byte Ed25519 keypair (i.e. public + private)
+    #
+    # @param keypair [String] 64-byte keypair value containing both seed + public key
+    def self.from_keypair(keypair)
+      raise TypeError, "expected String, got #{keypair.class}" unless keypair.is_a?(String)
+      raise ArgumentError, "expected 64-byte String, got #{keypair.bytesize}" unless keypair.bytesize == 64
+
+      new(keypair[0, KEY_SIZE]).tap do |key|
+        raise ArgumentError, "corrupt keypair" unless keypair[KEY_SIZE, KEY_SIZE] == key.verify_key.to_bytes
+      end
+    end
+
     # Create a new Ed25519::SigningKey from the given seed value
     #
     # @param seed [String] 32-byte seed value from which the key should be derived
     def initialize(seed)
-      raise ArgumentError, "seed must be #{KEY_SIZE}-bytes long" unless seed.length == KEY_SIZE
-      @seed = seed
+      Ed25519.validate_key_bytes(seed)
 
+      @seed = seed
       @keypair = Ed25519.provider.create_keypair(seed)
       @verify_key = VerifyKey.new(@keypair[32, 32])
     end

data/lib/ed25519/verify_key.rb

@@ -7,7 +7,7 @@ module Ed25519
     #
     # @param key [String] 32-byte string representing a serialized public key
     def initialize(key)
-      raise ArgumentError, "seed must be 32 bytes long" unless key.length == KEY_SIZE
+      Ed25519.validate_key_bytes(key)
       @key_bytes = key
     end
 

data/lib/ed25519/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ed25519
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

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