jruby-openssl 0.9.0 → 0.9.1

data/lib/{shared/jopenssl → jopenssl}/version.rb

@@ -1,5 +1,5 @@
 module Jopenssl
   module Version
-    VERSION = "0.9.0"
+    VERSION = "0.9.1"
   end
 end

data/lib/{1.9 → jopenssl19}/openssl.rb

@@ -20,3 +20,4 @@ require 'openssl/config'
 require 'openssl/digest'
 require 'openssl/ssl-internal'
 require 'openssl/x509-internal'
+require 'krypt/ossl'

data/lib/{shared/jruby-openssl.rb → jruby-openssl.rb}

@@ -1,3 +1,7 @@
+# This file allows older version of JRuby (prior to 1.7.5) to explicitly load
+# the gem version of jruby-openssl rather than the stdlib version. JRuby 1.7.5
+# and higher use the "default gems" capability of RubyGems.
+
 unless defined? JRUBY_VERSION
   warn 'Loading jruby-openssl in a non-JRuby interpreter'
 end
@@ -14,13 +18,10 @@ require 'jruby'
 require 'jopenssl.jar'
 org.jruby.ext.openssl.OSSLLibrary.new.load(JRuby.runtime, false)
 
-# Add version-appropriate library path to LOAD_PATH
 if RUBY_VERSION >= '1.9.0'
-  $LOAD_PATH.unshift(File.expand_path('../../1.9', __FILE__))
-  load(File.expand_path('../../1.9/openssl.rb', __FILE__))
+  load('jopenssl19/openssl.rb')
 else
-  $LOAD_PATH.unshift(File.expand_path('../../1.8', __FILE__))
-  load(File.expand_path('../../1.8/openssl.rb', __FILE__))
+  load('jopenssl18/openssl.rb')
 end
 
 require 'openssl/pkcs12'

data/lib/{shared/openssl.rb → openssl.rb}

@@ -14,13 +14,10 @@ require 'jruby'
 require 'jopenssl.jar'
 org.jruby.ext.openssl.OSSLLibrary.new.load(JRuby.runtime, false)
 
-# Add version-appropriate library path to LOAD_PATH
 if RUBY_VERSION >= '1.9.0'
-  $LOAD_PATH.unshift(File.expand_path('../../1.9', __FILE__))
-  load(File.expand_path('../../1.9/openssl.rb', __FILE__))
+  load('jopenssl19/openssl.rb')
 else
-  $LOAD_PATH.unshift(File.expand_path('../../1.8', __FILE__))
-  load(File.expand_path('../../1.8/openssl.rb', __FILE__))
+  load('jopenssl18/openssl.rb')
 end
 
 require 'openssl/pkcs12'

data/lib/openssl/bn.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/bn.rb')
+else
+  load('jopenssl18/openssl/bn.rb')
+end

data/lib/openssl/buffering.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/buffering.rb')
+else
+  load('jopenssl18/openssl/buffering.rb')
+end

data/lib/openssl/cipher.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/cipher.rb')
+else
+  load('jopenssl18/openssl/cipher.rb')
+end

data/lib/openssl/config.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/config.rb')
+else
+  load('jopenssl18/openssl/config.rb')
+end

data/lib/openssl/digest.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/digest.rb')
+else
+  load('jopenssl18/openssl/digest.rb')
+end

data/lib/openssl/pkcs7.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/pkcs7.rb')
+else
+  raise LoadError, "no such library in 1.8 mode: openssl/pkcs7"
+end

data/lib/openssl/ssl-internal.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/ssl-internal.rb')
+else
+  load('jopenssl18/openssl/ssl-internal.rb')
+end

data/lib/openssl/ssl.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/ssl.rb')
+else
+  load('jopenssl18/openssl/ssl.rb')
+end

data/lib/openssl/x509-internal.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/x509-internal.rb')
+else
+  load('jopenssl18/openssl/x509-internal.rb')
+end

data/lib/openssl/x509.rb

@@ -0,0 +1,5 @@
+if RUBY_VERSION >= '1.9.0'
+  load('jopenssl19/openssl/x509.rb')
+else
+  load('jopenssl18/openssl/x509.rb')
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-openssl
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease:
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bouncy-castle-java
@@ -72,32 +72,42 @@ files:
 - 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
-- 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.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/shared/jopenssl.jar
-- lib/shared/jruby-openssl.rb
-- lib/shared/openssl.rb
-- lib/shared/jopenssl/version.rb
-- lib/shared/openssl/pkcs12.rb
+- lib/jopenssl.jar
+- lib/jruby-openssl.rb
+- lib/openssl.rb
+- lib/jopenssl/version.rb
+- lib/jopenssl18/openssl.rb
+- lib/jopenssl18/openssl/bn.rb
+- lib/jopenssl18/openssl/buffering.rb
+- lib/jopenssl18/openssl/cipher.rb
+- lib/jopenssl18/openssl/config.rb
+- lib/jopenssl18/openssl/digest.rb
+- lib/jopenssl18/openssl/pkcs7.rb
+- lib/jopenssl18/openssl/ssl-internal.rb
+- lib/jopenssl18/openssl/ssl.rb
+- lib/jopenssl18/openssl/x509-internal.rb
+- lib/jopenssl18/openssl/x509.rb
+- lib/jopenssl19/openssl.rb
+- lib/jopenssl19/openssl/bn.rb
+- lib/jopenssl19/openssl/buffering.rb
+- lib/jopenssl19/openssl/cipher.rb
+- lib/jopenssl19/openssl/config.rb
+- lib/jopenssl19/openssl/digest.rb
+- lib/jopenssl19/openssl/ssl-internal.rb
+- lib/jopenssl19/openssl/ssl.rb
+- lib/jopenssl19/openssl/x509-internal.rb
+- lib/jopenssl19/openssl/x509.rb
+- lib/openssl/bn.rb
+- lib/openssl/buffering.rb
+- lib/openssl/cipher.rb
+- lib/openssl/config.rb
+- lib/openssl/digest.rb
+- lib/openssl/pkcs12.rb
+- lib/openssl/pkcs7.rb
+- lib/openssl/ssl-internal.rb
+- lib/openssl/ssl.rb
+- lib/openssl/x509-internal.rb
+- lib/openssl/x509.rb
 - test/test_java.rb
 - test/ut_eof.rb
 - test/java/pkcs7_mime_enveloped.message
@@ -113,7 +123,7 @@ licenses: []
 post_install_message:
 rdoc_options: []
 require_paths:
-- lib/shared
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='