jose 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1a9a636263c7a8b720c8f54649b22a02d3afd4e
-  data.tar.gz: f5a8c4e5ed511dc60a7df47ed4239eeff3437513
+  metadata.gz: 0d737f594b6ef3c926a323bc2c06b797ce24fc09
+  data.tar.gz: 8a4989e67d3dcbea62c84f1f60a40b41f3ca5a74
 SHA512:
-  metadata.gz: 89419348db067439802b64b2018ba3706e904be1f164255e046d3a39879b874e88b6772ebd6777b6634b2447ef4daae8300c710a59b637b809019774561b2968
-  data.tar.gz: 6e5c379c6de44614898d587aa09e810a968b163121859627e5f9f8dfcfa4bf5a31720af2300f9671272515a7c92528a84a6d74e8a959b5b6d6978546039a1bab
+  metadata.gz: 5f079c8178b435afd07a54c61e415b84ac4f9c0197b7961adde3313e460088a1b979a3d79f8308d4a64be686d5d4da7dba4af1bce38dc918c198102898717279
+  data.tar.gz: 569191e6793162f0ca29a9efa2d45fd09208f629b8e2e043ca08db21c4590f58c15aec92af220b7ad32bc2f8a3bc29819ef5efe1cdd81d2bb58bacdca8002e46

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.1.1 (2016-05-27)
+
+* Enhancements
+  * Support for `JOSE::JWK::Set` for key sets.
+
+* Fixes
+  * Many of the file writing operations for `JOSE::JWK` have been fixed.
+
 ## 1.1.0 (2016-05-10)
 
 * Enhancements

data/docs/KeyGeneration.md

@@ -127,7 +127,7 @@ jwk_oct64 = JOSE::JWE.generate_key({"alg" => "dir", "enc" => "A256CBC-HS512"})
 
 ### Method 4
 
-If you have a JWS header with an `"alg"` field that requires a symmetric key, a new `oct` key will be generated based on the byte size recommended for `"alg".
+If you have a JWS header with an `"alg"` field that requires a symmetric key, a new `oct` key will be generated based on the byte size recommended for `"alg"`.
 
 ```ruby
 jwk_oct32 = JOSE::JWS.generate_key({"alg" => "HS256"})

data/lib/jose/jwk.rb

@@ -340,6 +340,8 @@ module JOSE
       end
       if key and jwe
         return JOSE::JWE.block_encrypt(key, to_binary, jwe)
+      elsif kty.nil? and keys
+        return keys.to_map(fields)
       else
         return kty.to_map(fields)
       end
@@ -370,7 +372,7 @@ module JOSE
     # @param [String] file
     # @return [Fixnum] bytes written
     def self.to_oct_file(jwk, file)
-      return from(jwk).to_file(file)
+      return from(jwk).to_oct_file(file)
     end
 
     # Calls {JOSE::JWK#to_oct JOSE::JWK#to_oct} on a {JOSE::JWK JOSE::JWK} and then writes the binary to `file`.
@@ -425,7 +427,7 @@ module JOSE
     # @param [String] file
     # @return [Fixnum] bytes written
     def self.to_openssh_key_file(jwk, file)
-      return from(jwk).to_file(file)
+      return from(jwk).to_openssh_key_file(file)
     end
 
     # Calls {JOSE::JWK#to_openssh_key JOSE::JWK#to_openssh_key} on a {JOSE::JWK JOSE::JWK} and then writes the binary to `file`.
@@ -464,7 +466,7 @@ module JOSE
     # @param [String] password
     # @return [Fixnum] bytes written
     def self.to_pem_file(jwk, file, password = nil)
-      return from(jwk).to_file(file, password)
+      return from(jwk).to_pem_file(file, password)
     end
 
     # Calls {JOSE::JWK#to_pem JOSE::JWK#to_pem} on a {JOSE::JWK JOSE::JWK} and then writes the binary to `file`.

data/lib/jose/jwk/kty.rb

@@ -1,8 +1,6 @@
 module JOSE::JWK::KTY
 
-  extend self
-
-  def from_key(object)
+  def self.from_key(object)
     object = object.__getobj__ if object.is_a?(JOSE::JWK::PKeyProxy)
     case object
     when OpenSSL::PKey::EC
@@ -10,11 +8,11 @@ module JOSE::JWK::KTY
     when OpenSSL::PKey::RSA
       return JOSE::JWK::KTY_RSA.from_key(object)
     else
-      raise ArgumentError, "'object' is not a recognized key type"
+      raise ArgumentError, "'object' is not a recognized key type: #{object.class.name}"
     end
   end
 
-  def key_encryptor(kty, fields, key)
+  def self.key_encryptor(kty, fields, key)
     if key.is_a?(String)
       return JOSE::Map[
         'alg' => 'PBES2-HS256+A128KW',

data/lib/jose/jwk/set.rb

@@ -1,2 +1,23 @@
-class JOSE::JWK::Set
+require 'hamster/vector'
+
+# Immutable Set structure based on `Hamster::Vector`.
+class JOSE::JWK::Set < Hamster::Vector
+
+  def self.from_map(fields)
+    if fields['keys'].is_a?(Array)
+      keys = fields['keys'].map do |key|
+        next JOSE::JWK.from(key)
+      end
+      return JOSE::JWK::Set.new(keys), fields.except('keys')
+    end
+    raise ArgumentError, "invalid 'OKP' crv 'X448' JWK"
+  end
+
+  def to_map(fields)
+    jwks = self.map do |key|
+      next key.to_map
+    end.to_a
+    return fields.put('keys', jwks)
+  end
+
 end

data/lib/jose/version.rb

@@ -1,3 +1,3 @@
 module JOSE
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jose
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Andrew Bennett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hamster