jruby-openssl 0.8.0.pre3 → 0.8.0

data/Manifest.txt

@@ -5,8 +5,6 @@ README.txt
 License.txt
 lib/shared/jopenssl.jar
 lib/1.8
-lib/1.9
-lib/shared
 lib/1.8/openssl
 lib/1.8/openssl.rb
 lib/1.8/openssl/bn.rb
@@ -21,6 +19,7 @@ lib/1.8/openssl/ssl-internal.rb
 lib/1.8/openssl/ssl.rb
 lib/1.8/openssl/x509-internal.rb
 lib/1.8/openssl/x509.rb
+lib/1.9
 lib/1.9/openssl
 lib/1.9/openssl.rb
 lib/1.9/openssl/bn.rb
@@ -32,128 +31,14 @@ lib/1.9/openssl/ssl-internal.rb
 lib/1.9/openssl/ssl.rb
 lib/1.9/openssl/x509-internal.rb
 lib/1.9/openssl/x509.rb
+lib/shared
 lib/shared/jopenssl
-lib/shared/jopenssl.jar
+lib/shared/jopenssl/version.rb
 lib/shared/jruby-openssl.rb
 lib/shared/openssl
 lib/shared/openssl.rb
-lib/shared/jopenssl/version.rb
 lib/shared/openssl/pkcs12.rb
-test/1.8
-test/1.9
-test/cert_with_ec_pk.cer
-test/fixture
 test/java
-test/ref
-test/ruby
-test/test_all.rb
-test/test_certificate.rb
-test/test_cipher.rb
-test/test_imaps.rb
-test/test_integration.rb
-test/test_java.rb
-test/test_openssl.rb
-test/test_parse_certificate.rb
-test/test_pkcs7.rb
-test/test_pkey_dsa.rb
-test/test_pkey_rsa.rb
-test/test_ssl.rb
-test/test_x509store.rb
-test/ut_eof.rb
-test/1.8/ssl_server.rb
-test/1.8/test_asn1.rb
-test/1.8/test_cipher.rb
-test/1.8/test_config.rb
-test/1.8/test_digest.rb
-test/1.8/test_ec.rb
-test/1.8/test_hmac.rb
-test/1.8/test_ns_spki.rb
-test/1.8/test_pair.rb
-test/1.8/test_pkcs7.rb
-test/1.8/test_pkey_rsa.rb
-test/1.8/test_ssl.rb
-test/1.8/test_x509cert.rb
-test/1.8/test_x509crl.rb
-test/1.8/test_x509ext.rb
-test/1.8/test_x509name.rb
-test/1.8/test_x509req.rb
-test/1.8/test_x509store.rb
-test/1.8/utils.rb
-test/1.9/ssl_server.rb
-test/1.9/test_asn1.rb
-test/1.9/test_bn.rb
-test/1.9/test_buffering.rb
-test/1.9/test_cipher.rb
-test/1.9/test_config.rb
-test/1.9/test_digest.rb
-test/1.9/test_engine.rb
-test/1.9/test_hmac.rb
-test/1.9/test_ns_spki.rb
-test/1.9/test_ocsp.rb
-test/1.9/test_pair.rb
-test/1.9/test_pkcs12.rb
-test/1.9/test_pkcs7.rb
-test/1.9/test_pkey_dh.rb
-test/1.9/test_pkey_dsa.rb
-test/1.9/test_pkey_ec.rb
-test/1.9/test_pkey_rsa.rb
-test/1.9/test_ssl.rb
-test/1.9/test_ssl_session.rb
-test/1.9/test_x509cert.rb
-test/1.9/test_x509crl.rb
-test/1.9/test_x509ext.rb
-test/1.9/test_x509name.rb
-test/1.9/test_x509req.rb
-test/1.9/test_x509store.rb
-test/1.9/utils.rb
-test/fixture/ca-bundle.crt
-test/fixture/ca_path
-test/fixture/cacert.pem
-test/fixture/cert_localhost.pem
-test/fixture/common.pem
-test/fixture/ids_in_subject_rdn_set.pem
-test/fixture/imaps
-test/fixture/key_then_cert.pem
-test/fixture/keypair.pem
-test/fixture/localhost_keypair.pem
-test/fixture/max.pem
-test/fixture/purpose
-test/fixture/selfcert.pem
-test/fixture/verisign.pem
-test/fixture/verisign_c3.pem
-test/fixture/ca_path/72fa7371.0
-test/fixture/ca_path/verisign.pem
-test/fixture/imaps/cacert.pem
-test/fixture/imaps/server.crt
-test/fixture/imaps/server.key
-test/fixture/purpose/b70a5bc1.0
-test/fixture/purpose/ca
-test/fixture/purpose/cacert.pem
-test/fixture/purpose/scripts
-test/fixture/purpose/sslclient
-test/fixture/purpose/sslclient.pem
-test/fixture/purpose/sslserver
-test/fixture/purpose/sslserver.pem
-test/fixture/purpose/sslserver_no_dsig_in_keyUsage.pem
-test/fixture/purpose/ca/PASSWD_OF_CA_KEY_IS_1234
-test/fixture/purpose/ca/ca_config.rb
-test/fixture/purpose/ca/cacert.pem
-test/fixture/purpose/ca/newcerts
-test/fixture/purpose/ca/private
-test/fixture/purpose/ca/serial
-test/fixture/purpose/ca/newcerts/2_cert.pem
-test/fixture/purpose/ca/newcerts/3_cert.pem
-test/fixture/purpose/ca/newcerts/4_cert.pem
-test/fixture/purpose/ca/private/cakeypair.pem
-test/fixture/purpose/scripts/gen_cert.rb
-test/fixture/purpose/scripts/gen_csr.rb
-test/fixture/purpose/scripts/init_ca.rb
-test/fixture/purpose/sslclient/csr.pem
-test/fixture/purpose/sslclient/keypair.pem
-test/fixture/purpose/sslclient/sslclient.pem
-test/fixture/purpose/sslserver/csr.pem
-test/fixture/purpose/sslserver/keypair.pem
-test/fixture/purpose/sslserver/sslserver.pem
 test/java/pkcs7_mime_enveloped.message
 test/java/pkcs7_mime_signed.message
 test/java/pkcs7_multipart_signed.message
