ed25519 1.1.0-jruby → 1.2.0-jruby

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe9a55bb4a20efc99365fc6ed06329de947ce39
-  data.tar.gz: 7913e3cd83720eb011f69069512f3791f1878839
+  metadata.gz: 76ca0515a8683246d8e7fbc1c07146be0e54a792
+  data.tar.gz: 86b5e56ebbaa380f439d950e8766c7f04d06b7eb
 SHA512:
-  metadata.gz: 3994f501b34ca888050eb0a7e7620a8e3570683d0207c21716c3c5ac27b063133f452fca7d0c658027cd00eeb15d7ed01cf7fcbdfa930791e7354f8c04933c46
-  data.tar.gz: 184956a2e7e6a414502d3b56fe814e216b622587789f1959b24d55d2c1b329740072a040b8f873385f146bd72da7d853c024a30ca100355c81b35b38b485fcc9
+  metadata.gz: 15e69cdf0fe054a0e141110244751cb35c0f35de1ae77255e74ecbdfb1a13db0454865683f3ec9f60d5bc60b5f3c7467808a04768762175feb081123eba86215
+  data.tar.gz: eef82ce281c07cba960ff9e49323c54fcb3fd5da313110256a7b838cafd628567c47ae29a25d172e05771232a323a9570bd42b9f9c0d1c98975fb79e79098253

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: jruby
 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
   requirement: !ruby/object:Gem::Requirement