jruby-openssl 0.7.4 → 0.7.6.1

data/History.txt

@@ -1,6 +1,28 @@
+== 0.7.6
+
+This release includes initial implementation of PKCS12 by Owen Ou.
+
+ - JRUBY-5066: Implement OpenSSL::PKCS12 (only for simple case)
+ - JRUBY-6385: Assertion failure with -J-ea
+
+== 0.7.5
+
+This release improved 1.9 mode support with help of
+Duncan Mak <duncan@earthaid.net>.  Now jruby-ossl gem includes both 1.8 and 1.9
+libraries and part of features should work fine on 1.9 mode, too.
+
+- JRUBY-6270: Wrong keyUsage check for SSL server
+- JRUBY-6260: OpenSSL::ASN1::Integer#value incompatibility
+- JRUBY-6044: Improve Ecrypted RSA/DSA pem support
+- JRUBY-5972: Allow to load/dump empty PKCS7 data
+- JRUBY-5834: Fix X509Name handling; X509Name RDN can include multiple elements
+- JRUBY-5362: Improved 1.9 support
+- JRUBY-4992: Warn if loaded by non JRuby interpreter
+
 == 0.7.4
 
-- JRUBY-5519: Avoid String encoding dependency in DER loading. PEM loading failed on JRuby 1.6.x. Fixed.
+- JRUBY-5519: Avoid String encoding dependency in DER loading. PEM loading
+  failed on JRuby 1.6.x. Fixed.
 - JRUBY-5510: Add debug information to released jar
 - JRUBY-5478: Update bouncycastle jars to the latest version. (1.46)
 
@@ -59,18 +81,22 @@
 -- JRUBY-4342: Follow ruby-openssl of CRuby 1.8.7.
 -- JRUBY-4346: Sync tests with tests for ruby-openssl of CRuby 1.8.7.
 -- JRUBY-4444: OpenSSL crash running RubyGems tests
--- JRUBY-4075: Net::SSH gives OpenSSL::Cipher::CipherError "No message available"
+-- JRUBY-4075: Net::SSH gives OpenSSL::Cipher::CipherError "No message
+   available"
 -- JRUBY-4076: Net::SSH padding error using 3des-cbc on Solaris
 -- JRUBY-4541: jruby-openssl doesn't load on App Engine.
 -- JRUBY-4077: Net::SSH "all authorization methods failed" Solaris -> Solaris
 -- JRUBY-4535: Issues with the BouncyCastle provider
 -- JRUBY-4510: JRuby-OpenSSL crashes when JCE fails a initialise bcprov
--- JRUBY-4343: Update BouncyCastle jar to upstream version; jdk14-139 -> jdk15-144
+-- JRUBY-4343: Update BouncyCastle jar to upstream version; jdk14-139 ->
+   jdk15-144
 - Cipher issues
--- JRUBY-4012: Initialization vector length handled differently than in MRI (longer IV sequence are trimmed to fit the required)
+-- JRUBY-4012: Initialization vector length handled differently than in MRI
+   (longer IV sequence are trimmed to fit the required)
 -- JRUBY-4473: Implemented DSA key generation
 -- JRUBY-4472: Cipher does not support RC4 and CAST
--- JRUBY-4577: InvalidParameterException 'Wrong keysize: must be equal to 112 or 168' for DES3 + SunJCE
+-- JRUBY-4577: InvalidParameterException 'Wrong keysize: must be equal to 112 or
+   168' for DES3 + SunJCE
 - SSL and X.509(PKIX) issues
 -- JRUBY-4384: TCP socket connection causes busy loop of SSL server
 -- JRUBY-4370: Implement SSLContext#ciphers
@@ -80,16 +106,23 @@
 -- JRUBY-4684: SSLContext#verify_depth is ignored
 -- JRUBY-4398: SSLContext#options does not affect to SSL sessions
 -- JRUBY-4360: Implement SSLSocket#verify_result and dependents