@@ -162,9 +47,5 @@ test/java/test_java_bio.rb
 test/java/test_java_mime.rb
 test/java/test_java_pkcs7.rb
 test/java/test_java_smime.rb
-test/ref/a.out
-test/ref/compile.rb
-test/ref/pkcs1
-test/ref/pkcs1.c
-test/ruby/envutil.rb
-test/ruby/ut_eof.rb
+test/test_java.rb
+test/ut_eof.rb

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'rake/testtask'
 
 MANIFEST = FileList["Rakefile", "History.txt", "Manifest.txt", "README.txt", "License.txt", "lib/shared/jopenssl.jar", "lib/**/*", "test/**/*"]
-BC_JARS = FileList["build_lib/bc*.jar"]
+BC_JARS = FileList["../../build_lib/bc*.jar"]
 
 task :default => [:java_compile, :test]
 
@@ -34,7 +34,7 @@ task :java_compile do
   end
 
   File.open("pkg/compile_sourcefiles", "w") do |f|
-    f << FileList['src/org/jruby/ext/openssl/**/*.java'].join(' ')
+    f << FileList['../../src/org/jruby/ext/openssl/**/*.java'].join(' ')
   end
 
   sh "javac @pkg/compile_options @pkg/compile_classpath @pkg/compile_sourcefiles"
@@ -54,7 +54,7 @@ begin
   ENV['RUBY_FLAGS'] ||= [
     (RUBY_VERSION >= '1.9.0' ? '--1.9' : '--1.8'),
     '-w',
-    '-Ibuild_lib:lib/shared:lib:test',
+    '-I../../build_lib:lib/shared:lib:test',
     '-J-ea',
     ENV['RUBY_DEBUG']
   ].compact.join(' ')

data/lib/shared/jopenssl/version.rb

@@ -1,5 +1,5 @@
 module Jopenssl
   module Version
