Title: [834] trunk/jopenssl/src/java/org/jruby/ext/openssl/OpenSSLReal.java: - Temporarily adding the provider with addProvider seems to work...?
Revision
834
Author
nicksieger
Date
2007-12-12 23:14:46 -0500 (Wed, 12 Dec 2007)

Log Message

- Temporarily adding the provider with addProvider seems to work...?
- Inserting at an arbitrary location seems to break on some platforms

Modified Paths

Diff

Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/OpenSSLReal.java (833 => 834)


--- trunk/jopenssl/src/java/org/jruby/ext/openssl/OpenSSLReal.java	2007-12-12 23:03:22 UTC (rev 833)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/OpenSSLReal.java	2007-12-13 04:14:46 UTC (rev 834)
@@ -52,7 +52,7 @@
         if (PROVIDER != null) {
             synchronized (java.security.Security.class) {
                 try {
-                    java.security.Security.insertProviderAt(PROVIDER, 2);
+                    java.security.Security.addProvider(PROVIDER);
                     return toRun.call();
                 } finally {
                     java.security.Security.removeProvider("BC");
@@ -66,9 +66,10 @@
     public static void createOpenSSL(Ruby runtime) {
         if (PROVIDER == null) {
             try {
-                PROVIDER = (java.security.Provider) Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider").newInstance();
+                PROVIDER = (java.security.Provider) 
+                        Class.forName("org.bouncycastle.jce.provider.BouncyCastleProvider").newInstance();
             } catch (Exception exception) {
-            // no bouncy castle available
+                // no bouncy castle available
             }
         }
 
@@ -100,7 +101,7 @@
         }
 
         ossl.setConstant("VERSION", runtime.newString("1.0.0"));
-        ossl.setConstant("OPENSSL_VERSION", runtime.newString("OpenSSL 0.9.8b 04 May 2006 (Java fake)"));
+        ossl.setConstant("OPENSSL_VERSION", runtime.newString("OpenSSL 0.9.8b 04 May 2006 (JRuby-OpenSSL fake)"));
 
         try {
             java.security.MessageDigest.getInstance("SHA224", PROVIDER);
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel

Reply via email to