diff options
| author | Kenny Root <kroot@google.com> | 2013-05-28 08:57:51 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-05-28 16:25:04 -0700 |
| commit | a2805c5e3a29414dc9d600a5322d0bc4491fddd6 (patch) | |
| tree | 447335424c23a5cbb53a69b13851e80ebeb21e00 /luni | |
| parent | 9fe691c826e252e18eab41a1b1890e4d056d7715 (diff) | |
| download | libcore-a2805c5e3a29414dc9d600a5322d0bc4491fddd6.zip libcore-a2805c5e3a29414dc9d600a5322d0bc4491fddd6.tar.gz libcore-a2805c5e3a29414dc9d600a5322d0bc4491fddd6.tar.bz2 | |
Use the jarjar names of security providers
The platform was using the security.properties file, but running the
tests outside of the platform was using the registerDefaultProviders()
call. Those won't work with a jarjar'd library.
Change-Id: If0472d99b45c274a63003c53bf91a37bfb23fda4
Diffstat (limited to 'luni')
| -rw-r--r-- | luni/src/main/java/java/security/Security.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/luni/src/main/java/java/security/Security.java b/luni/src/main/java/java/security/Security.java index d72a93a..0876136 100644 --- a/luni/src/main/java/java/security/Security.java +++ b/luni/src/main/java/java/security/Security.java @@ -71,11 +71,11 @@ public final class Security { // Register default providers private static void registerDefaultProviders() { - secprops.put("security.provider.1", "org.conscrypt.OpenSSLProvider"); + secprops.put("security.provider.1", "com.android.org.conscrypt.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.3", "com.android.org.bouncycastle.jce.provider.BouncyCastleProvider"); secprops.put("security.provider.4", "org.apache.harmony.security.provider.crypto.CryptoProvider"); - secprops.put("security.provider.5", "org.conscrypt.JSSEProvider"); + secprops.put("security.provider.5", "com.android.org.conscrypt.JSSEProvider"); } /** |