-    VERSION = "0.8.0.pre3"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jruby-openssl
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre3
-  prerelease: 6
+  prerelease:
+  version: 0.8.0
 platform: ruby
 authors:
 - Ola Bini and JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-10-27 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bouncy-castle-java
@@ -82,110 +82,10 @@ files:
 - lib/1.9/openssl/ssl.rb
 - lib/1.9/openssl/x509-internal.rb
 - lib/1.9/openssl/x509.rb
+- lib/shared/jopenssl/version.rb
 - lib/shared/jruby-openssl.rb
 - lib/shared/openssl.rb
-- lib/shared/jopenssl/version.rb
 - lib/shared/openssl/pkcs12.rb
-- test/cert_with_ec_pk.cer
-- test/test_all.rb
-- test/test_certificate.rb
-- test/test_cipher.rb
-- test/test_imaps.rb
-- test/test_integration.rb
-- test/test_java.rb
-- test/test_openssl.rb
-- test/test_parse_certificate.rb
-- test/test_pkcs7.rb
-- test/test_pkey_dsa.rb
-- test/test_pkey_rsa.rb
-- test/test_ssl.rb
-- test/test_x509store.rb
-- test/ut_eof.rb
-- test/1.8/ssl_server.rb
-- test/1.8/test_asn1.rb
-- test/1.8/test_cipher.rb
-- test/1.8/test_config.rb
-- test/1.8/test_digest.rb
-- test/1.8/test_ec.rb
-- test/1.8/test_hmac.rb
-- test/1.8/test_ns_spki.rb
-- test/1.8/test_pair.rb
-- test/1.8/test_pkcs7.rb
-- test/1.8/test_pkey_rsa.rb
-- test/1.8/test_ssl.rb
-- test/1.8/test_x509cert.rb
-- test/1.8/test_x509crl.rb
-- test/1.8/test_x509ext.rb
-- test/1.8/test_x509name.rb
-- test/1.8/test_x509req.rb
-- test/1.8/test_x509store.rb
-- test/1.8/utils.rb
-- test/1.9/ssl_server.rb
-- test/1.9/test_asn1.rb
-- test/1.9/test_bn.rb
-- test/1.9/test_buffering.rb
-- test/1.9/test_cipher.rb
-- test/1.9/test_config.rb
-- test/1.9/test_digest.rb
-- test/1.9/test_engine.rb
-- test/1.9/test_hmac.rb
-- test/1.9/test_ns_spki.rb
-- test/1.9/test_ocsp.rb
-- test/1.9/test_pair.rb
-- test/1.9/test_pkcs12.rb
-- test/1.9/test_pkcs7.rb
-- test/1.9/test_pkey_dh.rb
-- test/1.9/test_pkey_dsa.rb
-- test/1.9/test_pkey_ec.rb
-- test/1.9/test_pkey_rsa.rb
-- test/1.9/test_ssl.rb
-- test/1.9/test_ssl_session.rb
-- test/1.9/test_x509cert.rb
-- test/1.9/test_x509crl.rb
-- test/1.9/test_x509ext.rb
-- test/1.9/test_x509name.rb
-- test/1.9/test_x509req.rb
-- test/1.9/test_x509store.rb
-- test/1.9/utils.rb
-- test/fixture/ca-bundle.crt
-- test/fixture/cacert.pem
-- test/fixture/cert_localhost.pem
-- test/fixture/common.pem
-- test/fixture/ids_in_subject_rdn_set.pem
-- test/fixture/key_then_cert.pem
-- test/fixture/keypair.pem
-- test/fixture/localhost_keypair.pem
-- test/fixture/max.pem
-- test/fixture/selfcert.pem
-- test/fixture/verisign.pem
-- test/fixture/verisign_c3.pem
-- test/fixture/ca_path/72fa7371.0
-- test/fixture/ca_path/verisign.pem
-- test/fixture/imaps/cacert.pem
-- test/fixture/imaps/server.crt
-- test/fixture/imaps/server.key
-- test/fixture/purpose/b70a5bc1.0
-- test/fixture/purpose/cacert.pem
-- test/fixture/purpose/sslclient.pem
-- test/fixture/purpose/sslserver.pem
-- test/fixture/purpose/sslserver_no_dsig_in_keyUsage.pem
-- test/fixture/purpose/ca/PASSWD_OF_CA_KEY_IS_1234
-- test/fixture/purpose/ca/ca_config.rb
-- test/fixture/purpose/ca/cacert.pem
-- test/fixture/purpose/ca/serial
-- test/fixture/purpose/ca/newcerts/2_cert.pem
-- test/fixture/purpose/ca/newcerts/3_cert.pem
-- test/fixture/purpose/ca/newcerts/4_cert.pem
-- test/fixture/purpose/ca/private/cakeypair.pem
-- test/fixture/purpose/scripts/gen_cert.rb
-- test/fixture/purpose/scripts/gen_csr.rb
-- test/fixture/purpose/scripts/init_ca.rb
-- test/fixture/purpose/sslclient/csr.pem
-- test/fixture/purpose/sslclient/keypair.pem
-- test/fixture/purpose/sslclient/sslclient.pem
-- test/fixture/purpose/sslserver/csr.pem
-- test/fixture/purpose/sslserver/keypair.pem
-- test/fixture/purpose/sslserver/sslserver.pem
 - test/java/pkcs7_mime_enveloped.message
 - test/java/pkcs7_mime_signed.message
 - test/java/pkcs7_multipart_signed.message
