jruby-openssl 0.1.1 → 0.2

data/History.txt

@@ -1,3 +1,12 @@
+== 0.2
+
+- Enable remaining tests; fix a nil string issue in SSLSocket.sysread (JRUBY-1888)
+- Fix socket buffering issue by setting socket IO sync = true
+- Fix bad file descriptor issue caused by unnecessary close (JRUBY-2152)
+- Fix AES key length (JRUBY-2187)
+- Fix cipher initialization (JRUBY-1100)
+- Now, only compatible with JRuby 1.1
+
 == 0.1.1
 
 - Fixed blocker issue preventing HTTPS/SSL from working (JRUBY-1222)

data/README.txt

@@ -1,3 +1,9 @@
+= JRuby-OpenSSL
+
+* http://jruby-extras.rubyforge.org/jruby-openssl
+
+== DESCRIPTION:
+
 JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.
 
 JRuby offers *just enough* compatibility for most Ruby applications that use OpenSSL. 

data/lib/jopenssl/version.rb

@@ -1,5 +1,5 @@
 module Jopenssl
   module Version
-    VERSION = "0.1.1"
+    VERSION = "0.2"
   end
 end

data/test/openssl/ssl_server.rb

@@ -28,8 +28,19 @@ def make_key(pem)
   end
 end
 
+if $DEBUG
+  def log(s); File.open("ssl-server-debug", "a") {|f| f.puts s}; end
+  File.open("ssl-server-debug", "w") {|f| f << ""}
+  log "server starting"
+else
+  def log(s) end
+end
+
+begin
 ca_cert  = OpenSSL::X509::Certificate.new(get_pem)
+log "got ca cert #{ca_cert.inspect}"
 ssl_cert = OpenSSL::X509::Certificate.new(get_pem)
+log "got ssl cert #{ssl_cert.inspect}"
 ssl_key  = make_key(get_pem)
 port = Integer(ARGV.shift)
 verify_mode = Integer(ARGV.shift)
@@ -49,6 +60,7 @@ Socket.do_not_reverse_lookup = true
 tcps = nil
 100.times{|i|
   begin
+    log "starting server on #{port+i}"
     tcps = TCPServer.new("0.0.0.0", port+i)
     port = port + i
     break
@@ -56,9 +68,11 @@ tcps = nil
     next 
   end
 }
+log "starting ssl server"
 ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
 ssls.start_immediately = start_immediately
 
+log("sending pid #{Process.pid}")
 $stdout.sync = true
 $stdout.puts Process.pid
 $stdout.puts port
@@ -79,3 +93,7 @@ loop do
     ssl.close
   }
 end
+rescue
+  log $!
+  log $!.backtrace.join("\n")
+end

data/test/openssl/test_ssl.rb

@@ -74,6 +74,7 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
     jruby_oop {
       begin
         cmd = [RUBY]
+        cmd << "-Ilib"
         cmd << "-d" if $DEBUG
         cmd << SSL_SERVER << port0.to_s << verify_mode.to_s
         cmd << (start_immediately ? "yes" : "no")
@@ -81,15 +82,21 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
         server.write(@ca_cert.to_pem)
         server.write(@svr_cert.to_pem)
         server.write(@svr_key.to_pem)
-        pid = Integer(server.gets)
+        $stderr.puts "sent certs to server" if $DEBUG
+        str = server.gets
+        $stderr.puts "got pid from server: #{str}" if $DEBUG
+        pid = Integer(str)
         if port = server.gets
           if $DEBUG
             $stderr.printf("%s started: pid=%d port=%d\n", SSL_SERVER, pid, port)
           end
           block.call(server, port.to_i)
         end
+      rescue => e
+        puts e, *(e.backtrace)
       ensure
         if server
+          $stderr.puts "killing: #{pid}" if $DEBUG
           Process.kill(:KILL, pid)
           server.close
         end

data/test/test_openssl.rb

@@ -6,13 +6,13 @@ begin
   require 'openssl/test_digest'
   require 'openssl/test_hmac'
   require 'openssl/test_ns_spki'
-  # require 'openssl/test_pair'
+  require 'openssl/test_pair'
   require 'openssl/test_pkey_rsa'
   require 'openssl/test_ssl'
   require 'openssl/test_x509cert'
   require 'openssl/test_x509crl'
-  require 'openssl/test_x509name'
   require 'openssl/test_x509ext'
+  require 'openssl/test_x509name'
   require 'openssl/test_x509req'
   require 'openssl/test_x509store'
 rescue Exception => e

metadata

@@ -1,33 +1,28 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: jruby-openssl
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2008-01-06 00:00:00 -06:00
-summary: OpenSSL add-on for JRuby
-require_paths: 
-- lib
-email: ola.bini@gmail.com
-homepage: http://jruby-extras.rubyforge.org/jopenssl
-rubyforge_project: jruby-extras
-description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: "0.2"
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Ola Bini and JRuby contributors
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-03-19 00:00:00 -05:00
+default_executable: 
+dependencies: []
+
+description: = JRuby-OpenSSL
+email: ola.bini@gmail.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- README.txt
+- License.txt
 files: 
 - History.txt
 - README.txt
@@ -66,20 +61,32 @@ files:
 - test/openssl/utils.rb
 - test/test_openssl.rb
 - test/ut_eof.rb
-test_files: 
-- test/test_openssl.rb
+has_rdoc: true
+homepage: http://jruby-extras.rubyforge.org/jopenssl
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- README.txt
-- License.txt
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: jruby-extras
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: OpenSSL add-on for JRuby
+test_files: 
+- test/test_openssl.rb