jruby-openssl 0.7 → 0.7.1

data/History.txt

@@ -1,3 +1,22 @@
+== 0.7.1
+
+- NOTE: Now BouncyCastle jars has moved out to its own gem
+  "bouncy-castle-java" (http://rubygems.org/gems/bouncy-castle-java).
+  You don't need to care about it because "jruby-openssl" gem depends
+  on it from now on.
+
+=== SSL bugfix
+
+- JRUBY-4826 net/https client possibly raises "rbuf_fill': End of file
+  reached (EOFError)" for HTTP chunked read.
+
+=== Misc
+
+- JRUBY-4900: Set proper String to OpenSSL::OPENSSL_VERSION. Make sure
+  it's not an OpenSSL artifact: "OpenSSL 0.9.8b 04 May 2006
+  (JRuby-OpenSSL fake)" -> "jruby-ossl 0.7.1"
+- JRUBY-4975: Moving BouncyCastle jars out to its own gem.
+
 == 0.7
 
 - Follow MRI 1.8.7 openssl API changes

data/Manifest.txt

@@ -4,8 +4,6 @@ Manifest.txt
 README.txt
 License.txt
 lib/jopenssl.jar
-lib/bcmail-jdk15-144.jar
-lib/bcprov-jdk15-144.jar
 lib/jopenssl
 lib/jopenssl.jar
 lib/openssl
@@ -34,6 +32,7 @@ test/test_openssl.rb
 test/test_parse_certificate.rb
 test/test_pkcs7.rb
 test/test_pkey.rb
+test/test_ssl.rb
 test/test_x509store.rb
 test/ut_eof.rb
 test/fixture/ca-bundle.crt

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'rake/testtask'
 
 MANIFEST = FileList["Rakefile", "History.txt", "Manifest.txt", "README.txt", "License.txt", "lib/jopenssl.jar", "lib/**/*", "test/**/*"]
-BC_JARS = FileList["lib/bc*.jar"]
+BC_JARS = FileList["build_lib/bc*.jar"]
 
 task :default => [:java_compile, :test]
 
@@ -38,8 +38,7 @@ task :java_compile do
   end
 
   sh "javac @pkg/compile_options @pkg/compile_classpath @pkg/compile_sourcefiles"
-  File.open("pkg/classes/manifest.mf", "w") {|f| f.puts "Class-Path: #{BC_JARS.map{|f| File.basename(f) }.join(' ')}"}
-  sh "jar cfm lib/jopenssl.jar pkg/classes/manifest.mf -C pkg/classes/ ."
+  sh "jar cf lib/jopenssl.jar -C pkg/classes/ ."
 end
 file "lib/jopenssl.jar" => :java_compile
 
@@ -64,6 +63,7 @@ begin
     p.changes = p.paragraphs_of('History.txt', 0..1).join("\n\n")
     p.description = p.paragraphs_of('README.txt', 3...4).join("\n\n")
     p.test_globs = ENV["TEST"] || ["test/test_all.rb"]
+    p.extra_deps << ['bouncy-castle-java', '>= 0']
   end
   hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
 

data/lib/jopenssl/version.rb

@@ -1,5 +1,5 @@
 module Jopenssl
   module Version
-    VERSION = "0.7"
+    VERSION = "0.7.1"
   end
 end

data/lib/openssl/dummy.rb

@@ -1,6 +1,5 @@
-warn "Warning: OpenSSL ASN1/PKey/X509/Netscape/PKCS7 implementation unavailable"
-warn "You need to download or install BouncyCastle jars (bc-prov-*.jar, bc-mail-*.jar)"
-warn "to fix this."
+warn "OpenSSL ASN1/PKey/X509/Netscape/PKCS7 implementation unavailable"
+warn "gem install bouncy-castle-java for full support."
 module OpenSSL
   module ASN1
     class ASN1Error < OpenSSLError; end

data/lib/openssl.rb

@@ -58,8 +58,14 @@ unless defined?(::Digest::Class)
 end
 # end of compat chunk.
 
+begin
+  require 'bouncy-castle-java'
+rescue LoadError
+  # runs under restricted mode.
+end
 require 'jopenssl'
 
+
 require 'openssl/bn'
 require 'openssl/cipher'
 require 'openssl/digest'

data/test/test_java.rb

@@ -6,7 +6,7 @@ require 'mocha'
 if defined?(JRUBY_VERSION)
   require "java"
   $CLASSPATH << 'pkg/classes'
-  $CLASSPATH << 'lib/bcprov-jdk15-144.jar'
+  $CLASSPATH << 'build_lib/bcprov-jdk15-144.jar'
   
   module PKCS7Test
     module ASN1

data/test/test_ssl.rb

@@ -0,0 +1,97 @@
+require 'openssl'
+require 'test/unit'
+require 'webrick/https'
+require 'net/https'
+require 'logger'
+require File.expand_path('openssl/utils', File.dirname(__FILE__))
+
+
+class TestSSL < Test::Unit::TestCase
+  PORT = 17171
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  def setup
+    @server = @server_thread = nil
+    @verbose, $VERBOSE = $VERBOSE, nil
+    setup_server
+  end
+
+  def teardown
+    $VERBOSE = @verbose
+    teardown_server
+  end
+
+  def test_jruby_4826
+    assert_nothing_raised do
+      100.times do
+        http = Net::HTTP.new('localhost', PORT)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        req = Net::HTTP::Post.new('/post')
+        http.request(req).body
+      end
+    end
+  end
+
+private
+
+  def make_certificate(key, cn)
+    subject = OpenSSL::X509::Name.parse("/DC=org/DC=ruby-lang/CN=#{cn}")
+    exts = [
+      ["keyUsage", "keyEncipherment,digitalSignature", true],
+    ]
+    OpenSSL::TestUtils.issue_cert(
+      subject, key, 1, Time.now, Time.now + 3600, exts,
+      nil, nil, OpenSSL::Digest::SHA1.new
+    )
+  end
+
+  def setup_server
+    key = OpenSSL::TestUtils::TEST_KEY_RSA1024
+    cert = make_certificate(key, "localhost")
+    logger = Logger.new(STDERR)
+    logger.level = Logger::Severity::FATAL	# avoid logging SSLError (ERROR level)
+    @server = WEBrick::HTTPServer.new(
+      :Logger => logger,
+      :Port => PORT,
+      :AccessLog => [],
+      :SSLEnable => true,
+      :ServerName => "localhost",
+      :SSLCertificate => cert,
+      :SSLPrivateKey => key
+    )
+    @server.mount(
+      "/post",
+      WEBrick::HTTPServlet::ProcHandler.new(method("do_post").to_proc)
+    )
+    @server_thread = start_server_thread(@server)
+  end
+
+  def do_post(req, res)
+    res.chunked = true
+    res['content-type'] = 'text/plain'
+    piper, pipew = IO.pipe
+    res.body = piper
+    10.times { pipew << "A" * 10 }
+    pipew.close
+  end
+
+  def start_server_thread(server)
+    t = Thread.new {
+      Thread.current.abort_on_exception = true
+      server.start
+    }
+    while server.status != :Running
+      Thread.pass
+      unless t.alive?
+	t.join
+	raise
+      end
+    end
+    t
+  end
+
+  def teardown_server
+    @server.shutdown if @server
+  end
+end

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 0
     - 7
-  version: "0.7"
+    - 1
+  version: 0.7.1
 platform: ruby
 authors: 
   - Ola Bini and JRuby contributors
@@ -13,10 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 -05:00
+date: 2010-08-03 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: bouncy-castle-java
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 0
+            version: "0"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rubyforge
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            segments: 
+              - 2
+              - 0
+              - 4
+            version: 2.0.4
+    type: :development
+    version_requirements: *id002
 description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.
 email: ola.bini@gmail.com
 executables: []
@@ -35,8 +63,6 @@ files:
   - README.txt
   - License.txt
   - lib/jopenssl.jar
-  - lib/bcmail-jdk15-144.jar
-  - lib/bcprov-jdk15-144.jar
   - lib/openssl.rb
   - lib/jopenssl/version.rb
   - lib/openssl/bn.rb
@@ -58,6 +84,7 @@ files:
   - test/test_parse_certificate.rb
   - test/test_pkcs7.rb
   - test/test_pkey.rb
+  - test/test_ssl.rb
   - test/test_x509store.rb
   - test/ut_eof.rb
   - test/fixture/ca-bundle.crt
@@ -133,6 +160,7 @@ rdoc_options:
 require_paths: 
   - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -140,6 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
           - 0
         version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -149,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jruby-extras
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: OpenSSL add-on for JRuby