sensu-em 2.5.2-java → 2.6.0-java

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.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/eventmachine.gemspec +1 -1
  3. data/java/src/com/rubyeventmachine/SslBox.java +1 -1
  4. data/lib/jeventmachine.rb +7 -4
  5. metadata +30 -30
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 8579e5ca5ea5ff61150d1096f3c9fb10b21f22a2
4
- data.tar.gz: a5f8a2a818d4091c955381665faf5d469e184f30
3
+ metadata.gz: a067acc092c83c24d9ffcd96feacf0c1ea0487ed
4
+ data.tar.gz: 52d5651812f05fbfae7200eb47ec2f077f0d4821
5
5
  SHA512:
6
- metadata.gz: 482de9d6f632d676e33d31ef69b7ce98ccd752fc1cd6fc183969adb7e61fc5f2794f1844e2c37476cde2d5189f240d2a252a0a77ad90034246667e23bb31b6b2
7
- data.tar.gz: cc9085d0fc0586e5b25915360ba95b8b44acb4046b9f7502166a3d35ed41143566df7064b59c0b29042ec321c2ae731cf1abbd26c25f87b60c4cd7f2409507fc
6
+ metadata.gz: c543cf47adf134903a008cf00b7367abe1a0e04b55ea07bb2f5b9a1debd5cf0916de7f1a99d795d282616ce9e9c80c5452e77d319e58376573880202d0308c87
7
+ data.tar.gz: 17b02ee5e32a011233ba0e4f75fe144e7ac7e0bd36aac3ba56faa87292fcb6f3c2da091b932d605d3d7dede244b29950130abf74ff64d48c5008663bdca92c5e
data/eventmachine.gemspec CHANGED
@@ -5,7 +5,7 @@ require "em/version"
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = 'sensu-em'
8
- s.version = '2.5.2'
8
+ s.version = '2.6.0'
9
9
  s.homepage = 'http://rubyeventmachine.com'
10
10
  s.rubyforge_project = 'eventmachine'
11
11
  s.licenses = ["Ruby", "GPL"]
