keystok 1.1.0 → 1.1.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/lib/keystok/aes_crypto.rb +4 -5
  4. data/lib/keystok/version.rb +1 -1
  5. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 58c17d257cc3c0d2ad96cdc648f5029629b1d161
4
- data.tar.gz: 62df792c7e1a369208e0dc8532b68d87db6e71db
3
+ metadata.gz: b171c31a96eb431336e7ddfd324cbedc3721b2ea
4
+ data.tar.gz: 035f617aa25a7bf8408c4ed6f048463edfa1f4a3
5
5
  SHA512:
6
- metadata.gz: 75472301c3926d79b02a49c76b7200cc1b5338aa51b2a8efad14b32e57da79f12b028b9a03b2afe10c2e5f11e94efff289a6cc5def3cf36fe895b0c7a8192bd5
7
- data.tar.gz: eee34c8e02e55a9bec0fecc45cef379da430bc82be8d4d69e5749ea73af7ae38756814bd40730fe232a82c2f13fd6a6ec46e1d2ce0cb8e63f5fdef540f77964c
6
+ metadata.gz: e40957f85b6070b234332594758c3052a8a188343c01d7c4257c883fcc5eaee4d5e0f9d14db37cf5ba62b8ffc536cc1e2e37b5e52cd786fbb9349c5fa01ae456
7
+ data.tar.gz: bcdf6699966da5ba3f60d32fa08233d7e211a18c77dbddc717946c22abec0055c6a9c5355ae210452cd7975bb1548e66222054c8cef7bd35d39418ff8267696f
data/CHANGELOG.md CHANGED
@@ -2,6 +2,11 @@
2
2
 
3
3
  ## master (unreleased)
4
4
 
5
+ ## 1.1.1 (2014-05-05)
6
+
7
+ ### Bugfixes
8
+ * 1 - Fails on heroku
9
+
5
10
  ## 1.1.0 (2014-04-24)
6
11
 
7
12
  ### New features
data/lib/keystok/aes_crypto.rb CHANGED
@@ -37,11 +37,10 @@ module Keystok
37
37
  end
38
38
  encrypted_data = Base64.decode64(encrypted_key.sub(/^:[^:]+:/, ''))
39
39
  json_data = JSON.parse(encrypted_data)
40
- key = OpenSSL::PKCS5.pbkdf2_hmac(config[:dk],
41
- Base64.decode64(json_data['salt']),
42
- json_data['iter'],
43
- json_data['ks'] / 8,
44
- OpenSSL::Digest::SHA1.new)
40
+ key = OpenSSL::PKCS5.pbkdf2_hmac_sha1(config[:dk],
41
+ Base64.decode64(json_data['salt']),
42
+ json_data['iter'],
43
+ json_data['ks'] / 8)
45
44
  decipher(Base64.decode64(json_data['ct']), key,
46
45
  Base64.decode64(json_data['iv']), json_data['ks'])
47
46
  end
data/lib/keystok/version.rb CHANGED
@@ -5,5 +5,5 @@
5
5
 
6
6
  #:nodoc:
7
7
  module Keystok
8
- VERSION = '1.1.0'
8
+ VERSION = '1.1.1'
9
9
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: keystok
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Piotr Sokolowski
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-04-24 00:00:00.000000000 Z
11
+ date: 2014-05-05 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday