Merge changes Ib4450c39,Ie7ed5655

* changes:
  preloaded-classes: remove some OpenSSLCipher modes
  Add CertStoreParameters to preloaded-classes
This commit is contained in:
Kenny Root
2013-12-09 22:28:59 +00:00
committed by Gerrit Code Review

View File

@@ -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$NoPadding
com.android.org.conscrypt.OpenSSLCipher$AES$CBC$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$AES$CBC$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$AES$CFB 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
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
com.android.org.conscrypt.OpenSSLCipher$AES$ECB$NoPadding com.android.org.conscrypt.OpenSSLCipher$AES$ECB$NoPadding
com.android.org.conscrypt.OpenSSLCipher$AES$ECB$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$AES$ECB$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$AES$OFB 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$ARC4
com.android.org.conscrypt.OpenSSLCipher$DESEDE com.android.org.conscrypt.OpenSSLCipher$DESEDE
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$NoPadding com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$NoPadding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$CFB 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
com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$NoPadding com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$NoPadding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$PKCS5Padding com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$PKCS5Padding
com.android.org.conscrypt.OpenSSLCipher$DESEDE$OFB 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
com.android.org.conscrypt.OpenSSLCipherRSA$PKCS1 com.android.org.conscrypt.OpenSSLCipherRSA$PKCS1
com.android.org.conscrypt.OpenSSLCipherRSA$Raw com.android.org.conscrypt.OpenSSLCipherRSA$Raw
@@ -2034,6 +2024,7 @@ java.security.cert.CertSelector
java.security.cert.Certificate java.security.cert.Certificate
java.security.cert.CertificateFactory java.security.cert.CertificateFactory
java.security.cert.CertificateFactorySpi java.security.cert.CertificateFactorySpi
java.security.cert.CertStoreParameters
java.security.cert.PKIXCertPathChecker java.security.cert.PKIXCertPathChecker
java.security.cert.PKIXCertPathValidatorResult java.security.cert.PKIXCertPathValidatorResult
java.security.cert.PKIXParameters java.security.cert.PKIXParameters