commit 7d0ed36dc9b07dc16f309360373833f86a418c3e
author Kenny Root <kroot@google.com> Fri Mar 08 11:31:43 2013 -0800
committer Kenny Root <kroot@google.com> Tue Mar 12 16:19:43 2013 -0700
tree 0384ff903fbba7b65dd2e2c09427f542c5c98a65
parent 909c75864cee351044d5be6dcb21d8e01eded92e

Revert "Put DRLCertFactory as first provider"

OpenSSL provider now passes all the tests.

This reverts commit b01f3e895e3ae81bdf9c054ada18c503a2f01086.

luni/src/main/java/java/security/Security.java

diff --git a/luni/src/main/java/java/security/Security.java b/luni/src/main/java/java/security/Security.java
index 7294f69..b5bd02a 100644
--- a/luni/src/main/java/java/security/Security.java
+++ b/luni/src/main/java/java/security/Security.java
@@ -72,8 +72,8 @@
 
     // Register default providers
     private static void registerDefaultProviders() {
-        secprops.put("security.provider.1", "org.apache.harmony.security.provider.cert.DRLCertFactory");
-        secprops.put("security.provider.2", "org.apache.harmony.xnet.provider.jsse.OpenSSLProvider");
+        secprops.put("security.provider.1", "org.apache.harmony.xnet.provider.jsse.OpenSSLProvider");
+        secprops.put("security.provider.2", "org.apache.harmony.security.provider.cert.DRLCertFactory");
         secprops.put("security.provider.3", "org.bouncycastle.jce.provider.BouncyCastleProvider");
         secprops.put("security.provider.4", "org.apache.harmony.security.provider.crypto.CryptoProvider");
         secprops.put("security.provider.5", "org.apache.harmony.xnet.provider.jsse.JSSEProvider");

luni/src/main/java/java/security/security.properties

diff --git a/luni/src/main/java/java/security/security.properties b/luni/src/main/java/java/security/security.properties
index a6e1be0..b124271 100644
--- a/luni/src/main/java/java/security/security.properties
+++ b/luni/src/main/java/java/security/security.properties
@@ -18,10 +18,10 @@
 # Providers
 # See also: J2SE doc. "How to Implement a Provider for the JavaTM Cryptography Architecture"
 #
-# Favor Harmony's CertificateFactory.X509 over all others
-security.provider.1=org.apache.harmony.security.provider.cert.DRLCertFactory
-# Android's provider of OpenSSL-backed implementations
-security.provider.2=org.apache.harmony.xnet.provider.jsse.OpenSSLProvider
+# Android's provider of OpenSSL backed implementations
+security.provider.1=org.apache.harmony.xnet.provider.jsse.OpenSSLProvider
+# Favor Harmony's CertificateFactory.X509 over BouncyCastle's
+security.provider.2=org.apache.harmony.security.provider.cert.DRLCertFactory
 # Android's stripped down BouncyCastle provider
 security.provider.3=com.android.org.bouncycastle.jce.provider.BouncyCastleProvider
 # Remaining Harmony providers