--- JRUBY-3829: SSLSocket#read should clear given buffer before concatenating (ByteBuffer.java:328:in `allocate': java.lang.IllegalArgumentException when returning SOAP queries over a certain size)
--- JRUBY-4686: SSLSocket can drop last chunk of data just before inbound channel close
+-- JRUBY-3829: SSLSocket#read should clear given buffer before concatenating
+   (ByteBuffer.java:328:in `allocate': java.lang.IllegalArgumentException when
+   returning SOAP queries over a certain size) 
+-- JRUBY-4686: SSLSocket can drop last chunk of data just before inbound channel
+   close
 -- JRUBY-4369: X509Store#verify_callback is not called
--- JRUBY-4409: OpenSSL::X509::Store#add_file corrupts when it includes certificates which have the same subject (problem with ruby-openid-apps-discovery (github jruby-openssl issue #2))
+-- JRUBY-4409: OpenSSL::X509::Store#add_file corrupts when it includes
+   certificates which have the same subject (problem with
+   ruby-openid-apps-discovery (github jruby-openssl issue #2))
 -- JRUBY-4333: PKCS#8 formatted privkey read
 -- JRUBY-4454: Loading Key file as a Certificate causes NPE
--- JRUBY-4455: calling X509::Certificate#sign for the Certificate initialized from PEM causes IllegalStateException
+-- JRUBY-4455: calling X509::Certificate#sign for the Certificate initialized
+   from PEM causes IllegalStateException 
 - PKCS#7 issues
 -- JRUBY-4379: PKCS7#sign failed for DES3 cipher algorithm
--- JRUBY-4428: Allow to use DES-EDE3-CBC in PKCS#7 w/o the Policy Files (rake test doesn't finish on JDK5 w/o policy files update)
+-- JRUBY-4428: Allow to use DES-EDE3-CBC in PKCS#7 w/o the Policy Files (rake
+   test doesn't finish on JDK5 w/o policy files update) 
 -  Misc
 -- JRUBY-4574: jruby-openssl deprecation warning cleanup
 -- JRUBY-4591: jruby-1.4 support
@@ -132,21 +165,25 @@
 
 == 0.5.1
 
-* Multiple fixes by Brice Figureau to get net/ssh working. Requires JRuby 1.3.1 to be 100%
+* Multiple fixes by Brice Figureau to get net/ssh working. Requires JRuby 1.3.1
+  to be 100%
 * Fix by Frederic Jean for a character-decoding issue for some certificates
 
 == 0.5
 
 * Fixed JRUBY-3614: Unsupported HMAC algorithm (HMACSHA-256)
-* Fixed JRUBY-3570: ActiveMerchant's AuthorizeNet Gateway throws OpenSSL Cert Validation Error, when there should be no error
+* Fixed JRUBY-3570: ActiveMerchant's AuthorizeNet Gateway throws OpenSSL Cert
+  Validation Error, when there should be no error
 * Fixed JRUBY-3557 Class cast exception in PKeyRSA.java
 * Fixed JRUBY-3468 X.509 certificates: subjectKeyIdentifier corrupted
-* Fixed JRUBY-3285 Unsupported HMAC algorithm (HMACSHA1) error when generating digest
+* Fixed JRUBY-3285 Unsupported HMAC algorithm (HMACSHA1) error when generating
+  digest
 * Misc code cleanup
 
 == 0.2
 
-- Enable remaining tests; fix a nil string issue in SSLSocket.sysread (JRUBY-1888)
+- 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)

data/Manifest.txt

@@ -3,113 +3,170 @@ History.txt
 Manifest.txt
 README.txt
 License.txt
-lib/jopenssl.jar
-lib/openssl
-lib/jopenssl
-lib/jopenssl.jar
-lib/openssl.rb
-lib/openssl/dummy.rb
-lib/openssl/dummyssl.rb
-lib/openssl/config.rb
-lib/openssl/cipher.rb
-lib/openssl/ssl.rb
-lib/openssl/bn.rb
-lib/openssl/x509.rb
-lib/openssl/digest.rb
-lib/openssl/buffering.rb
-lib/openssl/pkcs7.rb
-lib/jopenssl/version.rb
-test/test_imaps.rb
+lib/shared/jopenssl.jar
+lib/1.9
+lib/shared
+lib/1.8
+lib/1.9/openssl.rb
+lib/1.9/openssl
+lib/1.9/openssl/bn.rb
+lib/1.9/openssl/x509-internal.rb
+lib/1.9/openssl/cipher.rb
+lib/1.9/openssl/digest.rb
+lib/1.9/openssl/ssl.rb
+lib/1.9/openssl/buffering.rb
+lib/1.9/openssl/ssl-internal.rb
+lib/1.9/openssl/x509.rb
+lib/1.9/openssl/config.rb
+lib/shared/jopenssl.jar
+lib/shared/openssl.rb
+lib/shared/openssl
+lib/shared/jopenssl
+lib/shared/openssl/dummyssl.rb
+lib/shared/openssl/ssl.rb
+lib/shared/openssl/pkcs12.rb
+lib/shared/openssl/x509.rb
+lib/shared/openssl/dummy.rb
+lib/shared/jopenssl/version.rb
+lib/1.8/openssl.rb
+lib/1.8/openssl
+lib/1.8/openssl/bn.rb
+lib/1.8/openssl/pkcs7.rb
+lib/1.8/openssl/x509-internal.rb
+lib/1.8/openssl/cipher.rb
+lib/1.8/openssl/digest.rb
+lib/1.8/openssl/ssl.rb
+lib/1.8/openssl/buffering.rb
+lib/1.8/openssl/ssl-internal.rb
+lib/1.8/openssl/x509.rb
+lib/1.8/openssl/config.rb
+test/1.9
+test/ref
 test/test_all.rb
+test/test_pkey_dsa.rb
+test/fixture
 test/test_integration.rb
-test/ut_eof.rb
-test/openssl
-test/test_java.rb
+test/ruby
+test/test_ssl.rb
+test/test_parse_certificate.rb
 test/test_openssl.rb
-test/test_pkey.rb
-test/ref
-test/test_cipher.rb
 test/cert_with_ec_pk.cer
-test/fixture
-test/test_pkcs7.rb
+test/java
+test/ut_eof.rb
 test/test_x509store.rb
+test/test_imaps.rb
 test/test_certificate.rb
-test/test_parse_certificate.rb
-test/test_ssl.rb
-test/java
-test/openssl/test_x509name.rb
-test/openssl/test_ns_spki.rb
-test/openssl/test_x509cert.rb
-test/openssl/ssl_server.rb
-test/openssl/test_pair.rb
-test/openssl/test_ec.rb
-test/openssl/test_config.rb
-test/openssl/utils.rb
-test/openssl/test_x509req.rb
-test/openssl/test_cipher.rb
-test/openssl/test_digest.rb
-test/openssl/test_x509ext.rb
-test/openssl/test_asn1.rb
-test/openssl/test_pkcs7.rb
-test/openssl/test_x509store.rb
-test/openssl/test_pkey_rsa.rb
-test/openssl/test_ssl.rb
-test/openssl/test_x509crl.rb
-test/openssl/test_hmac.rb
-test/ref/compile.rb
+test/test_pkcs7.rb
+test/test_cipher.rb
+test/1.8
+test/test_pkey_rsa.rb
+test/test_java.rb
+test/1.9/test_ssl_session.rb
+test/1.9/test_engine.rb
+test/1.9/test_asn1.rb
+test/1.9/test_pkey_dh.rb
+test/1.9/test_pkey_dsa.rb
+test/1.9/test_ocsp.rb
+test/1.9/ssl_server.rb
+test/1.9/test_x509ext.rb
+test/1.9/utils.rb
+test/1.9/test_ssl.rb
+test/1.9/test_buffering.rb
+test/1.9/test_ns_spki.rb
+test/1.9/test_digest.rb
+test/1.9/test_pair.rb
+test/1.9/test_x509crl.rb
+test/1.9/test_x509store.rb
+test/1.9/test_bn.rb
+test/1.9/test_pkey_ec.rb
+test/1.9/test_pkcs7.rb
+test/1.9/test_pkcs12.rb
+test/1.9/test_cipher.rb
+test/1.9/test_pkey_rsa.rb
+test/1.9/test_x509req.rb
+test/1.9/test_x509name.rb
+test/1.9/test_hmac.rb
+test/1.9/test_x509cert.rb
+test/1.9/test_config.rb
 test/ref/a.out
 test/ref/pkcs1
 test/ref/pkcs1.c
-test/fixture/cacert.pem
-test/fixture/ca-bundle.crt
+test/ref/compile.rb
 test/fixture/common.pem
+test/fixture/ca_path
 test/fixture/key_then_cert.pem
+test/fixture/imaps
+test/fixture/keypair.pem
+test/fixture/cacert.pem
 test/fixture/verisign.pem
+test/fixture/purpose
 test/fixture/cert_localhost.pem
-test/fixture/localhost_keypair.pem
-test/fixture/verisign_c3.pem
 test/fixture/selfcert.pem
 test/fixture/max.pem
-test/fixture/keypair.pem
-test/fixture/purpose
-test/fixture/imaps
-test/fixture/ca_path
-test/fixture/purpose/cacert.pem
-test/fixture/purpose/sslclient
-test/fixture/purpose/b70a5bc1.0
+test/fixture/localhost_keypair.pem
+test/fixture/ids_in_subject_rdn_set.pem
+test/fixture/ca-bundle.crt
+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/ca
-test/fixture/purpose/sslclient.pem
-test/fixture/purpose/sslserver.pem
+test/fixture/purpose/sslclient
 test/fixture/purpose/scripts
+test/fixture/purpose/sslserver_no_dsig_in_keyUsage.pem
+test/fixture/purpose/cacert.pem
 test/fixture/purpose/sslserver
-test/fixture/purpose/sslclient/sslclient.pem
-test/fixture/purpose/sslclient/csr.pem
-test/fixture/purpose/sslclient/keypair.pem
-test/fixture/purpose/ca/cacert.pem
-test/fixture/purpose/ca/newcerts
+test/fixture/purpose/sslserver.pem
+test/fixture/purpose/sslclient.pem
+test/fixture/purpose/b70a5bc1.0
+test/fixture/purpose/ca/serial
+test/fixture/purpose/ca/gen_cert.rb
 test/fixture/purpose/ca/PASSWD_OF_CA_KEY_IS_1234
 test/fixture/purpose/ca/ca_config.rb
-test/fixture/purpose/ca/serial
+test/fixture/purpose/ca/cacert.pem
 test/fixture/purpose/ca/private
-test/fixture/purpose/ca/newcerts/2_cert.pem
-test/fixture/purpose/ca/newcerts/3_cert.pem
+test/fixture/purpose/ca/newcerts
 test/fixture/purpose/ca/private/cakeypair.pem
+test/fixture/purpose/ca/newcerts/4_cert.pem
+test/fixture/purpose/ca/newcerts/3_cert.pem
+test/fixture/purpose/ca/newcerts/2_cert.pem
+test/fixture/purpose/sslclient/csr.pem
+test/fixture/purpose/sslclient/keypair.pem
+test/fixture/purpose/sslclient/sslclient.pem
 test/fixture/purpose/scripts/gen_cert.rb
 test/fixture/purpose/scripts/init_ca.rb
 test/fixture/purpose/scripts/gen_csr.rb
-test/fixture/purpose/sslserver/sslserver.pem
 test/fixture/purpose/sslserver/csr.pem
 test/fixture/purpose/sslserver/keypair.pem
-test/fixture/imaps/cacert.pem
-test/fixture/imaps/server.crt
-test/fixture/imaps/server.key
-test/fixture/ca_path/verisign.pem
-test/fixture/ca_path/72fa7371.0
+test/fixture/purpose/sslserver/sslserver.pem
+test/ruby/ut_eof.rb
+test/ruby/envutil.rb
 test/java/pkcs7_mime_enveloped.message
-test/java/pkcs7_mime_signed.message
+test/java/test_java_attribute.rb
 test/java/test_java_pkcs7.rb
-test/java/test_java_bio.rb
-test/java/pkcs7_multipart_signed.message
 test/java/test_java_mime.rb
-test/java/test_java_attribute.rb
+test/java/pkcs7_mime_signed.message
 test/java/test_java_smime.rb
+test/java/pkcs7_multipart_signed.message
+test/java/test_java_bio.rb
+test/1.8/test_asn1.rb
+test/1.8/ssl_server.rb
+test/1.8/test_x509ext.rb
+test/1.8/utils.rb
+test/1.8/test_ssl.rb
+test/1.8/test_ec.rb
+test/1.8/test_ns_spki.rb
+test/1.8/test_digest.rb
+test/1.8/test_pair.rb
+test/1.8/test_x509crl.rb
+test/1.8/test_x509store.rb
+test/1.8/test_pkcs7.rb
+test/1.8/test_cipher.rb
+test/1.8/test_pkey_rsa.rb
+test/1.8/test_x509req.rb
+test/1.8/test_x509name.rb
+test/1.8/test_hmac.rb
+test/1.8/test_x509cert.rb
+test/1.8/test_config.rb

data/README.txt

@@ -1,6 +1,6 @@
 = JRuby-OpenSSL
 
-* http://jruby-extras.rubyforge.org/jruby-openssl
+* https://github.com/jruby/jruby-ossl
 
 == DESCRIPTION:
 

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rake/testtask'
 
-MANIFEST = FileList["Rakefile", "History.txt", "Manifest.txt", "README.txt", "License.txt", "lib/jopenssl.jar", "lib/**/*", "test/**/*"]
+MANIFEST = FileList["Rakefile", "History.txt", "Manifest.txt", "README.txt", "License.txt", "lib/shared/jopenssl.jar", "lib/**/*", "test/**/*"]
 BC_JARS = FileList["build_lib/bc*.jar"]
 
 task :default => [:java_compile, :test]
@@ -38,35 +38,44 @@ task :java_compile do
   end
 
   sh "javac @pkg/compile_options @pkg/compile_classpath @pkg/compile_sourcefiles"
-  sh "jar cf lib/jopenssl.jar -C pkg/classes/ ."
+  sh "jar cf lib/shared/jopenssl.jar -C pkg/classes/ ."
 end
-file "lib/jopenssl.jar" => :java_compile
+file "lib/shared/jopenssl.jar" => :java_compile
 
 task :more_clean do
-  rm_f FileList['lib/jopenssl.jar']
+  rm_f FileList['lib/shared/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',
+    '-Ibuild_lib:lib/shared:lib:test',
+    '-J-ea',
+    ENV['RUBY_DEBUG']
+  ].compact.join(' ')
   require 'hoe'
   Hoe.plugin :gemcutter
-  Hoe.add_include_dirs('build_lib')
   hoe = Hoe.spec("jruby-openssl") do |p|
-    load File.dirname(__FILE__) + "/lib/jopenssl/version.rb"
+    load File.dirname(__FILE__) + "/lib/shared/jopenssl/version.rb"
     p.version = Jopenssl::Version::VERSION
     p.rubyforge_name = "jruby-extras"
-    p.url = "http://jruby-extras.rubyforge.org/jruby-openssl"
+    p.url = "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', '>= 0']
+    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 }

data/lib/{openssl → 1.8/openssl}/bn.rb

@@ -11,7 +11,7 @@
   (See the file 'LICENCE'.)
 
 = Version
-  $Id: bn.rb 11708 2007-02-12 23:01:19Z shyouhei $
+  $Id: bn.rb 31657 2011-05-20 22:25:35Z shyouhei $
 =end
 
 ##
@@ -29,7 +29,7 @@ end # OpenSSL
 #
 class Integer
   def to_bn
-    OpenSSL::BN::new(self)
+    OpenSSL::BN::new(self.to_s(16), 16)
   end
 end # Integer
 

data/lib/{openssl → 1.8/openssl}/buffering.rb

@@ -11,9 +11,10 @@
   (See the file 'LICENCE'.)
 
 = Version
-  $Id: buffering.rb 13706 2007-10-15 08:29:08Z usa $
+  $Id: buffering.rb 28004 2010-05-24 23:58:49Z shyouhei $
 =end
 
+module OpenSSL
 module Buffering
   include Enumerable
   attr_accessor :sync
@@ -237,3 +238,4 @@ module Buffering
     sysclose
   end
 end
+end

data/lib/{openssl → 1.8/openssl}/config.rb

@@ -284,7 +284,7 @@ module OpenSSL
     def each
       @data.each do |section, hash|
         hash.each do |key, value|
-          yield [section, key, value]
+          yield(section, key, value)
         end
       end
     end

data/lib/{openssl → 1.8/openssl}/digest.rb

@@ -11,7 +11,7 @@
   (See the file 'LICENCE'.)
 
 = Version
-  $Id: digest.rb 15600 2008-02-25 08:48:57Z technorama $
+  $Id: digest.rb 28004 2010-05-24 23:58:49Z shyouhei $
 =end
 
 ##
@@ -40,7 +40,7 @@ module OpenSSL
           super(name, data.first)
         }
       }
-      singleton = (class <<klass; self; end)
+      singleton = (class << klass; self; end)
       singleton.class_eval{
         define_method(:digest){|data| Digest.digest(name, data) }
         define_method(:hexdigest){|data| Digest.hexdigest(name, data) }

data/lib/{openssl/ssl.rb → 1.8/openssl/ssl-internal.rb}

@@ -11,10 +11,9 @@
   (See the file 'LICENCE'.)
 
 = Version
-  $Id: ssl.rb 16193 2008-04-25 06:51:21Z knu $
+  $Id$
 =end
 
-require "openssl"
 require "openssl/buffering"
 require "fcntl"
 
@@ -36,6 +35,7 @@ module OpenSSL
 
       def set_params(params={})
         params = DEFAULT_PARAMS.merge(params)
+        # ssl_version need to be set at first.
         self.ssl_version = params.delete(:ssl_version)
         params.each{|name, value| self.__send__("#{name}=", value) }
         if self.verify_mode != OpenSSL::SSL::VERIFY_NONE

data/lib/1.8/openssl/ssl.rb

@@ -0,0 +1 @@
+require 'openssl'

data/lib/{openssl/x509.rb → 1.8/openssl/x509-internal.rb}

@@ -11,11 +11,9 @@
   (See the file 'LICENCE'.)
 
 = Version
-  $Id: x509.rb 11708 2007-02-12 23:01:19Z shyouhei $
+  $Id$
 =end
 
-require "openssl"
-
 module OpenSSL
   module X509
     class ExtensionFactory
@@ -28,7 +26,7 @@ module OpenSSL
       end
 
       def create_ext_from_array(ary)
-        raise ExtensionError, "unexpected array form" if ary.size > 3 
+        raise ExtensionError, "unexpected array form" if ary.size > 3
         create_ext(ary[0], ary[1], ary[2])
       end
 
@@ -38,12 +36,12 @@ module OpenSSL
         value.strip!
         create_ext(oid, value)
       end
-      
+
       def create_ext_from_hash(hash)
         create_ext(hash["oid"], hash["value"], hash["critical"])
       end
     end
-    
+
     class Extension
       def to_s # "oid = critical, value"
         str = self.oid
@@ -51,7 +49,7 @@ module OpenSSL
         str << "critical, " if self.critical?
         str << self.value.gsub(/\n/, ", ")
       end
-        
+
       def to_h # {"oid"=>sn|ln, "value"=>value, "critical"=>true|false}
         {"oid"=>self.oid,"value"=>self.value,"critical"=>self.critical?}
       end
@@ -82,7 +80,8 @@ module OpenSSL
 
         def expand_pair(str)
           return nil unless str
-          return str.gsub(Pair){|pair|
+          return str.gsub(Pair){
+            pair = $&
             case pair.size
             when 2 then pair[1,1]
             when 3 then Integer("0x#{pair[1,2]}").chr
@@ -93,7 +92,7 @@ module OpenSSL
 
         def expand_hexstring(str)
           return nil unless str
-          der = str.gsub(HexPair){|hex| Integer("0x#{hex}").chr }
+          der = str.gsub(HexPair){$&.to_i(16).chr }
           a1 = OpenSSL::ASN1.decode(der)
           return a1.value, a1.tag
         end

data/lib/1.8/openssl/x509.rb

@@ -0,0 +1 @@
+require 'openssl'

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

@@ -58,19 +58,10 @@ 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/config'
 require 'openssl/digest'
 require 'openssl/pkcs7'
-require 'openssl/ssl'
-require 'openssl/x509'
-
+require 'openssl/ssl-internal'
+require 'openssl/x509-internal'

data/lib/1.9/openssl/bn.rb

@@ -0,0 +1,35 @@
+#--
+#
+# $RCSfile$
+#
+# = Ruby-space definitions that completes C-space funcs for BN
+# 
+# = Info
+# 'OpenSSL for Ruby 2' project
+# Copyright (C) 2002  Michal Rokos <m.rokos@sh.cvut.cz>
+# All rights reserved.
+# 
+# = Licence
+# This program is licenced under the same licence as Ruby.
+# (See the file 'LICENCE'.)
+# 
+# = Version
+# $Id: bn.rb 33067 2011-08-25 00:52:10Z drbrain $
+#
+#++
+
+module OpenSSL
+  class BN
+    include Comparable
+  end # BN
+end # OpenSSL
+
+##
+# Add double dispatch to Integer
+#
+class Integer
+  def to_bn
+    OpenSSL::BN::new(self.to_s(16), 16)
+  end
+end # Integer
+