jruby-openssl 0.8.2 → 0.8.4

data/License.txt

@@ -1,6 +1,6 @@
 JRuby-OpenSSL is distributed under the same license as JRuby (http://www.jruby.org/).
 
-Version: CPL 1.0/GPL 2.0/LGPL 2.1
+Version: EPL 1.0/GPL 2.0/LGPL 2.1
 
 The contents of this file are subject to the Common Public
 License Version 1.0 (the "License"); you may not use this file
@@ -20,11 +20,11 @@ or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
 in which case the provisions of the GPL or the LGPL are applicable instead
 of those above. If you wish to allow use of your version of this file only
 under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the CPL, indicate your
+use your version of this file under the terms of the EPL, indicate your
 decision by deleting the provisions above and replace them with the notice
 and other provisions required by the GPL or the LGPL. If you do not delete
 the provisions above, a recipient may use your version of this file under
-the terms of any one of the CPL, the GPL or the LGPL.
+the terms of any one of the EPL, the GPL or the LGPL.
 
 JRuby-OpenSSL includes software by the Legion of the Bouncy Castle
 (http://bouncycastle.org/license.html).

data/Rakefile

@@ -1,8 +1,11 @@
 require 'rake'
 require 'rake/testtask'
+load File.dirname(__FILE__) + "/lib/shared/jopenssl/version.rb"
 
-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"]
+JOPENSSL_JAR  = 'lib/shared/jopenssl.jar'
+GEM_FILE      = "pkg/jruby-openssl-#{Jopenssl::Version::VERSION}.gem"
+GEM_SPEC_FILE = 'jruby-openssl.gemspec'
 
 task :default => [:java_compile, :test]
 
@@ -21,8 +24,8 @@ def java_classpath_arg # myriad of ways to discover JRuby classpath
   jruby_cpath ? "-cp \"#{jruby_cpath.gsub('\\', '/')}#{File::PATH_SEPARATOR}#{bc_jars}\"" : "-cp \"#{bc_jars}\""
 end
 
-desc "Compile the native Java code."
-task :java_compile do
+desc "Compile the native Java code and create the jopenssl jar file."
+task file JOPENSSL_JAR do
   mkdir_p "pkg/classes"
 
   File.open("pkg/compile_options", "w") do |f|
@@ -38,51 +41,18 @@ task :java_compile do
   end
 
   sh "javac @pkg/compile_options @pkg/compile_classpath @pkg/compile_sourcefiles"
-  sh "jar cf ../../lib/ruby/shared/jopenssl.jar -C pkg/classes/ ."
+  sh "jar cf #{JOPENSSL_JAR} -C pkg/classes/ ."
+  FileUtils.cp JOPENSSL_JAR, '../../lib/ruby/shared/jopenssl.jar'
 end
-file "lib/shared/jopenssl.jar" => :java_compile
 
 task :more_clean do
-  rm_f FileList['lib/shared/jopenssl.jar']
+  rm_f FileList[JOPENSSL_JAR]
 end
 task :clean => :more_clean
 
-File.open("Manifest.txt", "w") {|f| MANIFEST.each {|n| f.puts n } }
-
-begin
-  # easiest way to configure ruby_flags for Hoe.
-  ENV['RUBY_FLAGS'] ||= [
-    (RUBY_VERSION >= '1.9.0' ? '--1.9' : '--1.8'),
-    '-w',
-    '-I../../build_lib:lib/shared:lib:test',
-    '-J-ea',
-    ENV['RUBY_DEBUG']
-  ].compact.join(' ')
-  require 'hoe'
-  Hoe.plugin :gemcutter
-  hoe = Hoe.spec("jruby-openssl") do |p|
-    load File.dirname(__FILE__) + "/lib/shared/jopenssl/version.rb"
-    p.version = Jopenssl::Version::VERSION
-    p.rubyforge_name = "jruby-extras"
-    p.urls = ["https://github.com/jruby/jruby-ossl"]
-    p.author = "Ola Bini and JRuby contributors"
-    p.email = "ola.bini@gmail.com"
-    p.summary = "OpenSSL add-on for JRuby"
-    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', '>= 1.5.0146.1']
-  end
-  hoe.spec.dependencies.delete_if { |dep| dep.name == "hoe" }
-  # Either lib/1.8 or lib/1.9 is added to $LOAD_PATH dynamically.
-  hoe.spec.require_paths = ['lib/shared']
-
-  task :gemspec do
-    File.open("#{hoe.name}.gemspec", "w") {|f| f << hoe.spec.to_ruby }
-  end
-  task :package => :gemspec
-rescue LoadError
-  puts "You really need Hoe installed to be able to package this gem"
-rescue => e
-  puts "ignoring error while loading hoe: #{e.to_s}"
+file GEM_FILE => [GEM_SPEC_FILE, JOPENSSL_JAR] do
+  puts "Generating #{GEM_FILE}"
+  `gem build #{GEM_SPEC_FILE}`
+  FileUtils.mv "jruby-openssl-#{Jopenssl::Version::VERSION}.gem", GEM_FILE
 end
+task :package => GEM_FILE

data/TODO-1_9-support.txt

@@ -0,0 +1,23 @@
+TODO for 1.9 support
+
+* Implement some mehotds properly
+  * ASN1 (fix lots of failing tests)
+  * OpenSSL::ASN1::ObjectId.new for SHA-2 ids such as SHA224
+  * X509Name#cmp
+  * ASN.1 handling
+
+* Implement some methods
+  * PKey.read
+  * PKey::DH#public_key
+  * SSLSocket#sysread_nonblock
+  * SSLSocket#syswrite_nonblock
+  * OCSP
+  * config file
+  * SSLSocket#client_ca - can we get CertificateRequest* in ServerHello?
+  * SSL::Session - can we?
+  * @crlDisPts of tX509Extension
+
+* Fixes needed for JRuby
+  * Implement BasicSocket#connect_address for test_pair.rb
+  * Stop Socket#accept by Socket#shutdown, not by Socket#close
+  * busy loop for SSLSocket#read_nonblock (and revert net/protocol.rb)

data/lib/shared/jopenssl/version.rb

@@ -1,5 +1,5 @@
 module Jopenssl
   module Version
-    VERSION = "0.8.2"
+    VERSION = "0.8.4"
   end
 end

data/test/java/test_java_pkcs7.rb

@@ -385,8 +385,8 @@ module PKCS7Test
 
     def create_signer_info_with_algo(algo)
       md5 = AlgorithmIdentifier.new(ASN1Registry.nid2obj(4))
-      SignerInfoWithPkey.new(DERInteger.new(BigInteger::ONE), 
-                     IssuerAndSerialNumber.new(X509Name.new("C=SE"), DERInteger.new(BigInteger::ONE)), 
+      SignerInfoWithPkey.new(ASN1Integer.new(BigInteger::ONE), 
+                     IssuerAndSerialNumber.new(X500Name.new("C=SE"), BigInteger::ONE), 
                      algo, 
                      DERSet.new, 
                      md5, 

data/test/test_java.rb

@@ -44,10 +44,10 @@ if defined?(JRUBY_VERSION)
     BigInteger = java.math.BigInteger unless defined?(BigInteger)
     Cipher = javax.crypto.Cipher unless defined?(Cipher)
 
-    DERInteger = org.bouncycastle.asn1.DERInteger
+    ASN1Integer = org.bouncycastle.asn1.ASN1Integer
     DERSet = org.bouncycastle.asn1.DERSet
     DEROctetString = org.bouncycastle.asn1.DEROctetString 
-    X509Name = org.bouncycastle.asn1.x509.X509Name
+    X500Name = org.bouncycastle.asn1.x500.X500Name
     
     
     MimeEnvelopedString = File::read(File.join(File.dirname(__FILE__), 'java', 'pkcs7_mime_enveloped.message'))

metadata

@@ -2,14 +2,15 @@
 name: jruby-openssl
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.8.2
+  version: 0.8.4
 platform: ruby
 authors:
-- Ola Bini and JRuby contributors
+- Ola Bini
+- JRuby contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bouncy-castle-java
@@ -17,48 +18,27 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0146.1
+        version: 1.5.0147
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0146.1
+        version: 1.5.0147
     none: false
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.10'
-    none: false
-  prerelease: false
-  type: :development
 description: JRuby-OpenSSL is an add-on gem for JRuby that emulates the Ruby OpenSSL native library.
 email: ola.bini@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- History.txt
-- Manifest.txt
-- README.txt
-- License.txt
+extra_rdoc_files: []
 files:
-- Rakefile
 - History.txt
-- Manifest.txt
-- README.txt
 - License.txt
-- lib/shared/jopenssl.jar
+- README.txt
+- Rakefile
+- TODO-1_9-support.txt
 - lib/1.8/openssl.rb
 - lib/1.8/openssl/bn.rb
 - lib/1.8/openssl/buffering.rb
@@ -80,7 +60,6 @@ files:
 - lib/1.9/openssl/ssl.rb
 - lib/1.9/openssl/x509-internal.rb
 - lib/1.9/openssl/x509.rb
-- lib/ruby/shared/jopenssl.jar
 - lib/shared/jruby-openssl.rb
 - lib/shared/openssl.rb
 - lib/shared/jopenssl/version.rb
@@ -95,13 +74,10 @@ files:
 - test/java/test_java_mime.rb
 - test/java/test_java_pkcs7.rb
 - test/java/test_java_smime.rb
-- ".gemtest"
-homepage: https://github.com/jruby/jruby-ossl
+homepage: https://github.com/jruby/jruby
 licenses: []
 post_install_message:
-rdoc_options:
-- "--main"
-- README.txt
+rdoc_options: []
 require_paths:
 - lib/shared
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -119,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
         MA==
   none: false
 requirements: []
-rubyforge_project: jruby-extras
+rubyforge_project: jruby/jruby
 rubygems_version: 1.8.24
 signing_key:
 specification_version: 3

data/Manifest.txt

@@ -1,53 +0,0 @@
-Rakefile
-History.txt
-Manifest.txt
-README.txt
-License.txt
-lib/shared/jopenssl.jar
-lib/1.8
-lib/1.9
-lib/ruby
-lib/shared
-lib/1.8/openssl
-lib/1.8/openssl.rb
-lib/1.8/openssl/bn.rb
-lib/1.8/openssl/buffering.rb
-lib/1.8/openssl/cipher.rb
-lib/1.8/openssl/config.rb
-lib/1.8/openssl/digest.rb
-lib/1.8/openssl/pkcs7.rb
-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/openssl
-lib/1.9/openssl.rb
-lib/1.9/openssl/bn.rb
-lib/1.9/openssl/buffering.rb
-lib/1.9/openssl/cipher.rb
-lib/1.9/openssl/config.rb
-lib/1.9/openssl/digest.rb
-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/ruby/shared
-lib/ruby/shared/jopenssl.jar
-lib/shared/jopenssl
-lib/shared/jopenssl.jar
-lib/shared/jruby-openssl.rb
-lib/shared/openssl
-lib/shared/openssl.rb
-lib/shared/jopenssl/version.rb
-lib/shared/openssl/pkcs12.rb
-test/java
-test/test_java.rb
-test/ut_eof.rb
-test/java/pkcs7_mime_enveloped.message
-test/java/pkcs7_mime_signed.message
-test/java/pkcs7_multipart_signed.message
-test/java/test_java_attribute.rb
-test/java/test_java_bio.rb
-test/java/test_java_mime.rb
-test/java/test_java_pkcs7.rb
-test/java/test_java_smime.rb