easy-crypto 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2369e9cd1cf25eb55d1ffc9e3d055f5bdfccd482f185143dcdcb02a01f959b99
-  data.tar.gz: 67321bb551ecb6bb8158f57b035d8ef0786c0349ee964c9e3e775a5a7d8240bd
+  metadata.gz: 7bdfbd9e4e834ac62a97acaa8b04b1076070b47e360cd19969164adedfe72c43
+  data.tar.gz: d3dd3dc7ca6c11d774d9ee2c8b090d5df3a175cd83bfa9d77567482780eb3b78
 SHA512:
-  metadata.gz: 6c2ee0062fb829389884cb05b5da579d8b328a320bd7d64bfae3444d919364bcea5a4b569de1acdf675ef73976ab2bf96fba9f96bd84a79d3860d83c13638525
-  data.tar.gz: dfb823270baea84b63da358c116b732ca7dc7449b13427519d2652c5878ee23c0ad16eee993489debeef6148cb937c9149d6ba4833281664c3384ff7d7db32f3
+  metadata.gz: 2b4d70ca8890f3f9f330336e64ee7c77e6172e282fe06bc83d3a9320f72f89d2e6a7d4e101d63b5e1b6bc9f836b24a4833f78ab73984f655d6be36863729c213
+  data.tar.gz: 3eb6abe3aa0f4eb81f5d7795eb83da5ada327d62c36719791f1e8cadcbbad3a5ed557a62f86c1379916e38a8db677cd756da73f24ceaee8ca68bd7a05d3cf5c7

data/Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 gemspec
 
-gem 'jruby-openssl', '~> 0.10.2', '>= 0.10.2', :platform => :jruby
+gem 'jruby-openssl', '~> 0.9', '>= 0.9', :platform => :jruby
 gem 'openssl', '~> 2.1.1', '>= 2.1.1', :platform => :ruby

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easy-crypto (0.2.0)
+    easy-crypto (0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -31,7 +31,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.16)
   easy-crypto!
-  jruby-openssl (~> 0.10.2, >= 0.10.2)
+  jruby-openssl (~> 0.9, >= 0.9)
   openssl (~> 2.1.1, >= 2.1.1)
   rake (~> 12.3)
   rspec (~> 3.0)

data/lib/easycrypto/key.rb

@@ -22,12 +22,12 @@ module EasyCrypto
     end
 
     def self.generate_with_salt(password, salt)
-      key = OpenSSL::KDF.pbkdf2_hmac(
+      key = OpenSSL::PKCS5.pbkdf2_hmac(
         password,
-        salt: salt,
-        iterations: Key::ITERATION_COUNT,
-        length: Key::KEY_LENGTH,
-        hash: Key::HASH_ALGO
+        salt,
+        Key::ITERATION_COUNT,
+        Key::KEY_LENGTH,
+        Key::HASH_ALGO
       )
 
       new(key, salt)

data/lib/easycrypto/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EasyCrypto
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/spec/easycrypto/key_spec.rb

@@ -24,6 +24,13 @@ RSpec.describe EasyCrypto::Key do
       expect(key.salt).to eq salt
     end
 
+    it 'generates the expected key' do
+      key = EasyCrypto::Key.generate_with_salt('key password', salt)
+
+      expected_key = "\xC7\xE4\x89\xCB5\x86\xE0)Q)[u\xD6P\x87i\xC6\x13\xBE\xFE|\x19\x8A\xDB\xFB0\xB4\xE50\x12\x00\x95".force_encoding('ASCII-8BIT')
+      expect(key.key).to eq expected_key
+    end
+
     it 'generates the same key with the same password and salt' do
       key_1 = EasyCrypto::Key.generate_with_salt('key password', salt)
       key_2 = EasyCrypto::Key.generate_with_salt('key password', salt)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy-crypto
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Emarsys Security
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler