diff options
| author | Kenny Root <kroot@google.com> | 2013-12-09 22:28:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-09 22:29:00 +0000 |
| commit | 25fd0c9e74f1b59d8b49258a3081af4479574f3f (patch) | |
| tree | 8dd53e4a33d384fc17eda0f3b4a134f4fe0f2202 | |
| parent | 2daa0c93c4a0a9d18f4ef4486369fb8c90cd1ea2 (diff) | |
| parent | 53bcf2264cb8064bf7318d2cdc31155ae41b11f4 (diff) | |
| download | base-idea133.tar.gz | |
Merge changes Ib4450c39,Ie7ed5655idea133
* changes:
preloaded-classes: remove some OpenSSLCipher modes
Add CertStoreParameters to preloaded-classes
| -rw-r--r-- | preloaded-classes | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/preloaded-classes b/preloaded-classes index 467da25887ba..960c8ac018a4 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 @@ -2034,6 +2024,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 |