keystok 1.1.0 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +5 -0
- data/lib/keystok/aes_crypto.rb +4 -5
- data/lib/keystok/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b171c31a96eb431336e7ddfd324cbedc3721b2ea
|
4
|
+
data.tar.gz: 035f617aa25a7bf8408c4ed6f048463edfa1f4a3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e40957f85b6070b234332594758c3052a8a188343c01d7c4257c883fcc5eaee4d5e0f9d14db37cf5ba62b8ffc536cc1e2e37b5e52cd786fbb9349c5fa01ae456
|
7
|
+
data.tar.gz: bcdf6699966da5ba3f60d32fa08233d7e211a18c77dbddc717946c22abec0055c6a9c5355ae210452cd7975bb1548e66222054c8cef7bd35d39418ff8267696f
|
data/CHANGELOG.md
CHANGED
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.
|
41
|
-
|
42
|
-
|
43
|
-
|
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
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.
|
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-
|
11
|
+
date: 2014-05-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: faraday
|