rubeepass 3.4.9 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67de7b0559cb6a1b611bf71ce6db53491573d31512eb08357e11e633b38e9bd7
-  data.tar.gz: 5fc5dd74011743e2d3061d9136fac0bc695597003e6133a40714349d4b5ac3e0
+  metadata.gz: a148e19d6cf81e96f8d3f8e71b6c71c751f861340bef96f5f8f850845a23eaa6
+  data.tar.gz: f5465641b0f80bd5c5869a0a895a4eda46c2273142c9e81e2c0ca2fe9693ade3
 SHA512:
-  metadata.gz: 763ab5e5ab95ce4a61e15a20b4ce8176161d3d575d8764253b7b3d9a48c254763be5b5a41c2feb2cfd4eabf8a5349820555bb84640b344daa5af76f3ca203737
-  data.tar.gz: cecf827b1c9b306857ece0b36b37ba88637a84e928684e232246215471c77d5e5e901b37d9c1953b4ddb64a2c6f256d36c2b3b83af8ce40835472af8f1daf618
+  metadata.gz: 0bdc83e5d8aae63e2c3aca3d66196be326fbed81f3cc45681ac9fad7fdc5fa5aba26b971675e87e4978150dc2bb690aa6b91e6a172929674c620ceb175aecb54
+  data.tar.gz: efd3cdbbe428cf606ab9f1b813f78be8201231478543439726afc8924391f195c0149d7e02fbddb755ddca3752c3f6ae2b77d653d884ef1837e4a64070f51824

data/lib/rubeepass.rb

@@ -342,8 +342,6 @@ class RubeePass
     end
 
     def join_key_and_keyfile
-        passhash = Digest::SHA256.digest(@password)
-
         filehash = ""
         if (@keyfile)
             contents = File.readlines(@keyfile).join
@@ -370,7 +368,12 @@ class RubeePass
             end
         end
 
-        @initial_key = Digest::SHA256.digest(passhash + filehash)
+        if @password.nil?
+            @initial_key = Digest::SHA256.digest(filehash)
+        else
+            passhash = Digest::SHA256.digest(@password)
+            @initial_key = Digest::SHA256.digest(passhash + filehash)
+        end
     end
     private :join_key_and_keyfile
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 3.5.0
 platform: ruby
 authors:
 - Miles Whittaker
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -229,7 +229,7 @@ licenses:
 - GPL-3.0
 metadata:
   source_code_uri: https://gitlab.com/mjwhitta/rubeepass
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -244,8 +244,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby KeePass 2.x read-only client
 test_files: []