load OpenSSL::Config lazily (also) - not much use for it in JOpenSSL

Author: kares

lib/jopenssl/load.rb

@@ -42,5 +42,6 @@
 end
 
 module OpenSSL
+  autoload :Config, 'openssl/config' unless const_defined?(:Config, false)
   autoload :PKCS12, 'openssl/pkcs12'
 end

lib/jopenssl23/openssl.rb

@@ -13,7 +13,7 @@
 require 'openssl/bn'
 require 'openssl/pkey'
 require 'openssl/cipher'
-require 'openssl/config'
+require 'openssl/config' if OpenSSL.const_defined?(:Config, false)
 require 'openssl/digest'
 require 'openssl/x509'
 require 'openssl/ssl'

lib/openssl/config.rb

@@ -6,4 +6,12 @@
   load "jopenssl21/openssl/#{File.basename(__FILE__)}"
 else
   load "jopenssl19/openssl/#{File.basename(__FILE__)}"
-end
+end
+
+# @note moved from JOpenSSL native bits.
+module OpenSSL
+  class Config
+    DEFAULT_CONFIG_FILE = nil
+  end
+  class ConfigError < OpenSSLError; end
+end

src/main/java/org/jruby/ext/openssl/Config.java

@@ -35,6 +35,7 @@
  * OpenSSL::Config (native parts)
  * @author <a href="mailto:ola.bini@ki.se">Ola Bini</a>
  */
+@Deprecated // move to .rb (for now) as its now lazy loaded ...
 public class Config {
     // TODO: we cannot detect OS's default config file. ignore?
     // public static final String DEFAULT_CONFIG_FILE = "./openssl.cnf";

src/main/java/org/jruby/ext/openssl/OpenSSL.java

@@ -66,7 +66,7 @@ public static void createOpenSSL(final Ruby runtime) {
         final String warn = SafePropertyAccessor.getProperty("jruby.openssl.warn");
         if ( warn != null ) OpenSSL.warn = Boolean.parseBoolean(warn);
 
-        Config.createConfig(runtime, _OpenSSL);
+        // Config.createConfig(runtime, _OpenSSL);
         ExtConfig.create(runtime, _OpenSSL);
         PKey.createPKey(runtime, _OpenSSL);
         BN.createBN(runtime, _OpenSSL);