edb 0.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf3bbfcc12b3ea9bf8b8d2da7e5acce50e69295f
-  data.tar.gz: cdd15ff978c970706a69c1dc0b7f3ca1fd20a9a1
+  metadata.gz: e17dd73f932110daaefd68f24eba4d82996d1bfe
+  data.tar.gz: ed2f112288ebc8c6f2af8d419e68acfdf149ad3f
 SHA512:
-  metadata.gz: 427fafb18b6e04e331d689b1efc4a0fa7d3cd4b29afa9f380d5695d3ee6ae54066e27c95ce6d1aef430a90d187d8fb65a23dd1b62f182c4e824ed9fe93d78f1f
-  data.tar.gz: 14fbd57f7b9989d8ff27e8035aa3ebd79335b03bbcfcf46f6a82b324bf27b561c9873eddd60a1ac07d4983f4331f856cace405bf47c3aea773618d87a78d75a9
+  metadata.gz: 6117055df2f1cc9b1df10eee1c12feb4f5255efba51ac22a8be0645a188071a2c6aa1bc5648a6841f058f0268d122da22da76c019078bd730ff0b63779eec176
+  data.tar.gz: 024d5044d2df77d90363b419468fe31c1a4a91cfe4352660168f83eff45073765eba607a5c5f800cdaedcb5440414e7a3c1ea2e8d2938d354e73f23fc50381f3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    edb (0.6)
+    edb (0.6.1)
       aws-sdk (= 1.59.1)
       fast_secure_compare (~> 1.0)
       ftp_sync (~> 0.4)

data/lib/edb/cryptography/aes_256_cbc.rb

@@ -35,8 +35,10 @@ module EDB
           cipher = OpenSSL::Cipher.new('AES-256-CBC')
           cipher.encrypt
 
-          cipher.key, authentication_key = hash_keychain(::EDB.opts[:CRYPTOGRAPHY][:AES_256_CBC][:secret])
-          cipher.iv = iv = cipher.random_iv
+          hkdf = HKDF.new(::EDB.opts[:CRYPTOGRAPHY][:AES_256_CBC][:secret])
+          cipher.key         = hkdf.next_bytes(32)
+          authentication_key = hkdf.next_bytes(64)
+          cipher.iv     = iv = cipher.random_iv
 
           ciphered_data = cipher.update(data) + cipher.final
           ciphered_data << iv
@@ -52,7 +54,10 @@ module EDB
           decipher.decrypt
 
           authentication = slice_str!(ciphered_data, 32)
-          decipher.key, authentication_key = hash_keychain(::EDB.opts[:CRYPTOGRAPHY][:AES_256_CBC][:secret])
+
+          hkdf = HKDF.new(::EDB.opts[:CRYPTOGRAPHY][:AES_256_CBC][:secret])
+          decipher.key       = hkdf.next_bytes(32)
+          authentication_key = hkdf.next_bytes(64)
 
           new_authentication = OpenSSL::HMAC.digest(OpenSSL::Digest.new('SHA256'), authentication_key, ciphered_data)
           raise 'Authentication failed.' unless FastSecureCompare.compare(authentication, new_authentication)
@@ -67,11 +72,6 @@ module EDB
           len = str.length
           str.slice!(len - n, len)
         end
-
-        def hash_keychain(s)
-          hkdf = HKDF.new(s)
-          [ hkdf.next_bytes(64), hkdf.next_bytes(64) ]
-        end
       end
     end
   end

data/lib/edb/version.rb

@@ -23,5 +23,5 @@
 #++
 
 module EDB
-  VERSION = '0.6'
+  VERSION = '0.6.1'
 end

data/specs/cryptography/aes_256_cbc_spec.rb

@@ -45,13 +45,4 @@ describe EDB::Cryptography::AES_256_CBC do
       expect(str).to    eq 'senjou'
     end
   end
-
-  describe '#hash_keychain' do
-    let(:keychain) { EDB::Cryptography::AES_256_CBC.instance_eval { hash_keychain('hitagi') } }
-
-    it 'returns an array with two 64 bytes long keys' do
-      expect(keychain[0].length).to be 64
-      expect(keychain[1].length).to be 64
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: edb
 version: !ruby/object:Gem::Version
-  version: '0.6'
+  version: 0.6.1
 platform: ruby
 authors:
 - Giovanni Capuano