yao 0.13.3 → 0.13.4
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/yao/client.rb +8 -7
- data/lib/yao/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9ee889ea30a4ed867e8f34bcb5fd185f194b317320fd8f5797f1a7b24b232e66
|
|
4
|
+
data.tar.gz: 745bb13217eb75907e47732b457ac41cd90330f23becb0936e4c13beabdeb6e3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bddf10dfefb8277e6ad2dda817ab08b54ede238586c1f4fd913b8648a257d4c8e79cb7301976cbf02f5991b4ffd8a0199d7a06db604d21a9f63438dea263801f
|
|
7
|
+
data.tar.gz: 2e572a0ca854f98b118cb081daf3a862b3ad60ffcb7e8e0ba58d35d64cdaf40578a507cdd2b578c05b576be5d61c7d92161e251c03e0d6396fa73384599a2520
|
data/lib/yao/client.rb
CHANGED
|
@@ -124,13 +124,14 @@ module Yao
|
|
|
124
124
|
end
|
|
125
125
|
|
|
126
126
|
# Client Certificate Authentication
|
|
127
|
-
if Yao.config.client_cert && Yao.config.client_key
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
127
|
+
if (Yao.config.client_cert && Yao.config.client_key) || Yao.config.ca_cert
|
|
128
|
+
h = {}
|
|
129
|
+
if Yao.config.client_cert && Yao.config.client_key
|
|
130
|
+
cert = OpenSSL::X509::Certificate.new(File.read(Yao.config.client_cert))
|
|
131
|
+
key = OpenSSL::PKey.read(File.read(Yao.config.client_key))
|
|
132
|
+
h[:client_cert] = cert
|
|
133
|
+
h[:client_key] = key
|
|
134
|
+
end
|
|
134
135
|
|
|
135
136
|
h[:ca_file] = Yao.config.ca_cert if Yao.config.ca_cert
|
|
136
137
|
opt.merge!(ssl: h)
|
data/lib/yao/version.rb
CHANGED