jose 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8804406a3e47d37b89da4315eb021d33d447ecf7
-  data.tar.gz: 9409c19e851ef2036b1fc843eeeaa3667c64ed40
+  metadata.gz: d1a9a636263c7a8b720c8f54649b22a02d3afd4e
+  data.tar.gz: f5a8c4e5ed511dc60a7df47ed4239eeff3437513
 SHA512:
-  metadata.gz: ade14cfd65ca8cab5f24b5329448db0e0ee19d04fa71ec43fda67300197563c361c20f2229dba79f0b6b4b01cf9440482cae460324ce069fa782c66e3430b284
-  data.tar.gz: 391d322825bf7905f41800ae0ed77f7d29b0c27018ac06e65bcf3d04288fe579191a4278beac44e5a2f09e2e9350c22da4cab0189c126fef258888d4e1f53516
+  metadata.gz: 89419348db067439802b64b2018ba3706e904be1f164255e046d3a39879b874e88b6772ebd6777b6634b2447ef4daae8300c710a59b637b809019774561b2968
+  data.tar.gz: 6e5c379c6de44614898d587aa09e810a968b163121859627e5f9f8dfcfa4bf5a31720af2300f9671272515a7c92528a84a6d74e8a959b5b6d6978546039a1bab

data/.gitignore

@@ -1,4 +1,5 @@
 /.bundle/
+/.minitest-perf.db
 /.yardoc
 /Gemfile.lock
 /_yardoc/

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 1.1.0 (2016-05-10)
+
+* Enhancements
+  * Test coverage is now slightly above 90%.
+  * Removed legacy support for 32-byte Ed448 and Ed448ph secret keys.
+  * Improved behavior of ECDH-ES encryption.
+
+* Fixes
+  * X25519 uses RbNaCl when available.
+  * Various argument order fixes.
+
 ## 1.0.0 (2016-05-07)
 
 * Enhancements

data/Gemfile

@@ -2,15 +2,18 @@ source 'https://rubygems.org'
 
 platforms :ruby do
   group :development do
-    gem "pry"
-    gem "pry-doc"
-    # gem "redcarpet"
-    # gem "yard"
+    gem 'pry'
+    gem 'pry-doc'
+    # gem 'redcarpet'
+    gem 'yard'
   end
 end
 
 group :test do
-  gem "simplecov", require: false
+  gem 'minitest-focus', require: false
+  gem 'minitest-perf', require: false
+  gem 'rantly', github: 'abargnesi/rantly', ref: '4d219ea3eb340a5153a43d051b2e22ccb2bce274', require: false
+  gem 'simplecov', require: false
   if ENV['CI']
     gem 'coveralls', require: false
   end

data/README.md

@@ -1,6 +1,6 @@
 # JOSE
 
