gcrypto_jce 0.1 → 0.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/gcrypto_jce/pbkdf2.rb +18 -5
- data/lib/gcrypto_jce/secretkey_crypto.rb +1 -0
- data/lib/gcrypto_jce/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a566f6242d7000f806c16bf39ffd354c8a6a259b
|
|
4
|
+
data.tar.gz: 0d2ee0c2683c8602703c22d0a6a86f0ed438f0d9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b24f53c8982a449c937ee22d4e3ecda5b996ade8ccf342b1a37fa643938161bd0736776a15e7fa9a85f709b10184a5ba0d8bf60a2b804ab682b3d6012210f641
|
|
7
|
+
data.tar.gz: '0496af1d168c75bb57dc7d2d53759b848a6ee8e7889cea2ba76d9075c6f1b6e1532a14af37cd3481ad5ce340f6058c330cc2ae6782bc2816710457c202efda3e'
|
data/lib/gcrypto_jce/pbkdf2.rb
CHANGED
|
@@ -28,24 +28,37 @@ module GcryptoJce
|
|
|
28
28
|
end
|
|
29
29
|
|
|
30
30
|
iter = opts[:iteration]
|
|
31
|
+
iter_lb = opts[:iter_lb] || 10000
|
|
32
|
+
iter_hb = opts[:iter_hb] || 30000
|
|
31
33
|
if iter.nil? or iter.to_i == 0
|
|
32
|
-
iter = rand(
|
|
34
|
+
iter = rand(iter_lb...iter_hb)
|
|
33
35
|
end
|
|
34
36
|
|
|
37
|
+
hashSpec = opts[:hash_eng]
|
|
38
|
+
if not (hashSpec.nil? or hashSpec.empty?)
|
|
39
|
+
case hashSpec.downcase.to_sym
|
|
40
|
+
when :sha1
|
|
41
|
+
engSpec = "PBKDF2WithHMACSHA1"
|
|
42
|
+
when :sha2, :sha256
|
|
43
|
+
engSpec = "PBKDF2WithHMACSHA256"
|
|
44
|
+
when :sha512
|
|
45
|
+
engSpec = "PBKDF2WithHMACSHA512"
|
|
46
|
+
else
|
|
47
|
+
engSpec = "PBKDF2WithHMACSHA256"
|
|
48
|
+
GcryptoJce::Gconf.instance.glog.warn "User asking for hash engine '#{hashSpec}' but not in supported list. Using default PBKDF2WithHMACSHA256 instead."
|
|
49
|
+
end
|
|
50
|
+
end
|
|
51
|
+
|
|
35
52
|
keyLen = opts[:outKeyLen]
|
|
36
53
|
case keyLen
|
|
37
54
|
when 128
|
|
38
55
|
outKeyLen = 128
|
|
39
|
-
engSpec = "PBKDF2WithHMACSHA1"
|
|
40
56
|
when 256, 192
|
|
41
57
|
outKeyLen = 256
|
|
42
|
-
engSpec = "PBKDF2WithHMACSHA256"
|
|
43
58
|
when 512
|
|
44
59
|
outKeyLen = 512
|
|
45
|
-
engSpec = "PBKDF2WithHMACSHA512"
|
|
46
60
|
else
|
|
47
61
|
outKeyLen = 256
|
|
48
|
-
engSpec = "PBKDF2WithHMACSHA256"
|
|
49
62
|
end
|
|
50
63
|
|
|
51
64
|
prov = GcryptoJce::Provider.handle_options(opts, nil)
|
data/lib/gcrypto_jce/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: gcrypto_jce
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: '0.
|
|
4
|
+
version: '0.2'
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chris Liaw
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: exe
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-
|
|
11
|
+
date: 2019-11-29 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
requirement: !ruby/object:Gem::Requirement
|