jruby · Dec 21, 2015 · Dec 21, 2015 · Dec 21, 2015 · Dec 21, 2015 · Dec 21, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -40,11 +40,11 @@ env:
     - PHASE='-Prake -Dtask=spec:jruby'
     - PHASE='-Prake -Dtask=spec:jrubyc'
     - PHASE='-Prake -Dtask=spec:profiler'
-    - PHASE='-Ptruffle-specs-language'
-    - PHASE='-Ptruffle-specs-core'
-    - PHASE='-Ptruffle-specs-library'
-    - PHASE='-Ptruffle-specs-truffle'
-    - PHASE='-Ptruffle-mri-tests'
+    #- PHASE='-Ptruffle-specs-language'
+    #- PHASE='-Ptruffle-specs-core'
+    #- PHASE='-Ptruffle-specs-library'
+    #- PHASE='-Ptruffle-specs-truffle'
+    #- PHASE='-Ptruffle-mri-tests'
 
 matrix:
   include:

diff --git a/lib/pom.rb b/lib/pom.rb
@@ -10,7 +10,7 @@ def initialize( name, version, default_spec = true )
 
 default_gems =
   [
-   ImportedGem.new( 'jruby-openssl', '0.9.12' ),
+   ImportedGem.new( 'jruby-openssl', '0.9.13' ),
    ImportedGem.new( 'jruby-readline', '1.0', false ),
    ImportedGem.new( 'rake', '${rake.version}' ),
    ImportedGem.new( 'rdoc', '${rdoc.version}' ),
@@ -48,8 +48,8 @@ def initialize( name, version, default_spec = true )
   #repository( :url => 'http://rubygems-proxy.torquebox.org/releases',
   #            :id => 'tb-rubygems-releases' )
   # for testing out jruby-ossl before final release :
-  #repository( :url => 'http://oss.sonatype.org/content/repositories/staging',
-  #            :id => 'gem-staging' )
+  repository( :url => 'http://oss.sonatype.org/content/repositories/staging',
+              :id => 'gem-staging' )
 
   plugin( :clean,
           :filesets => [ { :directory => '${basedir}/ruby/gems/shared/specifications/default',
@@ -186,7 +186,7 @@ def initialize( name, version, default_spec = true )
 
           specname = File.basename( specfile )
           puts "copy to specifications/default: #{specname}"
-          
+
           spec = Gem::Package.new( Dir[ File.join( cache, "#{g.name}-#{version}*.gem" ) ].first ).spec
           File.open( File.join( default_specs, specname ), 'w' ) do |f|
             f.print( spec.to_ruby )

diff --git a/lib/pom.xml b/lib/pom.xml
@@ -34,7 +34,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>jruby-openssl</artifactId>
-      <version>0.9.12</version>
+      <version>0.9.13</version>
       <type>gem</type>
       <scope>provided</scope>
       <exclusions>
@@ -175,6 +175,12 @@ DO NOT MODIFIY - GENERATED CODE
       </exclusions>
     </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <id>gem-staging</id>
+      <url>http://oss.sonatype.org/content/repositories/staging</url>
+    </repository>
+  </repositories>
   <build>
     <resources>
       <resource>

diff --git a/lib/src/empty.jar b/lib/src/empty.jar
diff --git a/test/mri/excludes/OpenSSL/TestBN.rb b/test/mri/excludes/OpenSSL/TestBN.rb
@@ -1,4 +1 @@
-exclude :test_new_bn, ''
-exclude :test_new_integer, ''
-exclude :test_new_str, ''
-exclude :test_to_bn, ''
+exclude :test_new_str, 'needs investigation'
diff --git a/test/mri/excludes/OpenSSL/TestDigest.rb b/test/mri/excludes/OpenSSL/TestDigest.rb
diff --git a/test/mri/excludes/OpenSSL/TestEOF1LowlevelSocket.rb b/test/mri/excludes/OpenSSL/TestEOF1LowlevelSocket.rb
@@ -1,4 +1,4 @@
-exclude :test_eof_0, "hangs"
-exclude :test_eof_1, "hangs"
-exclude :test_eof_2, "hangs"
-exclude :test_eof_3, "hangs"
+#exclude :test_eof_0, "hangs"
+#exclude :test_eof_1, "hangs"
+#exclude :test_eof_2, "hangs"
+#exclude :test_eof_3, "hangs"
diff --git a/test/mri/excludes/OpenSSL/TestEOF2LowlevelSocket.rb b/test/mri/excludes/OpenSSL/TestEOF2LowlevelSocket.rb
@@ -1,4 +1,4 @@
-exclude :test_eof_0, "hangs"
-exclude :test_eof_1, "hangs"
-exclude :test_eof_2, "hangs"
-exclude :test_eof_3, "hangs"
+#exclude :test_eof_0, "hangs"
+#exclude :test_eof_1, "hangs"
+#exclude :test_eof_2, "hangs"
+#exclude :test_eof_3, "hangs"
diff --git a/test/mri/excludes/OpenSSL/TestPair.rb b/test/mri/excludes/OpenSSL/TestPair.rb
@@ -1,3 +1 @@
-exclude :test_read_nonblock, "needs investigation"
-exclude :test_read_nonblock_no_exception, "needs investigation"
-exclude :test_readpartial, "needs investigation"
+exclude :test_connect_accept_nonblock_no_exception, "SSLError: Cannot change mode after SSL traffic has started"
diff --git a/test/mri/excludes/OpenSSL/TestPairLowLevelSocket.rb b/test/mri/excludes/OpenSSL/TestPairLowLevelSocket.rb
@@ -1,12 +1 @@
-exclude :test_getc, "hangs"
-exclude :test_puts_empty, "hangs"
-exclude :test_puts_meta, "hangs"
-exclude :test_read_nonblock, "hangs"
-exclude :test_read_nonblock_no_exception, "hangs"
-exclude :test_readall, "hangs"
-exclude :test_readline, "hangs"
-exclude :test_readpartial, "hangs"
-exclude :test_write_nonblock, "hangs"
-exclude :test_write_nonblock_no_exceptions, "hangs"
-exclude :test_write_nonblock_with_buffered_data, "hangs"
-exclude :test_write_nonblock_with_buffered_data_no_exceptions, "hangs"
+exclude :test_connect_accept_nonblock_no_exception, "SSLError: Cannot change mode after SSL traffic has started"
diff --git a/test/mri/excludes/OpenSSL/TestSSL.rb b/test/mri/excludes/OpenSSL/TestSSL.rb
@@ -1,10 +1,21 @@
 exclude :test_client_ca, 'needs investigation'
-exclude :test_close_after_socket_close, "needs investigation"
-exclude :test_post_connection_check, 'needs investigation'
-exclude :test_read_nonblock_without_session, 'hangs'
-exclude :test_read_and_write, 'needs investigation'
-exclude :test_renegotiation_cb, 'needs investigation'
-exclude :test_ssl_gets, 'encoding issue'
-exclude :test_tlsext_hostname, 'needs investigation'
-exclude :test_unset_OP_ALL, 'needs investigation'
+exclude :test_ctx_setup_invalid, 'works sufficiently - low priority'
+exclude :test_read_nonblock_without_session, 'HANGS'
+exclude :test_renegotiation_cb, 'SSLContext#renegotiation_cb= not supported'
 exclude :test_verify_certificate_identity, 'needs investigation'
+exclude :test_options_setting_nil_means_all, 'needs investigation'
+exclude :test_options_defaults_to_OP_ALL_on, 'needs investigation'
+exclude :test_alpn_protocol_selection_ary, 'SSLContext#alpn_select_cb= not supported'
+exclude :test_alpn_protocol_selection_cancel, 'SSLContext#alpn_select_cb= not supported'
+exclude :test_npn_advertised_protocol_too_long, 'SSLContext#npn_protocols= not supported'
+exclude :test_npn_protocol_selection_ary, 'SSLContext#npn_protocols= not supported'
+exclude :test_npn_protocol_selection_cancel, 'SSLContext#npn_protocols= not supported'
+exclude :test_npn_protocol_selection_enum, 'SSLContext#npn_protocols= not supported'
+exclude :test_npn_selected_protocol_too_long, 'SSLContext#npn_protocols= not supported'
+exclude :test_post_connect_check_with_anon_ciphers, 'needs investigation'
+exclude :test_ssl_sysread_blocking_error, 'works except JRuby-OpenSSL does not raise TypeError on SSLSocket#sysread(4, exception: false)'
+exclude :test_servername_cb, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
+exclude :test_servername_cb_calls_setup_on_returned_ctx, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
+exclude :test_servername_cb_can_return_nil, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
+exclude :test_servername_cb_raises_an_exception_on_unknown_objects, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
+exclude :test_servername_cb_sets_context_on_the_socket, 'Errno::EOPNOTSUPP: Operation not supported - Socket.socketpair only supports streaming UNIX sockets'
diff --git a/test/mri/excludes/OpenSSL/TestSSLSession.rb b/test/mri/excludes/OpenSSL/TestSSLSession.rb
@@ -1,8 +1,9 @@
-exclude :test_client_session, "needs investigation"
-exclude :test_ctx_client_session_cb, "needs investigation"
-exclude :test_ctx_server_session_cb, "needs investigation"
-exclude :test_server_session, "needs investigation"
-exclude :test_session, "needs investigation"
-exclude :test_session_equals, "needs investigation"
-exclude :test_session_time, "needs investigation"
-exclude :test_session_timeout, "needs investigation"
+exclude :test_client_session, "HANGS"
+exclude :test_ctx_client_session_cb, "session_new_cb= not supported"
+exclude :test_ctx_server_session_cb, "session_get_cb= not supported"
+exclude :test_server_session, "HANGS"
+exclude :test_session, "HANGS"
+exclude :test_session_equals, "OpenSSL::SSL::Session.new not implemented"
+exclude :test_session_time, "OpenSSL::SSL::Session.new not implemented"
+exclude :test_session_timeout, "OpenSSL::SSL::Session.new not implemented"
+exclude :test_session_exts_read, "OpenSSL::SSL::Session.new not implemented"
diff --git a/test/mri/excludes/OpenSSL/TestX509Certificate.rb b/test/mri/excludes/OpenSSL/TestX509Certificate.rb
@@ -1,2 +1,2 @@
-exclude :test_public_key, "new failure but we really want to run this test"
-warn "!!! excluding TestX509Certificate#test_public_key"
+#exclude :test_public_key, "new failure but we really want to run this test"
+#warn "!!! excluding TestX509Certificate#test_public_key"
diff --git a/test/mri/openssl/ssl_server.rb b/test/mri/openssl/ssl_server.rb
diff --git a/test/mri/openssl/test_asn1.rb b/test/mri/openssl/test_asn1.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
 class  OpenSSL::TestASN1 < Test::Unit::TestCase
@@ -186,13 +187,12 @@ def test_decode
     assert_equal(OpenSSL::ASN1::Null, pkey.value[0].value[1].class)
 
     assert_equal(OpenSSL::ASN1::BitString, sig_val.class)
-
+    #cululated_sig = key.sign(OpenSSL::Digest::SHA1.new, tbs_cert.to_der)
+    #assert_equal(cululated_sig, sig_val.value)
+    # JRuby :
     # since the direct compare of signatures does not work
     # we verify the signature via the certificate itself
     assert OpenSSL::X509::Certificate.new( cert.to_der ).verify key
-
-    #cululated_sig = key.sign(OpenSSL::Digest::SHA1.new, tbs_cert.to_der)
-    #assert_equal(cululated_sig, sig_val.value)
   end
 
   def test_encode_boolean
@@ -557,7 +557,7 @@ def test_bit_string_infinite_length
   end
 
   def test_primitive_inf_length
-    assert_raises(OpenSSL::ASN1::ASN1Error) do
+    assert_raise(OpenSSL::ASN1::ASN1Error) do
       spec = %w{ 02 80 02 01 01 00 00 }
       raw = [spec.join('')].pack('H*')
       OpenSSL::ASN1.decode(raw)
@@ -610,5 +610,5 @@ def assert_universal(tag, asn1)
     assert_equal(:UNIVERSAL, asn1.tag_class)
   end
 
-end if defined?(OpenSSL)
+end if defined?(OpenSSL::TestUtils)
 
diff --git a/test/mri/openssl/test_bn.rb b/test/mri/openssl/test_bn.rb
@@ -1,6 +1,7 @@
+# frozen_string_literal: false
 require_relative 'utils'
 
-if defined?(OpenSSL)
+if defined?(OpenSSL::TestUtils)
 
 class OpenSSL::TestBN < Test::Unit::TestCase
   def test_new_str

diff --git a/test/mri/openssl/test_buffering.rb b/test/mri/openssl/test_buffering.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require_relative 'utils'
 require 'stringio'
 
@@ -61,7 +62,7 @@ def @io.syswrite *a
       raise SystemCallError, 'fail'
     end
 
-    assert_raises SystemCallError do
+    assert_raise SystemCallError do
       @io.flush
     end
 
@@ -84,4 +85,4 @@ def test_each_byte
     assert_equal([97, 98, 99], res)
   end
 
-end if defined?(OpenSSL)
+end if defined?(OpenSSL::TestUtils)