data/java/src/com/rubyeventmachine/SslBox.java CHANGED
@@ -38,7 +38,7 @@ public class SslBox {
38
38
 
39
39
  public SslBox(boolean isServer, SocketChannel channel, KeyStore keyStore, X509TrustManager tm, boolean verifyPeer, String host, int port) {
40
40
  try {
41
- sslContext = SSLContext.getInstance("TLS");
41
+ sslContext = SSLContext.getInstance("TLSv1.2");
42
42
  KeyManager[] keyManagers = null;
43
43
 
44
44
  if (keyStore != null) {
data/lib/jeventmachine.rb CHANGED
@@ -302,14 +302,14 @@ module EventMachine
302
302
  end
303
303
 
304
304
  module KeyStoreBuilder
305
- require 'bouncy-castle-java'
306
305
  java_import java.io.FileReader
307
306
  java_import java.io.FileInputStream
308
307
  java_import java.security.cert.Certificate
309
308
  java_import java.security.cert.CertificateFactory
310
309
  java_import java.security.KeyStore
311
310
  java_import java.security.Security
312
- java_import org.bouncycastle.openssl.PEMReader
311
+ java_import org.bouncycastle.openssl.PEMParser
312
+ java_import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
313
313
  java_import org.bouncycastle.jce.provider.BouncyCastleProvider
314
314
  @name = 'em_java_tls_key' # TODO - find a correct value, or whether it even really matters.
315
315
  @initialized = false
@@ -325,14 +325,17 @@ module KeyStoreBuilder
325
325
  self.init
326
326
 
327
327
  key_reader = FileReader.new privkeyfile
328
- key_pair = PEMReader.new(key_reader).read_object
328
+ key_pair = PEMParser.new(key_reader).read_object
329
329
 
330
330
  cert_stream = FileInputStream.new certchainfile
331
331
  certs = CertificateFactory.get_instance('X.509', 'BC').generate_certificates cert_stream
332
332
 
333
+ converter = JcaPEMKeyConverter.new
334
+ private_key = converter.get_private_key(key_pair.get_private_key_info)
335
+
333
336
  store = KeyStore.get_instance 'PKCS12', 'BC'
334
337
  store.load nil, nil
335
- store.set_key_entry @name, key_pair.get_private, nil, certs.to_array(Certificate[certs.size].new)
338
+ store.set_key_entry @name, private_key, nil, certs.to_array(Certificate[certs.size].new)
336
339
 
337
340
  store
338
341
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sensu-em
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.2
4
+ version: 2.6.0
5
5
  platform: java
6
6
  authors:
7
7
  - Francis Cianfrocca
@@ -9,50 +9,50 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-06-05 00:00:00.000000000 Z
12
+ date: 2016-04-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
+ name: test-unit
16
+ version_requirements: !ruby/object:Gem::Requirement
17
+ requirements:
18
+ - - "~>"
19
+ - !ruby/object:Gem::Version
20
+ version: '2.0'
15
21
  requirement: !ruby/object:Gem::Requirement
16
22
  requirements:
17
- - - ~>
23
+ - - "~>"
18
24
  - !ruby/object:Gem::Version
19
25
  version: '2.0'
20
- name: test-unit
21
26
  prerelease: false
22
27
  type: :development
28
+ - !ruby/object:Gem::Dependency
29
+ name: rake-compiler
23
30
  version_requirements: !ruby/object:Gem::Requirement
24
31
  requirements:
25
- - - ~>
32
+ - - "~>"
26
33
  - !ruby/object:Gem::Version
27
- version: '2.0'
28
- - !ruby/object:Gem::Dependency
34
+ version: 0.8.3
29
35
  requirement: !ruby/object:Gem::Requirement
30
36
  requirements:
31
- - - ~>
37
+ - - "~>"
32
38
  - !ruby/object:Gem::Version
33
39
  version: 0.8.3
34
- name: rake-compiler
35
40
  prerelease: false
36
41
  type: :development
42
+ - !ruby/object:Gem::Dependency
43
+ name: yard
37
44
  version_requirements: !ruby/object:Gem::Requirement
38
45
  requirements:
39
- - - ~>
46
+ - - ">="
40
47
  - !ruby/object:Gem::Version
41
- version: 0.8.3
42
- - !ruby/object:Gem::Dependency
48
+ version: 0.8.5.2
43
49
  requirement: !ruby/object:Gem::Requirement
44
50
  requirements:
45
- - - '>='
51
+ - - ">="
46
52
  - !ruby/object:Gem::Version
47
53
  version: 0.8.5.2
48
- name: yard
49
54
  prerelease: false
50
55
  type: :development
51
- version_requirements: !ruby/object:Gem::Requirement
52
- requirements:
53
- - - '>='
54
- - !ruby/object:Gem::Version
55
- version: 0.8.5.2
56
56
  description: |-
57
57
  EventMachine implements a fast, single-threaded engine for arbitrary network
58
58
  communications. It's extremely easy to use in Ruby. EventMachine wraps all
@@ -86,9 +86,9 @@ extra_rdoc_files:
86
86
  - docs/old/SPAWNED_PROCESSES
87
87
  - docs/old/TODO
88
88
  files:
89
- - .gitignore
90
- - .travis.yml
91
- - .yardopts
89
+ - ".gitignore"
90
+ - ".travis.yml"
91
+ - ".yardopts"
92
92
  - CHANGELOG.md
93
93
  - GNU
94
94
  - Gemfile
@@ -197,6 +197,7 @@ files:
197
197
  - lib/em/version.rb
198
198
  - lib/eventmachine.rb
199
199
  - lib/jeventmachine.rb
200
+ - lib/rubyeventmachine.jar
200
201
  - rakelib/cpp.rake_example
201
202
  - rakelib/package.rake
202
203
  - rakelib/test.rake
@@ -263,7 +264,6 @@ files:
263
264
  - tests/test_ud.rb
264
265
  - tests/test_unbind_reason.rb
265
266
  - tmp/java/rubyeventmachine/.build
266
- - lib/rubyeventmachine.jar
267
267
  homepage: http://rubyeventmachine.com
268
268
  licenses:
269
269
  - Ruby
@@ -271,29 +271,29 @@ licenses:
271
271
  metadata: {}
272
272
  post_install_message:
273
273
  rdoc_options:
274
- - --title
274
+ - "--title"
275
275
  - EventMachine
276
- - --main
276
+ - "--main"
277
277
  - README.md
278
- - -x
278
+ - "-x"
279
279
  - lib/em/version
280
- - -x
280
+ - "-x"
281
281
  - lib/jeventmachine
282
282
  require_paths:
283
283
  - lib
284
284
  required_ruby_version: !ruby/object:Gem::Requirement
285
285
  requirements:
286
- - - '>='
286
+ - - ">="
287
287
  - !ruby/object:Gem::Version
288
288
  version: '0'
289
289
  required_rubygems_version: !ruby/object:Gem::Requirement
290
290
  requirements:
291
- - - '>='
291
+ - - ">="
292
292
  - !ruby/object:Gem::Version
293
293
  version: '0'
294
294
  requirements: []
295
295
  rubyforge_project: eventmachine
296
- rubygems_version: 2.1.9
296
+ rubygems_version: 2.4.8
297
297
  signing_key:
298
298
  specification_version: 4
299
299
  summary: Ruby/EventMachine library