keystores 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2cf8155852be0f372803bf45bc5eac1a4ea467e
-  data.tar.gz: ff0423f51a7a95deb0ae2e2fbff565a9e4c95366
+  metadata.gz: e6d7ae93735f74776c1888936c43784cfa15bd6a
+  data.tar.gz: 14878e35af6cd8083fe752a9545194cf2f2b7b4f
 SHA512:
-  metadata.gz: e46edf529317b03d78a96065d079dcd528a645ead5487e33363209ee6661fd3760cdfa4f1c4138e58c86c2e6e81bfb2e78649e463c994af1b9ba14508dd57b3d
-  data.tar.gz: 4650005587aff20f7c16e0a8fa4627047dcff2b45d91b13b96ccc3310e65c3456472cfcc051a78e262e277e0bd3b422f979c05b4b60a98ec3f327128a4c72329
+  metadata.gz: 45111c672dd898eba8c3848f5537b810d4b7eb7cadc48f088a21e9194fa1885cda61d2fd18766d46c9987ea8c13de96e461b94abcf9a7df3be7f645e62e96bd1
+  data.tar.gz: 66b05351a2092d0cf536788f7c8387b6d6b16cf6f673fc66e6caaf46ea26e62c2db257558ffe1430d5ba0e56f36a38e5c06f8482ea0c99dac26be72f7a41f8ce

data/lib/keystores/java_key_store.rb

@@ -178,7 +178,20 @@ module Keystores
     end
 
     def set_key_entry(aliaz, key, certificate_chain, password=nil)
-      super
+      @entries_mutex.synchronize do
+        entry = @entries[aliaz]
+        if !entry.nil? && entry.is_a?(TrustedCertificateEntry)
+          raise ArgumentError.new('Cannot overwrite own key')
+        end
+
+        entry = KeyEntry.new
+        # Java uses new Date().getTime() which returns milliseconds since epoch, so we do the same here with %Q
+        entry.creation_date = DateTime.now.strftime('%Q').to_i
+        entry.encrypted_private_key = Keystores::Jks::KeyProtector.new(password).protect(key)
+        entry.certificate_chain = certificate_chain
+
+        @entries[aliaz] = entry
+      end
     end
 
     def size
@@ -194,7 +207,7 @@ module Keystores
 
         md = get_pre_keyed_hash(password)
 
-        io = key_store_file.respond_to?(:write) ? key_store_file : File.open(key_store_file, 'w')
+        io = key_store_file.respond_to?(:write) ? key_store_file : File.open(key_store_file, 'wb')
 
         write_int(io, MAGIC, md)
         # Always write the latest version

data/lib/keystores/version.rb

@@ -1,3 +1,3 @@
 module Keystores
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: keystores
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryan Larson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2017-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: This gem allows you to interact with java key stores in pure ruby. Keys
@@ -74,9 +74,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - JAVA_KEY_STORE_README.md
 - LICENSE.txt
@@ -100,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: This gem allows applications to interact with java key stores