@@ -194,12 +94,8 @@ files:
 - test/java/test_java_mime.rb
 - test/java/test_java_pkcs7.rb
 - test/java/test_java_smime.rb
-- test/ref/a.out
-- test/ref/compile.rb
-- test/ref/pkcs1
-- test/ref/pkcs1.c
-- test/ruby/envutil.rb
-- test/ruby/ut_eof.rb
+- test/test_java.rb
+- test/ut_eof.rb
 - .gemtest
 homepage: https://github.com/jruby/jruby-ossl
 licenses: []
@@ -218,10 +114,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - !binary |-
-      Pg==
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: !binary |-
+        MA==
   none: false
 requirements: []
 rubyforge_project: jruby-extras
@@ -229,6 +125,4 @@ rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: OpenSSL add-on for JRuby
-test_files:
-- !binary |-
-  dGVzdC90ZXN0X2FsbC5yYg==
+test_files: []

data/test/1.8/ssl_server.rb

@@ -1,99 +0,0 @@
-require "socket"
-require "thread"
-require "openssl"
-require File.join(File.dirname(__FILE__), "utils.rb")
-
-def get_pem(io=$stdin)
-  buf = ""
-  while line = io.gets
-    if /^-----BEGIN / =~ line
-      buf << line
-      break
-    end
-  end
-  while line = io.gets
-    buf << line
-    if /^-----END / =~ line
-      break
-    end
-  end
-  return buf
-end
-
-def make_key(pem)
-  begin
-    return OpenSSL::PKey::RSA.new(pem)
-  rescue
-    return OpenSSL::PKey::DSA.new(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)
-start_immediately = (/yes/ =~ ARGV.shift)
-
-store = OpenSSL::X509::Store.new
-store.add_cert(ca_cert)
-store.purpose = OpenSSL::X509::PURPOSE_SSL_CLIENT
-ctx = OpenSSL::SSL::SSLContext.new
-ctx.cert_store = store
-#ctx.extra_chain_cert = [ ca_cert ]
-ctx.cert = ssl_cert
-ctx.key = ssl_key
-ctx.verify_mode = verify_mode
-
-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
-  rescue Errno::EADDRINUSE
-    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
-
-loop do
-  ssl = ssls.accept rescue next
-  Thread.start{
-    q = Queue.new
-    th = Thread.start{ ssl.write(q.shift) while true }
-    while line = ssl.gets
-      if line =~ /^STARTTLS$/
-        ssl.accept
-        next
-      end
-      q.push(line)
-    end
-    th.kill if q.empty?
-    ssl.close
-  }
-end
-rescue
-  log $!
-  log $!.backtrace.join("\n")
-end