commit 3dc7ff56501d411c19701e15e0ff1972d3a53753
author Kenny Root <kroot@google.com> Wed Mar 13 08:49:19 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Mar 13 08:49:19 2013 -0700
tree 7bd57cb0caf0b5df06a43fffe06226c3ce73b704
parent b625fb82b6bb6c3979e4062e770448caf4892eb3
parent 66774f6ae126379a66e84ef39e69ba020065dbce

am 66774f6a: am bc7222da: Merge "Revert "Put DRLCertFactory as first provider""

* commit '66774f6ae126379a66e84ef39e69ba020065dbce':
  Revert "Put DRLCertFactory as first provider"

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