gcrypto_jce 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea980e568ff834fe048aec8765173363c7fef97
-  data.tar.gz: c0e4dd9410fd14407084f3cc1c36706dfc2a9e2e
+  metadata.gz: a566f6242d7000f806c16bf39ffd354c8a6a259b
+  data.tar.gz: 0d2ee0c2683c8602703c22d0a6a86f0ed438f0d9
 SHA512:
-  metadata.gz: dbbd80105e940387809faff363c7c03e02b506c3e89ee3371b94c3789c68ecddec4a59be991816ca22d72d59f96afded95cf20a68c08e118dca06bc310e3d998
-  data.tar.gz: e7bf81bd606ec25dfcfdd8b940f10cf742742763fee88d4c3d26aa9c1dc4f643a977ad13064f758ba4d9e068fdeb2028d506b53ac9bf3b6c17d0d34708c81f31
+  metadata.gz: b24f53c8982a449c937ee22d4e3ecda5b996ade8ccf342b1a37fa643938161bd0736776a15e7fa9a85f709b10184a5ba0d8bf60a2b804ab682b3d6012210f641
+  data.tar.gz: '0496af1d168c75bb57dc7d2d53759b848a6ee8e7889cea2ba76d9075c6f1b6e1532a14af37cd3481ad5ce340f6058c330cc2ae6782bc2816710457c202efda3e'

data/lib/gcrypto_jce/pbkdf2.rb

@@ -28,24 +28,37 @@ module GcryptoJce
         end
 
         iter = opts[:iteration]
+        iter_lb = opts[:iter_lb] || 10000
+        iter_hb = opts[:iter_hb] || 30000
         if iter.nil? or iter.to_i == 0
-          iter = rand(10000...20000)
+          iter = rand(iter_lb...iter_hb)
         end
 
+        hashSpec = opts[:hash_eng]
+        if not (hashSpec.nil? or hashSpec.empty?)
+          case hashSpec.downcase.to_sym
+          when :sha1
+            engSpec = "PBKDF2WithHMACSHA1"
+          when :sha2, :sha256
+            engSpec = "PBKDF2WithHMACSHA256"
+          when :sha512
+            engSpec = "PBKDF2WithHMACSHA512"
+          else
+            engSpec = "PBKDF2WithHMACSHA256"
+            GcryptoJce::Gconf.instance.glog.warn "User asking for hash engine '#{hashSpec}' but not in supported list. Using default PBKDF2WithHMACSHA256 instead."
+          end
+        end
+        
         keyLen = opts[:outKeyLen]
         case keyLen
         when 128
           outKeyLen = 128
-          engSpec = "PBKDF2WithHMACSHA1"
         when 256, 192
           outKeyLen = 256
-          engSpec = "PBKDF2WithHMACSHA256"
         when 512
           outKeyLen = 512
-          engSpec = "PBKDF2WithHMACSHA512"
         else
           outKeyLen = 256
-          engSpec = "PBKDF2WithHMACSHA256"
         end 
 
         prov = GcryptoJce::Provider.handle_options(opts, nil)

data/lib/gcrypto_jce/secretkey_crypto.rb

@@ -346,6 +346,7 @@ module GcryptoJce
         hmac = javax.crypto.Mac.getInstance(hmacHashEng)
       end
 
+      # seed the hmac engine with the given secret key...
       hmac.init(spec.key)
 
       begin

data/lib/gcrypto_jce/version.rb

@@ -1,3 +1,3 @@
 module GcryptoJce
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gcrypto_jce
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Chris Liaw
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2019-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement