sensu-em 2.5.2-java → 2.6.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8579e5ca5ea5ff61150d1096f3c9fb10b21f22a2
-  data.tar.gz: a5f8a2a818d4091c955381665faf5d469e184f30
+  metadata.gz: a067acc092c83c24d9ffcd96feacf0c1ea0487ed
+  data.tar.gz: 52d5651812f05fbfae7200eb47ec2f077f0d4821
 SHA512:
-  metadata.gz: 482de9d6f632d676e33d31ef69b7ce98ccd752fc1cd6fc183969adb7e61fc5f2794f1844e2c37476cde2d5189f240d2a252a0a77ad90034246667e23bb31b6b2
-  data.tar.gz: cc9085d0fc0586e5b25915360ba95b8b44acb4046b9f7502166a3d35ed41143566df7064b59c0b29042ec321c2ae731cf1abbd26c25f87b60c4cd7f2409507fc
+  metadata.gz: c543cf47adf134903a008cf00b7367abe1a0e04b55ea07bb2f5b9a1debd5cf0916de7f1a99d795d282616ce9e9c80c5452e77d319e58376573880202d0308c87
+  data.tar.gz: 17b02ee5e32a011233ba0e4f75fe144e7ac7e0bd36aac3ba56faa87292fcb6f3c2da091b932d605d3d7dede244b29950130abf74ff64d48c5008663bdca92c5e

data/eventmachine.gemspec

@@ -5,7 +5,7 @@ require "em/version"
 
 Gem::Specification.new do |s|
   s.name = 'sensu-em'
-  s.version = '2.5.2'
+  s.version = '2.6.0'
   s.homepage = 'http://rubyeventmachine.com'
   s.rubyforge_project = 'eventmachine'
   s.licenses = ["Ruby", "GPL"]

data/java/src/com/rubyeventmachine/SslBox.java

@@ -38,7 +38,7 @@ public class SslBox {
     
 	public SslBox(boolean isServer, SocketChannel channel, KeyStore keyStore, X509TrustManager tm, boolean verifyPeer, String host, int port) {
 		try {
-			sslContext = SSLContext.getInstance("TLS");
+			sslContext = SSLContext.getInstance("TLSv1.2");
 			KeyManager[] keyManagers = null;
 
 			if (keyStore != null) {

data/lib/jeventmachine.rb

@@ -302,14 +302,14 @@ module EventMachine
 end
 
 module KeyStoreBuilder
-  require 'bouncy-castle-java'
   java_import java.io.FileReader
   java_import java.io.FileInputStream
   java_import java.security.cert.Certificate
   java_import java.security.cert.CertificateFactory
   java_import java.security.KeyStore
   java_import java.security.Security
-  java_import org.bouncycastle.openssl.PEMReader
+  java_import org.bouncycastle.openssl.PEMParser
+  java_import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter
   java_import org.bouncycastle.jce.provider.BouncyCastleProvider
   @name = 'em_java_tls_key' # TODO - find a correct value, or whether it even really matters.
   @initialized = false
@@ -325,14 +325,17 @@ module KeyStoreBuilder
     self.init
 
     key_reader = FileReader.new privkeyfile
-    key_pair = PEMReader.new(key_reader).read_object
+    key_pair = PEMParser.new(key_reader).read_object
 
     cert_stream = FileInputStream.new certchainfile
     certs = CertificateFactory.get_instance('X.509', 'BC').generate_certificates cert_stream
 
+    converter = JcaPEMKeyConverter.new
+    private_key = converter.get_private_key(key_pair.get_private_key_info)
+
     store = KeyStore.get_instance 'PKCS12', 'BC'
     store.load nil, nil
-    store.set_key_entry @name, key_pair.get_private, nil, certs.to_array(Certificate[certs.size].new)
+    store.set_key_entry @name, private_key, nil, certs.to_array(Certificate[certs.size].new)
 
     store
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu-em
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.6.0
 platform: java
 authors:
 - Francis Cianfrocca
@@ -9,50 +9,50 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-05 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: test-unit
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  name: test-unit
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
+        version: 0.8.3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
-  name: rake-compiler
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: yard
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.3
-- !ruby/object:Gem::Dependency
+        version: 0.8.5.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.5.2
-  name: yard
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.5.2
 description: |-
   EventMachine implements a fast, single-threaded engine for arbitrary network
   communications. It's extremely easy to use in Ruby. EventMachine wraps all
@@ -86,9 +86,9 @@ extra_rdoc_files:
 - docs/old/SPAWNED_PROCESSES
 - docs/old/TODO
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - GNU
 - Gemfile
@@ -197,6 +197,7 @@ files:
 - lib/em/version.rb
 - lib/eventmachine.rb
 - lib/jeventmachine.rb
+- lib/rubyeventmachine.jar
 - rakelib/cpp.rake_example
 - rakelib/package.rake
 - rakelib/test.rake
@@ -263,7 +264,6 @@ files:
 - tests/test_ud.rb
 - tests/test_unbind_reason.rb
 - tmp/java/rubyeventmachine/.build
-- lib/rubyeventmachine.jar
 homepage: http://rubyeventmachine.com
 licenses:
 - Ruby
@@ -271,29 +271,29 @@ licenses:
 metadata: {}
 post_install_message:
 rdoc_options:
-- --title
+- "--title"
 - EventMachine
-- --main
+- "--main"
 - README.md
-- -x
+- "-x"
 - lib/em/version
-- -x
+- "-x"
 - lib/jeventmachine
 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: eventmachine
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Ruby/EventMachine library