Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb (8d37c4ef) · Commits · e / os / android_frameworks_base

core/java/android/net/http/SslCertificate.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -25,8 +25,8 @@ import java.util.Vector;

		import java.security.cert.X509Certificate;

		import org.bouncycastle.asn1.DERObjectIdentifier;
		import org.bouncycastle.asn1.x509.X509Name;
		import com.android.org.bouncycastle.asn1.DERObjectIdentifier;
		import com.android.org.bouncycastle.asn1.x509.X509Name;

		/**
		* SSL certificate info (certificate details) class

core/java/android/webkit/CacheManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,8 +33,8 @@ import java.util.List;
		import java.util.Map;


		import org.bouncycastle.crypto.Digest;
		import org.bouncycastle.crypto.digests.SHA1Digest;
		import com.android.org.bouncycastle.crypto.Digest;
		import com.android.org.bouncycastle.crypto.digests.SHA1Digest;

		/**
		* The class CacheManager provides the persistent cache of content that is

core/java/android/webkit/CertTool.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -16,10 +16,10 @@

		package android.webkit;

		import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
		import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
		import org.bouncycastle.jce.netscape.NetscapeCertRequest;
		import org.bouncycastle.util.encoders.Base64;
		import com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
		import com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
		import com.android.org.bouncycastle.jce.netscape.NetscapeCertRequest;
		import com.android.org.bouncycastle.util.encoders.Base64;

		import android.content.ActivityNotFoundException;
		import android.content.Context;

core/java/com/android/internal/backup/LocalTransport.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ import android.os.ParcelFileDescriptor;
		import android.os.RemoteException;
		import android.util.Log;

		import org.bouncycastle.util.encoders.Base64;
		import com.android.org.bouncycastle.util.encoders.Base64;

		import java.io.File;
		import java.io.FileFilter;

preloaded-classes

+88 −88

Original line number	Diff line number	Diff line
		@@ -1839,94 +1839,94 @@ org.apache.http.protocol.RequestUserAgent
		org.apache.http.util.ByteArrayBuffer
		org.apache.http.util.CharArrayBuffer
		org.apache.http.util.LangUtils
		org.bouncycastle.asn1.ASN1Choice
		org.bouncycastle.asn1.ASN1Collection
		org.bouncycastle.asn1.ASN1Collection$ASN1CollectionEnumeration
		org.bouncycastle.asn1.ASN1Encodable
		org.bouncycastle.asn1.ASN1EncodableVector
		org.bouncycastle.asn1.ASN1InputStream
		org.bouncycastle.asn1.ASN1Null
		org.bouncycastle.asn1.ASN1Object
		org.bouncycastle.asn1.ASN1OctetString
		org.bouncycastle.asn1.ASN1OctetStringParser
		org.bouncycastle.asn1.ASN1OutputStream
		org.bouncycastle.asn1.ASN1Sequence
		org.bouncycastle.asn1.ASN1SequenceParser
		org.bouncycastle.asn1.ASN1Set
		org.bouncycastle.asn1.ASN1StreamParser
		org.bouncycastle.asn1.ASN1TaggedObject
		org.bouncycastle.asn1.ASN1TaggedObjectParser
		org.bouncycastle.asn1.BERTaggedObjectParser
		org.bouncycastle.asn1.DERBitString
		org.bouncycastle.asn1.DERBoolean
		org.bouncycastle.asn1.DEREncodable
		org.bouncycastle.asn1.DEREncodableVector
		org.bouncycastle.asn1.DERFactory
		org.bouncycastle.asn1.DERIA5String
		org.bouncycastle.asn1.DERInteger
		org.bouncycastle.asn1.DERNull
		org.bouncycastle.asn1.DERObject
		org.bouncycastle.asn1.DERObjectIdentifier
		org.bouncycastle.asn1.DEROctetString
		org.bouncycastle.asn1.DEROctetStringParser
		org.bouncycastle.asn1.DEROutputStream
		org.bouncycastle.asn1.DERPrintableString
		org.bouncycastle.asn1.DERSequence
		org.bouncycastle.asn1.DERSequenceParser
		org.bouncycastle.asn1.DERSet
		org.bouncycastle.asn1.DERString
		org.bouncycastle.asn1.DERT61String
		org.bouncycastle.asn1.DERTaggedObject
		org.bouncycastle.asn1.DERTags
		org.bouncycastle.asn1.DERUTCTime
		org.bouncycastle.asn1.DERUTF8String
		org.bouncycastle.asn1.DERUniversalString
		org.bouncycastle.asn1.DefiniteLengthInputStream
		org.bouncycastle.asn1.IndefiniteLengthInputStream
		org.bouncycastle.asn1.LimitedInputStream
		org.bouncycastle.asn1.OIDTokenizer
		org.bouncycastle.asn1.OrderedTable
		org.bouncycastle.asn1.bc.BCObjectIdentifiers
		org.bouncycastle.asn1.iana.IANAObjectIdentifiers
		org.bouncycastle.asn1.nist.NISTObjectIdentifiers
		org.bouncycastle.asn1.oiw.OIWObjectIdentifiers
		org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers
		org.bouncycastle.asn1.x509.AlgorithmIdentifier
		org.bouncycastle.asn1.x509.BasicConstraints
		org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
		org.bouncycastle.asn1.x509.TBSCertificateStructure
		org.bouncycastle.asn1.x509.Time
		org.bouncycastle.asn1.x509.X509CertificateStructure
		org.bouncycastle.asn1.x509.X509Extension
		org.bouncycastle.asn1.x509.X509Extensions
		org.bouncycastle.asn1.x509.X509Name
		org.bouncycastle.asn1.x509.X509NameElementList
		org.bouncycastle.asn1.x509.X509ObjectIdentifiers
		org.bouncycastle.asn1.x9.X9ObjectIdentifiers
		org.bouncycastle.crypto.Digest
		org.bouncycastle.crypto.ExtendedDigest
		org.bouncycastle.crypto.Mac
		org.bouncycastle.crypto.digests.OpenSSLDigest
		org.bouncycastle.crypto.digests.OpenSSLDigest$SHA1
		org.bouncycastle.crypto.macs.HMac
		org.bouncycastle.jce.ProviderConfigurationPermission
		org.bouncycastle.jce.interfaces.BCKeyStore
		org.bouncycastle.jce.interfaces.ConfigurableProvider
		org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier
		org.bouncycastle.jce.provider.BouncyCastleProvider
		org.bouncycastle.jce.provider.BouncyCastleProvider$1
		org.bouncycastle.jce.provider.JDKKeyStore
		org.bouncycastle.jce.provider.JDKKeyStore$StoreEntry
		org.bouncycastle.jce.provider.JDKX509CertificateFactory
		org.bouncycastle.jce.provider.PEMUtil
		org.bouncycastle.jce.provider.PKCS12BagAttributeCarrierImpl
		org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi
		org.bouncycastle.jce.provider.ProviderUtil
		org.bouncycastle.jce.provider.X509CertificateObject
		org.bouncycastle.jce.provider.asymmetric.ECMappings
		org.bouncycastle.jce.provider.symmetric.AESMappings
		org.bouncycastle.util.Strings
		org.bouncycastle.util.io.Streams
		com.android.org.bouncycastle.asn1.ASN1Choice
		com.android.org.bouncycastle.asn1.ASN1Collection
		com.android.org.bouncycastle.asn1.ASN1Collection$ASN1CollectionEnumeration
		com.android.org.bouncycastle.asn1.ASN1Encodable
		com.android.org.bouncycastle.asn1.ASN1EncodableVector
		com.android.org.bouncycastle.asn1.ASN1InputStream
		com.android.org.bouncycastle.asn1.ASN1Null
		com.android.org.bouncycastle.asn1.ASN1Object
		com.android.org.bouncycastle.asn1.ASN1OctetString
		com.android.org.bouncycastle.asn1.ASN1OctetStringParser
		com.android.org.bouncycastle.asn1.ASN1OutputStream
		com.android.org.bouncycastle.asn1.ASN1Sequence
		com.android.org.bouncycastle.asn1.ASN1SequenceParser
		com.android.org.bouncycastle.asn1.ASN1Set
		com.android.org.bouncycastle.asn1.ASN1StreamParser
		com.android.org.bouncycastle.asn1.ASN1TaggedObject
		com.android.org.bouncycastle.asn1.ASN1TaggedObjectParser
		com.android.org.bouncycastle.asn1.BERTaggedObjectParser
		com.android.org.bouncycastle.asn1.DERBitString
		com.android.org.bouncycastle.asn1.DERBoolean
		com.android.org.bouncycastle.asn1.DEREncodable
		com.android.org.bouncycastle.asn1.DEREncodableVector
		com.android.org.bouncycastle.asn1.DERFactory
		com.android.org.bouncycastle.asn1.DERIA5String
		com.android.org.bouncycastle.asn1.DERInteger
		com.android.org.bouncycastle.asn1.DERNull
		com.android.org.bouncycastle.asn1.DERObject
		com.android.org.bouncycastle.asn1.DERObjectIdentifier
		com.android.org.bouncycastle.asn1.DEROctetString
		com.android.org.bouncycastle.asn1.DEROctetStringParser
		com.android.org.bouncycastle.asn1.DEROutputStream
		com.android.org.bouncycastle.asn1.DERPrintableString
		com.android.org.bouncycastle.asn1.DERSequence
		com.android.org.bouncycastle.asn1.DERSequenceParser
		com.android.org.bouncycastle.asn1.DERSet
		com.android.org.bouncycastle.asn1.DERString
		com.android.org.bouncycastle.asn1.DERT61String
		com.android.org.bouncycastle.asn1.DERTaggedObject
		com.android.org.bouncycastle.asn1.DERTags
		com.android.org.bouncycastle.asn1.DERUTCTime
		com.android.org.bouncycastle.asn1.DERUTF8String
		com.android.org.bouncycastle.asn1.DERUniversalString
		com.android.org.bouncycastle.asn1.DefiniteLengthInputStream
		com.android.org.bouncycastle.asn1.IndefiniteLengthInputStream
		com.android.org.bouncycastle.asn1.LimitedInputStream
		com.android.org.bouncycastle.asn1.OIDTokenizer
		com.android.org.bouncycastle.asn1.OrderedTable
		com.android.org.bouncycastle.asn1.bc.BCObjectIdentifiers
		com.android.org.bouncycastle.asn1.iana.IANAObjectIdentifiers
		com.android.org.bouncycastle.asn1.nist.NISTObjectIdentifiers
		com.android.org.bouncycastle.asn1.oiw.OIWObjectIdentifiers
		com.android.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers
		com.android.org.bouncycastle.asn1.x509.AlgorithmIdentifier
		com.android.org.bouncycastle.asn1.x509.BasicConstraints
		com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo
		com.android.org.bouncycastle.asn1.x509.TBSCertificateStructure
		com.android.org.bouncycastle.asn1.x509.Time
		com.android.org.bouncycastle.asn1.x509.X509CertificateStructure
		com.android.org.bouncycastle.asn1.x509.X509Extension
		com.android.org.bouncycastle.asn1.x509.X509Extensions
		com.android.org.bouncycastle.asn1.x509.X509Name
		com.android.org.bouncycastle.asn1.x509.X509NameElementList
		com.android.org.bouncycastle.asn1.x509.X509ObjectIdentifiers
		com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers
		com.android.org.bouncycastle.crypto.Digest
		com.android.org.bouncycastle.crypto.ExtendedDigest
		com.android.org.bouncycastle.crypto.Mac
		com.android.org.bouncycastle.crypto.digests.OpenSSLDigest
		com.android.org.bouncycastle.crypto.digests.OpenSSLDigest$SHA1
		com.android.org.bouncycastle.crypto.macs.HMac
		com.android.org.bouncycastle.jce.ProviderConfigurationPermission
		com.android.org.bouncycastle.jce.interfaces.BCKeyStore
		com.android.org.bouncycastle.jce.interfaces.ConfigurableProvider
		com.android.org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier
		com.android.org.bouncycastle.jce.provider.BouncyCastleProvider
		com.android.org.bouncycastle.jce.provider.BouncyCastleProvider$1
		com.android.org.bouncycastle.jce.provider.JDKKeyStore
		com.android.org.bouncycastle.jce.provider.JDKKeyStore$StoreEntry
		com.android.org.bouncycastle.jce.provider.JDKX509CertificateFactory
		com.android.org.bouncycastle.jce.provider.PEMUtil
		com.android.org.bouncycastle.jce.provider.PKCS12BagAttributeCarrierImpl
		com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi
		com.android.org.bouncycastle.jce.provider.ProviderUtil
		com.android.org.bouncycastle.jce.provider.X509CertificateObject
		com.android.org.bouncycastle.jce.provider.asymmetric.ECMappings
		com.android.org.bouncycastle.jce.provider.symmetric.AESMappings
		com.android.org.bouncycastle.util.Strings
		com.android.org.bouncycastle.util.io.Streams
		org.xml.sax.Attributes
		org.xml.sax.ContentHandler
		org.xml.sax.Locator