-[![Travis](https://img.shields.io/travis/potatosalad/ruby-jose.svg?maxAge=2592000)](https://travis-ci.org/potatosalad/ruby-jose) [![Gem](https://img.shields.io/gem/v/jose.svg?maxAge=2592000)](https://rubygems.org/gems/jose) [![Docs](https://img.shields.io/badge/yard-docs-blue.svg?maxAge=2592000)](http://www.rubydoc.info/gems/jose) [![Inline docs](http://inch-ci.org/github/potatosalad/ruby-jose.svg?branch=master&style=shields)](http://inch-ci.org/github/potatosalad/ruby-jose)
+[![Travis](https://img.shields.io/travis/potatosalad/ruby-jose.svg?maxAge=86400)](https://travis-ci.org/potatosalad/ruby-jose) [![Coverage Status](https://coveralls.io/repos/github/potatosalad/ruby-jose/badge.svg?branch=master)](https://coveralls.io/github/potatosalad/ruby-jose?branch=master) [![Gem](https://img.shields.io/gem/v/jose.svg?maxAge=86400)](https://rubygems.org/gems/jose) [![Docs](https://img.shields.io/badge/yard-docs-blue.svg?maxAge=86400)](http://www.rubydoc.info/gems/jose) [![Inline docs](http://inch-ci.org/github/potatosalad/ruby-jose.svg?branch=master&style=shields)](http://inch-ci.org/github/potatosalad/ruby-jose)
 
 JSON Object Signing and Encryption (JOSE) for Ruby.
 
@@ -45,6 +45,7 @@ verified, message, = jwk.verify(signed)
 ```
 
 More details and examples:
+
 - [Getting Started](http://www.rubydoc.info/gems/jose/file/docs/GettingStarted.md)
 - [Key Generation](http://www.rubydoc.info/gems/jose/file/docs/KeyGeneration.md)
 - [Encryption Algorithms](http://www.rubydoc.info/gems/jose/file/docs/EncryptionAlgorithms.md)

data/lib/jose.rb

@@ -4,6 +4,7 @@ require 'base64'
 require 'hamster/hash'
 require 'json'
 require 'openssl'
+require 'securerandom'
 require 'thread'
 
 # JOSE stands for JSON Object Signing and Encryption which is a is a set of
@@ -129,20 +130,21 @@ module JOSE
   # @param [String] binary
   # @return [String]
   def self.urlsafe_decode64(binary)
+    binary = binary.tr('-_', '+/')
     case binary.bytesize % 4
     when 2
       binary += '=='
     when 3
       binary += '='
     end
-    return Base64.urlsafe_decode64(binary)
+    return Base64.decode64(binary)
   end
 
   # Returns the Base64Url encoded version of `binary` without padding.
   # @param [String] binary
   # @return [String]
   def self.urlsafe_encode64(binary)
-    return Base64.urlsafe_encode64(binary).tr('=', '')
+    return Base64.strict_encode64(binary).tr('+/', '-_').delete('=')
   end
 
 private

data/lib/jose/jwa/curve25519_rbnacl.rb

@@ -51,15 +51,15 @@ module JOSE::JWA::Curve25519_RbNaCl
   end
 
   def x25519_keypair(secret = nil)
-    return JOSE::JWA::X25519.keypair(secret)
+    return JOSE::JWA::X25519_RbNaCl.keypair(secret)
   end
 
   def x25519_secret_to_public(sk)
-    return JOSE::JWA::X25519.sk_to_pk(sk)
+    return JOSE::JWA::X25519_RbNaCl.sk_to_pk(sk)
   end
 
   def x25519_shared_secret(pk, sk)
-    return JOSE::JWA::X25519.shared_secret(pk, sk)
+    return JOSE::JWA::X25519_RbNaCl.shared_secret(pk, sk)
   end
 
 end

data/lib/jose/jwa/ed448.rb

@@ -5,15 +5,13 @@ module JOSE::JWA::Ed448
   C_bits = 456
   C_bytes = (C_bits + 7) / 8
   C_secretbytes = C_bytes
-  C_legacysecretbytes = 32
   C_publickeybytes = C_bytes
   C_secretkeybytes = C_secretbytes + C_publickeybytes
-  C_legacysecretkeybytes = C_legacysecretbytes + C_publickeybytes
   C_signaturebytes = C_bytes + C_bytes
   C_B = JOSE::JWA::Edwards448Point.stdbase.freeze
 
   def secret_to_curve448(secret)
-    raise ArgumentError, "secret must be #{C_secretbytes} bytes" if secret.bytesize != C_secretbytes and secret.bytesize != C_legacysecretbytes
+    raise ArgumentError, "secret must be #{C_secretbytes} bytes" if secret.bytesize != C_secretbytes
     curve448_scalar = JOSE::JWA::SHA3.shake256(secret, 114)[0, 56]
     curve448_scalar.setbyte(0, curve448_scalar.getbyte(0) & 252)
     curve448_scalar.setbyte(55, curve448_scalar.getbyte(55) | 128)
@@ -21,7 +19,7 @@ module JOSE::JWA::Ed448
   end
 
   def secret_to_pk(secret)
-    raise ArgumentError, "secret must be #{C_secretbytes} bytes" if secret.bytesize != C_secretbytes and secret.bytesize != C_legacysecretbytes
+    raise ArgumentError, "secret must be #{C_secretbytes} bytes" if secret.bytesize != C_secretbytes
     return (C_B * OpenSSL::BN.new(secret_to_curve448(secret).reverse, 2).to_i).encode()
   end
 
@@ -34,13 +32,11 @@ module JOSE::JWA::Ed448
 
   def sk_to_secret(sk)
     return sk[0, C_secretbytes] if sk.bytesize == C_secretkeybytes
-    return sk[0, C_legacysecretbytes] if sk.bytesize == C_legacysecretkeybytes
     raise ArgumentError, "sk must be #{C_secretkeybytes} bytes"
   end
 
   def sk_to_pk(sk)
     return sk[C_secretbytes, C_secretkeybytes] if sk.bytesize == C_secretkeybytes
-    return sk[C_legacysecretbytes, C_legacysecretkeybytes] if sk.bytesize == C_legacysecretkeybytes
     raise ArgumentError, "sk must be #{C_secretkeybytes} bytes"
   end
 
@@ -56,14 +52,12 @@ module JOSE::JWA::Ed448
   end
 
   def sign(m, sk, ctx = nil)
-    raise ArgumentError, "sk must be #{C_secretkeybytes} bytes" if sk.bytesize != C_secretkeybytes and sk.bytesize != C_legacysecretkeybytes
+    raise ArgumentError, "sk must be #{C_secretkeybytes} bytes" if sk.bytesize != C_secretkeybytes
     ctx ||= ''
     raise ArgumentError, "ctx must be 255 bytes or smaller" if ctx.bytesize > 255
     secret, pk = nil, nil
     if sk.bytesize == C_secretkeybytes
       secret, pk = sk[0, 57], sk[57, 114]
-    elsif sk.bytesize == C_legacysecretkeybytes
-      secret, pk = sk[0, 32], sk[32, 89]
     end
     khash = JOSE::JWA::SHA3.shake256(secret, 114)
     curve448_scalar, seed = khash[0, 57], khash[57, 114]
@@ -83,15 +77,13 @@ module JOSE::JWA::Ed448
   end
 
   def sign_ph(m, sk, ctx = nil)
-    raise ArgumentError, "sk must be #{C_secretkeybytes} bytes" if sk.bytesize != C_secretkeybytes and sk.bytesize != C_legacysecretkeybytes
+    raise ArgumentError, "sk must be #{C_secretkeybytes} bytes" if sk.bytesize != C_secretkeybytes
     ctx ||= ''
     raise ArgumentError, "ctx must be 255 bytes or smaller" if ctx.bytesize > 255
     m = JOSE::JWA::SHA3.shake256(['SigEd448', 2, ctx.bytesize, ctx, m].pack('a*CCa*a*'), 64)
     secret, pk = nil, nil
     if sk.bytesize == C_secretkeybytes
       secret, pk = sk[0, 57], sk[57, 114]
-    elsif sk.bytesize == C_legacysecretkeybytes
-      secret, pk = sk[0, 32], sk[32, 89]
     end
     khash = JOSE::JWA::SHA3.shake256(secret, 114)
     curve448_scalar, seed = khash[0, 57], khash[57, 114]

data/lib/jose/jwa/field_element.rb

@@ -106,7 +106,7 @@ class JOSE::JWA::FieldElement
   end
 
   def sign
-    return @x%2
+    return @x % 2.to_bn
   end
 
   def value

data/lib/jose/jwe.rb

@@ -231,15 +231,15 @@ module JOSE
   #     # => "{}"
   #
   #     # ECDH-ES+A192KW with EC keypairs
-  #     encrypted_ecdhesa192kw_alice2bob = JOSE::JWE.block_encrypt({jwk_ec256_bob_pk, jwk_ec256_alice_sk}, "{}", { "alg" => "ECDH-ES+A192KW", "enc" => "A192GCM" }).compact
+  #     encrypted_ecdhesa192kw_alice2bob = JOSE::JWE.block_encrypt([jwk_ec256_bob_pk, jwk_ec256_alice_sk], "{}", { "alg" => "ECDH-ES+A192KW", "enc" => "A192GCM" }).compact
   #     # => "eyJhbGciOiJFQ0RILUVTK0ExOTJLVyIsImVuYyI6IkExOTJHQ00iLCJlcGsiOnsiY3J2IjoiUC0yNTYiLCJrdHkiOiJFQyIsIngiOiI0OFFVM1EwQ3lTeHdKYkV3V3JKcllYbHA4OF9kVnBIVHhxNGF2YzY2aDVRIiwieSI6Ilp6cXJJTnRNTXhIeFEtUUI3MlJNY2RsbURzT0l3bEtoTXFWbV9nWVdDMTQifX0.S9LZ1i_Lua_if4I83WcaCQ9yT5qqPI_NhCFR7tMiZDQ.kG3taKEjGeKDRTzs.H1s.oVGBFP63z4gd3e-R2d1cmA"
-  #     JOSE::JWE.block_decrypt({jwk_ec256_alice_pk, jwk_ec256_bob_sk}, encrypted_ecdhesa192kw_alice2bob).first
+  #     JOSE::JWE.block_decrypt([jwk_ec256_alice_pk, jwk_ec256_bob_sk], encrypted_ecdhesa192kw_alice2bob).first
   #     # => "{}"
   #
   #     # ECDH-ES+A256KW with EC keypairs
-  #     encrypted_ecdhesa256kw_alice2bob = JOSE::JWE.block_encrypt({jwk_ec256_bob_pk, jwk_ec256_alice_sk}, "{}", { "alg" => "ECDH-ES+A256KW", "enc" => "A256GCM" }).compact
+  #     encrypted_ecdhesa256kw_alice2bob = JOSE::JWE.block_encrypt([jwk_ec256_bob_pk, jwk_ec256_alice_sk], "{}", { "alg" => "ECDH-ES+A256KW", "enc" => "A256GCM" }).compact
   #     # => "eyJhbGciOiJFQ0RILUVTK0EyNTZLVyIsImVuYyI6IkEyNTZHQ00iLCJlcGsiOnsiY3J2IjoiUC0yNTYiLCJrdHkiOiJFQyIsIngiOiI0OFFVM1EwQ3lTeHdKYkV3V3JKcllYbHA4OF9kVnBIVHhxNGF2YzY2aDVRIiwieSI6Ilp6cXJJTnRNTXhIeFEtUUI3MlJNY2RsbURzT0l3bEtoTXFWbV9nWVdDMTQifX0.4KWy1-vRiJyNINF6mWYbUPPTVNG9ADfvvfpSDbddPTftz7GmUHUsuQ.IkRhtGH23R-9dFF3.9yk.RnALhnqWMHWCZFxqc-DU4A"
-  #     JOSE::JWE.block_decrypt({jwk_ec256_alice_pk, jwk_ec256_bob_sk}, encrypted_ecdhesa256kw_alice2bob).first
+  #     JOSE::JWE.block_decrypt([jwk_ec256_alice_pk, jwk_ec256_bob_sk], encrypted_ecdhesa256kw_alice2bob).first
   #     # => "{}"
   #
   # See {JOSE::JWK.box_encrypt JOSE::JWK.box_encrypt} for generating an Ephemeral Public Key based on the same curve as the supplied other party key in the same step.

data/lib/jose/jwe/alg.rb

@@ -1,8 +1,13 @@
 module JOSE::JWE::ALG
 
-  extend self
-
-  def generate_key(parameters, algorithm, encryption)
+  # Generates a new {JOSE::JWK JOSE::JWK} based on the `parameters`, `algorithm`, and `encryption`.
+  #
+  # @see JOSE::JWK.generate_key
+  # @param [Array] parameters
+  # @param [String] algorithm
+  # @param [String] encryption
+  # @return [JOSE::JWK]
+  def self.generate_key(parameters, algorithm, encryption)
     return JOSE::JWK.generate_key(parameters).merge({
       'alg' => algorithm,
       'enc' => encryption,

data/lib/jose/jwk.rb

@@ -597,7 +597,16 @@ module JOSE
     # @param [JOSE::EncryptedBinary, JOSE::EncryptedMap] encrypted
     # @return [[String, JOSE::JWE]]
     def self.block_decrypt(jwk, encrypted)
-      return from(jwk).block_decrypt(encrypted)
+      if jwk.is_a?(Array)
+        public_jwk, secret_jwk = from(jwk)
+        if secret_jwk.nil?
+          secret_jwk = public_jwk
+          public_jwk = nil
+        end
+        return box_decrypt(secret_jwk, encrypted, public_jwk)
+      else
+        return from(jwk).block_decrypt(encrypted)
+      end
     end
 
     # Decrypts the `encrypted` binary or map using the `jwk`.
@@ -617,7 +626,11 @@ module JOSE
     # @param [JOSE::JWE] jwe
     # @return [JOSE::EncryptedMap]
     def self.block_encrypt(jwk, plain_text, jwe = nil)
-      return from(jwk).block_encrypt(plain_text, jwe)
+      if jwk.is_a?(Array)
+        return box_encrypt(plain_text, from(jwk), jwe)
+      else
+        return from(jwk).block_encrypt(plain_text, jwe)
+      end
     end
 
     # Encrypts the `plain_text` using the `jwk` and algorithms specified by the `jwe`.
@@ -688,8 +701,8 @@ module JOSE
     # @param [JOSE::JWE] jwe
     # @return [JOSE::EncryptedMap, [JOSE::EncryptedMap, JOSE::JWK]]
     def self.box_encrypt(plain_text, box_keys, jwe = nil)
-      other_public_key, my_private_key = box_keys
-      return from(other_public_key).box_encrypt(plain_text, my_private_jwk, jwe)
+      jwk_public, jwk_secret = from(box_keys)
+      return jwk_public.box_encrypt(plain_text, jwk_secret, jwe)
     end
 
     # Key Agreement encryption of `plain_text` by generating an ephemeral private key based on `other_public_jwk` curve.
@@ -699,42 +712,51 @@ module JOSE
     # @see JOSE::JWK.box_decrypt
     # @see JOSE::JWE.block_encrypt
     # @param [String] plain_text
-    # @param [JOSE::JWK] my_private_jwk
+    # @param [JOSE::JWK] jwk_secret
     # @param [JOSE::JWE] jwe
     # @return [JOSE::EncryptedMap, [JOSE::EncryptedMap, JOSE::JWK]]
-    def box_encrypt(plain_text, my_private_jwk = nil, jwe = nil)
-      generated_jwk = nil
-      other_public_jwk = self
-      if my_private_jwk.nil?
-        generated_jwk = my_private_jwk = other_public_jwk.generate_key
+    def box_encrypt(plain_text, jwk_secret = nil, jwe = nil)
+      epk_secret = nil
+      jwk_public = self
+      if jwk_secret.nil?
+        epk_secret = jwk_secret = jwk_public.generate_key
       end
-      if not my_private_jwk.is_a?(JOSE::JWK)
-        my_private_jwk = JOSE::JWK.from(my_private_jwk)
+      if not jwk_secret.is_a?(JOSE::JWK)
+        jwk_secret = JOSE::JWK.from(jwk_secret)
       end
       if jwe.nil?
-        jwe = other_public_jwk.block_encryptor
+        jwe = jwk_public.block_encryptor
       end
       if jwe.is_a?(Hash)
         jwe = JOSE::Map.new(jwe)
       end
       if jwe.is_a?(JOSE::Map)
         if jwe['apu'].nil?
-          jwe = jwe.put('apu', my_private_jwk.fields['kid'] || my_private_jwk.thumbprint)
+          jwe = jwe.put('apu', jwk_secret.fields['kid'] || jwk_secret.thumbprint)
         end
         if jwe['apv'].nil?
-          jwe = jwe.put('apv', other_public_jwk.fields['kid'] || other_public_jwk.thumbprint)
+          jwe = jwe.put('apv', jwk_public.fields['kid'] || jwk_public.thumbprint)
         end
         if jwe['epk'].nil?
-          jwe = jwe.put('epk', my_private_jwk.to_public_map)
+          jwe = jwe.put('epk', jwk_secret.to_public_map)
         end
       end
-      if generated_jwk
-        return JOSE::JWE.block_encrypt([other_public_jwk, my_private_jwk], plain_text, jwe), generated_jwk
+      if epk_secret
+        return JOSE::JWE.block_encrypt([jwk_public, jwk_secret], plain_text, jwe), epk_secret
       else
-        return JOSE::JWE.block_encrypt([other_public_jwk, my_private_jwk], plain_text, jwe)
+        return JOSE::JWE.block_encrypt([jwk_public, jwk_secret], plain_text, jwe)
       end
     end
 
+    # Derives a key (typically just returns a binary representation of the key).
+    #
+    # @param [JOSE::JWK] jwk
+    # @param [*Object] args
+    # @return [String]
+    def self.derive_key(jwk, *args)
+      return from(jwk).derive_key(*args)
+    end
+
     # Derives a key (typically just returns a binary representation of the key).
     #
     # @param [*Object] args
@@ -858,12 +880,16 @@ module JOSE
     # Signs the `plain_text` using the `jwk` and the default signer algorithm `jws` for the key type.
     #
     # @see JOSE::JWS.sign
-    # @param [JOSE::JWK] jwk
     # @param [String] plain_text
     # @param [JOSE::JWS] jws
+    # @param [JOSE::JWK] jwk
     # @param [JOSE::Map] header
     # @return [JOSE::SignedMap]
-    def self.sign(jwk, plain_text, jws = nil, header = nil)
+    def self.sign(plain_text, jws, jwk = nil, header = nil)
+      if jwk.nil?
+        jwk = jws
+        jws = nil
+      end
       return from(jwk).sign(plain_text, jws, header)
     end
 

data/lib/jose/jwk/kty.rb

@@ -3,6 +3,7 @@ module JOSE::JWK::KTY
   extend self
 
   def from_key(object)
+    object = object.__getobj__ if object.is_a?(JOSE::JWK::PKeyProxy)
     case object
     when OpenSSL::PKey::EC
       return JOSE::JWK::KTY_EC.from_key(object)
@@ -29,6 +30,8 @@ module JOSE::JWK::KTY
 
 end
 
+require 'jose/jwk/pkey_proxy'
+
 require 'jose/jwk/kty_ec'
 require 'jose/jwk/kty_oct'
 require 'jose/jwk/kty_okp_ed25519'

data/lib/jose/jwk/kty_ec.rb

@@ -24,14 +24,14 @@ class JOSE::JWK::KTY_EC < Struct.new(:key)
       if fields['d'].is_a?(String)
         ec.private_key = OpenSSL::BN.new(JOSE.urlsafe_decode64(fields['d']), 2)
       end
-      return JOSE::JWK::KTY_EC.new(ec), fields.except('kty', 'crv', 'd', 'x', 'y')
+      return JOSE::JWK::KTY_EC.new(JOSE::JWK::PKeyProxy.new(ec)), fields.except('kty', 'crv', 'd', 'x', 'y')
     else
       raise ArgumentError, "invalid 'EC' JWK"
     end
   end
 
   def to_key
-    return key
+    return key.__getobj__
   end
 
   def to_map(fields)
@@ -211,9 +211,10 @@ class JOSE::JWK::KTY_EC < Struct.new(:key)
   # API functions
 
   def self.from_key(key)
+    key = key.__getobj__ if key.is_a?(JOSE::JWK::PKeyProxy)
     case key
     when OpenSSL::PKey::EC
-      return JOSE::JWK::KTY_EC.new(key), JOSE::Map[]
+      return JOSE::JWK::KTY_EC.new(JOSE::JWK::PKeyProxy.new(key)), JOSE::Map[]
     else
       raise ArgumentError, "'key' must be a OpenSSL::PKey::EC"
     end

data/lib/jose/jwk/kty_okp_ed25519ph.rb

@@ -134,7 +134,7 @@ class JOSE::JWK::KTY_OKP_Ed25519ph < Struct.new(:okp)
   end
 
   def to_okp
-    return [:Ed25519, okp]
+    return [:Ed25519ph, okp]
   end
 
   def to_openssh_key(fields)

data/lib/jose/jwk/kty_okp_ed448.rb

@@ -1,10 +1,8 @@
 class JOSE::JWK::KTY_OKP_Ed448 < Struct.new(:okp)
 
   SECRET_BYTES = 57
-  LEGACY_SECRET_BYTES = 32
   PK_BYTES = 57
   SK_BYTES = SECRET_BYTES + PK_BYTES
-  LEGACY_SK_BYTES = LEGACY_SECRET_BYTES + PK_BYTES
 
   # JOSE::JWK callbacks
 
@@ -15,7 +13,7 @@ class JOSE::JWK::KTY_OKP_Ed448 < Struct.new(:okp)
       if fields['d'].is_a?(String)
         secret = JOSE.urlsafe_decode64(fields['d'])
       end
-      if pk.bytesize == PK_BYTES and (secret.nil? or secret.bytesize == SECRET_BYTES or secret.bytesize == LEGACY_SECRET_BYTES)
+      if pk.bytesize == PK_BYTES and (secret.nil? or secret.bytesize == SECRET_BYTES)
         if secret.nil?
           return JOSE::JWK::KTY_OKP_Ed448.new(pk), fields.except('kty', 'crv', 'x')
         else
@@ -38,13 +36,6 @@ class JOSE::JWK::KTY_OKP_Ed448 < Struct.new(:okp)
         put('d',   JOSE.urlsafe_encode64(secret)).
         put('kty', 'OKP').
         put('x',   JOSE.urlsafe_encode64(pk))
-    elsif okp.bytesize == LEGACY_SK_BYTES
-      secret, pk = okp[0, LEGACY_SECRET_BYTES], okp[LEGACY_SECRET_BYTES, LEGACY_SK_BYTES]
-      return fields.
-        put('crv', 'Ed448').
-        put('d',   JOSE.urlsafe_encode64(secret)).
-        put('kty', 'OKP').
-        put('x',   JOSE.urlsafe_encode64(pk))
     else
       pk = okp
       return fields.
@@ -71,7 +62,7 @@ class JOSE::JWK::KTY_OKP_Ed448 < Struct.new(:okp)
     elsif okp_params.is_a?(String)
       secret = okp_params
     end
-    if secret.nil? or (secret.is_a?(String) and (secret.bytesize == SECRET_BYTES or secret.bytesize == LEGACY_SECRET_BYTES))
+    if secret.nil? or (secret.is_a?(String) and (secret.bytesize == SECRET_BYTES))
       return from_okp([:Ed448, JOSE::JWA::Curve448.ed448_keypair(secret)[1]])
     else
       raise ArgumentError, "'secret' must be nil or a String of #{SECRET_BYTES} bytes"
@@ -89,14 +80,14 @@ class JOSE::JWK::KTY_OKP_Ed448 < Struct.new(:okp)
 
   def sign(message, digest_type)
     raise ArgumentError, "'digest_type' must be :Ed448" if digest_type != :Ed448
-    raise NotImplementedError, "Ed448 public key cannot be used for signing" if okp.bytesize != SK_BYTES and okp.bytesize != LEGACY_SK_BYTES
+    raise NotImplementedError, "Ed448 public key cannot be used for signing" if okp.bytesize != SK_BYTES
     return JOSE::JWA::Curve448.ed448_sign(message, okp)
   end
 
   def signer(fields = nil)
-    if (okp.bytesize == SK_BYTES or okp.bytesize == LEGACY_SK_BYTES) and fields and fields['use'] == 'sig' and not fields['alg'].nil?
+    if okp.bytesize == SK_BYTES and fields and fields['use'] == 'sig' and not fields['alg'].nil?
       return JOSE::Map['alg' => fields['alg']]
-    elsif (okp.bytesize == SK_BYTES or okp.bytesize == LEGACY_SK_BYTES)
+    elsif okp.bytesize == SK_BYTES
       return JOSE::Map['alg' => 'Ed448']
     else
       raise ArgumentError, "signing not supported for public keys"
@@ -114,14 +105,14 @@ class JOSE::JWK::KTY_OKP_Ed448 < Struct.new(:okp)
   def verify(message, digest_type, signature)
     raise ArgumentError, "'digest_type' must be :Ed448" if digest_type != :Ed448
     pk = okp
-    pk = JOSE::JWA::Curve448.ed448_secret_to_public(okp) if okp.bytesize == SK_BYTES or okp.bytesize == LEGACY_SK_BYTES
+    pk = JOSE::JWA::Curve448.ed448_secret_to_public(okp) if okp.bytesize == SK_BYTES
     return JOSE::JWA::Curve448.ed448_verify(signature, message, pk)
   end
 
   # API functions
 
   def self.from_okp(okp)
-    if okp.is_a?(Array) and okp.length == 2 and okp[0] == :Ed448 and okp[1].is_a?(String) and (okp[1].bytesize == PK_BYTES or okp[1].bytesize == SK_BYTES or okp[1].bytesize == LEGACY_SK_BYTES)
+    if okp.is_a?(Array) and okp.length == 2 and okp[0] == :Ed448 and okp[1].is_a?(String) and (okp[1].bytesize == PK_BYTES or okp[1].bytesize == SK_BYTES)
       return JOSE::JWK::KTY_OKP_Ed448.new(okp[1]), JOSE::Map[]
     else
       raise ArgumentError, "'okp' must be an Array in the form of [:Ed448, String]"

data/lib/jose/jwk/kty_okp_ed448ph.rb

@@ -1,10 +1,8 @@
 class JOSE::JWK::KTY_OKP_Ed448ph < Struct.new(:okp)
 
   SECRET_BYTES = 57
-  LEGACY_SECRET_BYTES = 32
   PK_BYTES = 57
   SK_BYTES = SECRET_BYTES + PK_BYTES
-  LEGACY_SK_BYTES = LEGACY_SECRET_BYTES + PK_BYTES
 
   # JOSE::JWK callbacks
 
@@ -15,7 +13,7 @@ class JOSE::JWK::KTY_OKP_Ed448ph < Struct.new(:okp)
       if fields['d'].is_a?(String)
         secret = JOSE.urlsafe_decode64(fields['d'])
       end
-      if pk.bytesize == PK_BYTES and (secret.nil? or secret.bytesize == SECRET_BYTES or secret.bytesize == LEGACY_SECRET_BYTES)
+      if pk.bytesize == PK_BYTES and (secret.nil? or secret.bytesize == SECRET_BYTES)
         if secret.nil?
           return JOSE::JWK::KTY_OKP_Ed448ph.new(pk), fields.except('kty', 'crv', 'x')
         else
@@ -38,13 +36,6 @@ class JOSE::JWK::KTY_OKP_Ed448ph < Struct.new(:okp)
         put('d',   JOSE.urlsafe_encode64(secret)).
         put('kty', 'OKP').
         put('x',   JOSE.urlsafe_encode64(pk))
-    elsif okp.bytesize == LEGACY_SK_BYTES
-      secret, pk = okp[0, LEGACY_SECRET_BYTES], okp[LEGACY_SECRET_BYTES, LEGACY_SK_BYTES]
-      return fields.
-        put('crv', 'Ed448ph').
-        put('d',   JOSE.urlsafe_encode64(secret)).
-        put('kty', 'OKP').
-        put('x',   JOSE.urlsafe_encode64(pk))
     else
       pk = okp
       return fields.
@@ -71,7 +62,7 @@ class JOSE::JWK::KTY_OKP_Ed448ph < Struct.new(:okp)
     elsif okp_params.is_a?(String)
       secret = okp_params
     end
-    if secret.nil? or (secret.is_a?(String) and (secret.bytesize == SECRET_BYTES or secret.bytesize == LEGACY_SECRET_BYTES))
+    if secret.nil? or (secret.is_a?(String) and (secret.bytesize == SECRET_BYTES))
       return from_okp([:Ed448ph, JOSE::JWA::Curve448.ed448ph_keypair(secret)[1]])
     else
       raise ArgumentError, "'secret' must be nil or a String of #{SECRET_BYTES} bytes"
@@ -89,14 +80,14 @@ class JOSE::JWK::KTY_OKP_Ed448ph < Struct.new(:okp)
 
   def sign(message, digest_type)
     raise ArgumentError, "'digest_type' must be :Ed448ph" if digest_type != :Ed448ph
-    raise NotImplementedError, "Ed448ph public key cannot be used for signing" if okp.bytesize != SK_BYTES and okp.bytesize != LEGACY_SK_BYTES
+    raise NotImplementedError, "Ed448ph public key cannot be used for signing" if okp.bytesize != SK_BYTES
     return JOSE::JWA::Curve448.ed448ph_sign(message, okp)
   end
 
   def signer(fields = nil)
-    if (okp.bytesize == SK_BYTES or okp.bytesize == LEGACY_SK_BYTES) and fields and fields['use'] == 'sig' and not fields['alg'].nil?
+    if okp.bytesize == SK_BYTES and fields and fields['use'] == 'sig' and not fields['alg'].nil?
       return JOSE::Map['alg' => fields['alg']]
-    elsif (okp.bytesize == SK_BYTES or okp.bytesize == LEGACY_SK_BYTES)
+    elsif okp.bytesize == SK_BYTES
       return JOSE::Map['alg' => 'Ed448ph']
     else
       raise ArgumentError, "signing not supported for public keys"
@@ -114,14 +105,14 @@ class JOSE::JWK::KTY_OKP_Ed448ph < Struct.new(:okp)
   def verify(message, digest_type, signature)
     raise ArgumentError, "'digest_type' must be :Ed448ph" if digest_type != :Ed448ph
     pk = okp
-    pk = JOSE::JWA::Curve448.ed448ph_secret_to_public(okp) if okp.bytesize == SK_BYTES or okp.bytesize == LEGACY_SK_BYTES
+    pk = JOSE::JWA::Curve448.ed448ph_secret_to_public(okp) if okp.bytesize == SK_BYTES
     return JOSE::JWA::Curve448.ed448ph_verify(signature, message, pk)
   end
 
   # API functions
 
   def self.from_okp(okp)
-    if okp.is_a?(Array) and okp.length == 2 and okp[0] == :Ed448ph and okp[1].is_a?(String) and (okp[1].bytesize == PK_BYTES or okp[1].bytesize == SK_BYTES or okp[1].bytesize == LEGACY_SK_BYTES)
+    if okp.is_a?(Array) and okp.length == 2 and okp[0] == :Ed448ph and okp[1].is_a?(String) and (okp[1].bytesize == PK_BYTES or okp[1].bytesize == SK_BYTES)
       return JOSE::JWK::KTY_OKP_Ed448ph.new(okp[1]), JOSE::Map[]
     else
       raise ArgumentError, "'okp' must be an Array in the form of [:Ed448ph, String]"

data/lib/jose/jwk/kty_rsa.rb

@@ -17,7 +17,7 @@ class JOSE::JWK::KTY_RSA < Struct.new(:key)
           rsa.p    = OpenSSL::BN.new(JOSE.urlsafe_decode64(fields['p']), 2)
           rsa.q    = OpenSSL::BN.new(JOSE.urlsafe_decode64(fields['q']), 2)
           rsa.iqmp = OpenSSL::BN.new(JOSE.urlsafe_decode64(fields['qi']), 2)
-          return JOSE::JWK::KTY_RSA.new(rsa), fields.except('kty', 'd', 'dp', 'dq', 'e', 'n', 'p', 'q', 'qi')
+          return JOSE::JWK::KTY_RSA.new(JOSE::JWK::PKeyProxy.new(rsa)), fields.except('kty', 'd', 'dp', 'dq', 'e', 'n', 'p', 'q', 'qi')
         else
           raise ArgumentError, "invalid 'RSA' JWK"
         end
@@ -25,7 +25,7 @@ class JOSE::JWK::KTY_RSA < Struct.new(:key)
         rsa   = OpenSSL::PKey::RSA.new
         rsa.e = OpenSSL::BN.new(JOSE.urlsafe_decode64(fields['e']), 2)
         rsa.n = OpenSSL::BN.new(JOSE.urlsafe_decode64(fields['n']), 2)
-        return JOSE::JWK::KTY_RSA.new(rsa), fields.except('kty', 'e', 'n')
+        return JOSE::JWK::KTY_RSA.new(JOSE::JWK::PKeyProxy.new(rsa)), fields.except('kty', 'e', 'n')
       end
     else
       raise ArgumentError, "invalid 'RSA' JWK"
@@ -33,7 +33,7 @@ class JOSE::JWK::KTY_RSA < Struct.new(:key)
   end
 
   def to_key
-    return key
+    return key.__getobj__
   end
 
   def to_map(fields)
@@ -187,9 +187,10 @@ class JOSE::JWK::KTY_RSA < Struct.new(:key)
   # API functions
 
   def self.from_key(key)
+    key = key.__getobj__ if key.is_a?(JOSE::JWK::PKeyProxy)
     case key
     when OpenSSL::PKey::RSA
-      return JOSE::JWK::KTY_RSA.new(key), JOSE::Map[]
+      return JOSE::JWK::KTY_RSA.new(JOSE::JWK::PKeyProxy.new(key)), JOSE::Map[]
     else
       raise ArgumentError, "'key' must be a OpenSSL::PKey::RSA"
     end

data/lib/jose/jwk/pkey_proxy.rb

@@ -0,0 +1,7 @@
+require 'delegate'
+
+class JOSE::JWK::PKeyProxy < SimpleDelegator
+  def ==(other)
+    __getobj__.export == other.export
+  end
+end

data/lib/jose/jws/alg.rb

@@ -1,8 +1,12 @@
 module JOSE::JWS::ALG
 
-  extend self
-
-  def generate_key(parameters, algorithm)
+  # Generates a new {JOSE::JWK JOSE::JWK} based on the `parameters` and `algorithm`.
+  #
+  # @see JOSE::JWK.generate_key
+  # @param [Array] parameters
+  # @param [String] algorithm
+  # @return [JOSE::JWK]
+  def self.generate_key(parameters, algorithm)
     return JOSE::JWK.generate_key(parameters).merge({
       'alg' => algorithm,
       'use' => 'sig'

data/lib/jose/jwt.rb

@@ -218,7 +218,7 @@ module JOSE
       plain_text = to_binary
       if jwe.nil?
         jwk = JOSE::JWK.from(jwk)
-        jwe = jwk.block_encryptor
+        jwe = (jwk.is_a?(Array) ? jwk.last : jwk).block_encryptor
       end
       if jwe.is_a?(Hash)
         jwe = JOSE::Map.new(jwe)
@@ -316,7 +316,7 @@ module JOSE
       if not jws.has_key?('typ')
         jws = jws.put('typ', 'JWT')
       end
-      return JOSE::JWK.sign(jwk, plain_text, jws, header)
+      return JOSE::JWK.sign(plain_text, jws, jwk, header)
     end
 
     # Verifies the `signed` using the `jwk` and calls {JOSE::JWT.from JOST::JWT.from} on the payload.

data/lib/jose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jose
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Andrew Bennett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-07 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hamster
@@ -168,6 +168,7 @@ files:
 - lib/jose/jwk/kty_rsa.rb
 - lib/jose/jwk/openssh_key.rb
 - lib/jose/jwk/pem.rb
+- lib/jose/jwk/pkey_proxy.rb
 - lib/jose/jwk/set.rb
 - lib/jose/jws.rb
 - lib/jose/jws/alg.rb