From 744f562c4d31bd8e1d7680cb38b9d01302ab67b1 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Mon, 9 Dec 2013 13:49:27 -0800 Subject: [PATCH 1/2] Add CertStoreParameters to preloaded-classes For image creating, art needs this in the preloaded-classes list. Otherwise it complains loudly about not being able to load it from a class initializer in Provider.java. Change-Id: Ie7ed5655cba038b504767c3de9f70b47a8965cce --- preloaded-classes | 1 + 1 file changed, 1 insertion(+) diff --git a/preloaded-classes b/preloaded-classes index 467da25887bab..0764923efdeb3 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -2034,6 +2034,7 @@ java.security.cert.CertSelector java.security.cert.Certificate java.security.cert.CertificateFactory java.security.cert.CertificateFactorySpi +java.security.cert.CertStoreParameters java.security.cert.PKIXCertPathChecker java.security.cert.PKIXCertPathValidatorResult java.security.cert.PKIXParameters From 53bcf2264cb8064bf7318d2cdc31155ae41b11f4 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Mon, 9 Dec 2013 14:01:54 -0800 Subject: [PATCH 2/2] preloaded-classes: remove some OpenSSLCipher modes Some cipher modes were removed from OpenSSLCipher. This change removes those classes from the preloaded classes list. Change-Id: Ib4450c392513973836684b4d5df7fffb200b6260 --- preloaded-classes | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/preloaded-classes b/preloaded-classes index 0764923efdeb3..960c8ac018a48 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -1633,31 +1633,21 @@ com.android.org.conscrypt.OpenSSLCipher$AES$CBC com.android.org.conscrypt.OpenSSLCipher$AES$CBC$NoPadding com.android.org.conscrypt.OpenSSLCipher$AES$CBC$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$AES$CFB -com.android.org.conscrypt.OpenSSLCipher$AES$CFB$NoPadding -com.android.org.conscrypt.OpenSSLCipher$AES$CFB$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$AES$CTR -com.android.org.conscrypt.OpenSSLCipher$AES$CTR$NoPadding -com.android.org.conscrypt.OpenSSLCipher$AES$CTR$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$AES$ECB com.android.org.conscrypt.OpenSSLCipher$AES$ECB$NoPadding com.android.org.conscrypt.OpenSSLCipher$AES$ECB$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$AES$OFB -com.android.org.conscrypt.OpenSSLCipher$AES$OFB$NoPadding -com.android.org.conscrypt.OpenSSLCipher$AES$OFB$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$ARC4 com.android.org.conscrypt.OpenSSLCipher$DESEDE com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$NoPadding com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$DESEDE$CFB -com.android.org.conscrypt.OpenSSLCipher$DESEDE$CFB$NoPadding -com.android.org.conscrypt.OpenSSLCipher$DESEDE$CFB$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$NoPadding com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$DESEDE$OFB -com.android.org.conscrypt.OpenSSLCipher$DESEDE$OFB$NoPadding -com.android.org.conscrypt.OpenSSLCipher$DESEDE$OFB$PKCS5Padding com.android.org.conscrypt.OpenSSLCipherRSA com.android.org.conscrypt.OpenSSLCipherRSA$PKCS1 com.android.org.conscrypt.OpenSSLCipherRSA$Raw