jruby-openssl 0.8.0.pre1 → 0.8.0.pre2

data/Manifest.txt

@@ -35,14 +35,8 @@ lib/1.9/openssl/x509.rb
 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/dummy.rb
-lib/shared/openssl/dummyssl.rb
-lib/shared/openssl/pkcs12.rb
-lib/shared/openssl/ssl.rb
-lib/shared/openssl/x509.rb
 test/1.8
 test/1.9
 test/cert_with_ec_pk.cer

data/Rakefile

@@ -34,7 +34,7 @@ task :java_compile do
   end
 
   File.open("pkg/compile_sourcefiles", "w") do |f|
-    f << FileList['src/java/**/*.java'].join(' ')
+    f << FileList['src/org/jruby/ext/openssl/**/*.java'].join(' ')
   end
 
   sh "javac @pkg/compile_options @pkg/compile_classpath @pkg/compile_sourcefiles"

data/lib/shared/jopenssl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-openssl
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre1
+  version: 0.8.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -85,11 +85,6 @@ files:
 - lib/shared/jruby-openssl.rb
 - lib/shared/openssl.rb
 - lib/shared/jopenssl/version.rb
-- lib/shared/openssl/dummy.rb
-- lib/shared/openssl/dummyssl.rb
-- lib/shared/openssl/pkcs12.rb
-- lib/shared/openssl/ssl.rb
-- lib/shared/openssl/x509.rb
 - test/cert_with_ec_pk.cer
 - test/test_all.rb
 - test/test_certificate.rb

data/lib/shared/openssl/dummy.rb

@@ -1,33 +0,0 @@
-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
-    class ASN1Data; end
-    class Primitive; end
-    class Constructive; end
-  end
-  module X509
-    class Name; end
-    class Certificate; end
-    class Extension; end
-    class CRL; end
-    class Revoked; end
-    class Store
-      def set_default_paths; end
-    end
-    class Request; end
-    class Attribute; end
-  end
-  module Netscape
-    class SPKI; end
-  end
-  class PKCS7
-    # this definition causes TypeError "superclass mismatch for class PKCS7"
-    # MRI also crashes following definition;
-    #   class Foo; class Foo < Foo; end; end
-    #   class Foo; class Foo < Foo; end; end
-    #
-    # class PKCS7 < PKCS7; end
-  end
-end

data/lib/shared/openssl/dummyssl.rb

@@ -1,14 +0,0 @@
-warn "Warning: OpenSSL SSL implementation unavailable"
-warn "You must run on JDK 1.5 (Java 5) or higher to use SSL"
-module OpenSSL
-  module SSL
-    class SSLError < OpenSSLError; end
-    class SSLContext; end
-    class SSLSocket; end
-    VERIFY_NONE = 0
-    VERIFY_PEER = 1
-    VERIFY_FAIL_IF_NO_PEER_CERT = 2
-    VERIFY_CLIENT_ONCE = 4
-    OP_ALL = 0x00000FFF
-  end
-end

data/lib/shared/openssl/pkcs12.rb

@@ -1,50 +0,0 @@
-require 'java'
-
-module OpenSSL
-  class PKCS12
-    java_import java.io.StringReader
-    java_import java.io.StringBufferInputStream
-    java_import java.security.cert.CertificateFactory
-    java_import java.security.KeyStore
-    java_import java.io.ByteArrayOutputStream
-    java_import org.bouncycastle.openssl.PEMReader
-
-    java.security.Security.add_provider(org.bouncycastle.jce.provider.BouncyCastleProvider.new)
-
-    def self.create(pass, name, key, cert)
-      pkcs12 = self.new(pass, name, key, cert)
-      pkcs12.generate
-      pkcs12
-    end
-
-    attr_reader :key, :certificate
-
-    def initialize(pass, name, key, cert)
-      @pass = pass
-      @name = name
-      @key = key
-      @certificate = cert
-    end
-
-    def generate
-      key_reader = StringReader.new(key.to_pem)
-      key_pair = PEMReader.new(key_reader).read_object
-
-      cert_input_stream = StringBufferInputStream.new(certificate.to_pem)
-      certs = CertificateFactory.get_instance("X.509").generate_certificates(cert_input_stream)
-
-      store = KeyStore.get_instance("PKCS12", "BC")
-      store.load(nil, nil)
-      store.set_key_entry(@name, key_pair.get_private, nil, certs.to_array(Java::java.security.cert.Certificate[certs.size].new))
-
-      pkcs12_output_stream = ByteArrayOutputStream.new
-      store.store(pkcs12_output_stream, @pass.to_java.to_char_array)
-
-      @der = String.from_java_bytes(pkcs12_output_stream.to_byte_array)
-    end
-
-    def to_der
-      @der
-    end
-  end
-end

data/lib/shared/openssl/ssl.rb

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

data/lib/shared/openssl/x509.rb

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