jose 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8b3820a104b8d8b71e1e8557f70aede232595e2
-  data.tar.gz: 3fdaa67a5ed08f9d6f6f8e5249737b3dc22ebe89
+  metadata.gz: 97b12e5771a9533cfe90cf343ad9829fea08959e
+  data.tar.gz: 36896efd3b895906a16ff8f751449fba9159dc3d
 SHA512:
-  metadata.gz: dbe1b64dc34bad69cfb2250a54e30eeb5f7ac864431d7d39463dbeaddec4ea3e2975e7a3f09a0c4ba9d82a06e02e4ce0934e2cf97f7ae0782f8c58a78a1d56d5
-  data.tar.gz: 4b96226504359839de7fb9d932b929abf58cf959ccf89ac2d6b6ca045c4ab148e4cfcb7f7b8592fecb8d2313bc6b687fba7789edfddb9fe96a0ef366c4bb7d13
+  metadata.gz: dc6941ef61ef94954fe118082d564936fc59b13c53f6ab4b09dd7598355b4572b9dff093fe57e84febf842817c88e454b7d34c1551028ee687fbda36c439697c
+  data.tar.gz: 919c7f009f80b2e22e82083c60f93c39571800b3069d9d86372c7ca9b12d8cb6b18d3f0c322c2dc812fdeee411dd2d42e36956803cf2405d68ffe169514859fe

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.3.1 (2016-05-05)
+
+* Fixes
+  * Fix bug with PBES2 based encryption.
+
 ## 0.3.0 (2016-05-05)
 
 * Enhancements

data/README.md

@@ -1,6 +1,6 @@
 # JOSE
 
-[![Build Status](https://travis-ci.org/potatosalad/ruby-jose.png?branch=master)](https://travis-ci.org/potatosalad/ruby-jose)
+[![Build Status](https://travis-ci.org/potatosalad/ruby-jose.png?branch=master)](https://travis-ci.org/potatosalad/ruby-jose) [![Gem](https://img.shields.io/gem/v/jose.svg?maxAge=2592000)](https://rubygems.org/gems/jose)
 
 JSON Object Signing and Encryption (JOSE) for Ruby.
 

data/lib/jose/jwe/alg_pbes2.rb

@@ -43,7 +43,7 @@ class JOSE::JWE::ALG_PBES2 < Struct.new(:hmac, :bits, :salt, :iter)
     if salt.nil?
       return fields.put('alg', alg).put('p2c', p2c)
     else
-      p2s = JOSE.urlsafe_encode64(unwrap_salt(alg, salt))
+      p2s = JOSE.urlsafe_encode64(unwrap_salt(salt))
       return fields.put('alg', alg).put('p2c', p2c).put('p2s', p2s)
     end
   end
@@ -56,7 +56,7 @@ class JOSE::JWE::ALG_PBES2 < Struct.new(:hmac, :bits, :salt, :iter)
       'p2c' => iter
     }
     if not salt.nil?
-      extra_fields['p2s'] = JOSE.urlsafe_encode64(unwrap_salt(alg, salt))
+      extra_fields['p2s'] = JOSE.urlsafe_encode64(unwrap_salt(salt))
     end
     return JOSE::JWE::ALG.generate_key([:oct, 16], alg, enc.algorithm).merge(extra_fields)
   end

data/lib/jose/version.rb

@@ -1,3 +1,3 @@
 module JOSE
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jose
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrew Bennett