Author: geirm Date: Tue Jan 17 03:45:03 2006 New Revision: 369758 URL: http://svn.apache.org/viewcvs?rev=369758&view=rev Log: moving package names from the com.intel... to org.apache Added: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Any.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Any.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1BitString.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1BitString.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Boolean.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Boolean.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Choice.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Choice.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constants.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constants.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constructured.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constructured.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Enumerated.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Enumerated.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Exception.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Exception.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Explicit.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Explicit.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1GeneralizedTime.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1GeneralizedTime.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Implicit.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Implicit.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Integer.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Integer.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1OctetString.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1OctetString.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Oid.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Oid.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1OpenType.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1OpenType.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Primitive.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Primitive.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Sequence.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Sequence.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1SequenceOf.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1SequenceOf.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Set.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Set.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1SetOf.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1SetOf.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1StringType.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1StringType.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Time.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Time.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Type.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Type.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1TypeCollection.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1TypeCollection.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1UTCTime.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1UTCTime.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1ValueCollection.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1ValueCollection.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/BerInputStream.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/BerInputStream.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/BerOutputStream.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/BerOutputStream.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/BitString.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/BitString.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/DerInputStream.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/DerInputStream.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/DerOutputStream.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/DerOutputStream.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/InformationObjectSet.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/InformationObjectSet.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ObjectIdentifier.java - copied, changed from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ObjectIdentifier.java Removed: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Any.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1BitString.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Boolean.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Choice.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constants.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constructured.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Enumerated.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Exception.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Explicit.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1GeneralizedTime.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Implicit.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Integer.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1OctetString.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Oid.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1OpenType.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Primitive.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Sequence.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1SequenceOf.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Set.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1SetOf.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1StringType.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Time.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Type.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1TypeCollection.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1UTCTime.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1ValueCollection.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/BerInputStream.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/BerOutputStream.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/BitString.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/DerInputStream.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/DerOutputStream.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/InformationObjectSet.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ObjectIdentifier.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/ContentInfo.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignedData.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignerInfo.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertFactoryImpl.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertImpl.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertPathImpl.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/utils/JarUtils.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeType.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeTypeAndValue.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeValue.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Attributes.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/DirectoryString.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Name.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AlgorithmIdentifier.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AuthorityKeyIdentifier.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CRLDistributionPoints.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Certificate.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificateList.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificatePolicies.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPoint.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPointName.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/EDIPartyName.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extension.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extensions.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralName.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralNames.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtree.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtrees.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/NameConstraints.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ORAddress.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/OtherName.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyConstraints.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyInformation.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyQualifierInfo.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PrivateKeyUsagePeriod.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ReasonFlags.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/SubjectPublicKeyInfo.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertList.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertificate.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Time.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Validity.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/PolicyQualifierInfo.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CRLSelector.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CertSelector.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/javax/crypto/EncryptedPrivateKeyInfo.java incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/ietf/jgss/Oid.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/ContentInfo.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/ContentInfo.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/ContentInfo.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/ContentInfo.java Tue Jan 17 03:45:03 2006 @@ -23,13 +23,14 @@ import java.io.IOException; import java.util.Arrays; -import com.openintel.drl.security.asn1.ASN1Any; -import com.openintel.drl.security.asn1.ASN1Explicit; -import com.openintel.drl.security.asn1.ASN1OctetString; -import com.openintel.drl.security.asn1.ASN1Oid; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ASN1Any; +import org.apache.harmony.security.asn1.ASN1Explicit; +import org.apache.harmony.security.asn1.ASN1OctetString; +import org.apache.harmony.security.asn1.ASN1Oid; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + /** * As defined in PKCS #7: Cryptographic Message Syntax Standard * (http://www.rsasecurity.com/rsalabs/node.asp?id=2129) Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignedData.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignedData.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignedData.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignedData.java Tue Jan 17 03:45:03 2006 @@ -22,13 +22,14 @@ import java.util.List; -import com.openintel.drl.security.asn1.ASN1Any; -import com.openintel.drl.security.asn1.ASN1Implicit; -import com.openintel.drl.security.asn1.ASN1Integer; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1SetOf; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ASN1Any; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1SetOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + import com.openintel.drl.security.x509.AlgorithmIdentifier; import com.openintel.drl.security.x509.Certificate; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignerInfo.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignerInfo.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignerInfo.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/pkcs7/SignerInfo.java Tue Jan 17 03:45:03 2006 @@ -25,13 +25,14 @@ import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.ASN1Implicit; -import com.openintel.drl.security.asn1.ASN1Integer; -import com.openintel.drl.security.asn1.ASN1OctetString; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1SetOf; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1OctetString; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1SetOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + import com.openintel.drl.security.x501.AttributeTypeAndValue; import com.openintel.drl.security.x501.Name; import com.openintel.drl.security.x509.AlgorithmIdentifier; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertFactoryImpl.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertFactoryImpl.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertFactoryImpl.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertFactoryImpl.java Tue Jan 17 03:45:03 2006 @@ -21,14 +21,14 @@ package com.openintel.drl.security.provider.cert; -import com.openintel.drl.security.asn1.ASN1Any; -import com.openintel.drl.security.asn1.BerInputStream; import java.io.*; import java.util.*; import java.security.cert.*; import org.apache.harmony.misc.Base64; +import org.apache.harmony.security.asn1.ASN1Any; +import org.apache.harmony.security.asn1.BerInputStream; /** * X509CertFactoryImpl Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertImpl.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertImpl.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertImpl.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertImpl.java Tue Jan 17 03:45:03 2006 @@ -46,7 +46,7 @@ import java.security.cert.CertificateNotYetValidException; import java.security.cert.CertificateParsingException; import com.openintel.drlx.crypto.utils.AlgNameMapper; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.*; /** * X509CertImpl Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertPathImpl.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertPathImpl.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertPathImpl.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/provider/cert/X509CertPathImpl.java Tue Jan 17 03:45:03 2006 @@ -34,9 +34,10 @@ import java.util.Iterator; import java.util.List; -import com.openintel.drl.security.asn1.ASN1Any; -import com.openintel.drl.security.asn1.ASN1SequenceOf; -import com.openintel.drl.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ASN1Any; +import org.apache.harmony.security.asn1.ASN1SequenceOf; +import org.apache.harmony.security.asn1.BerInputStream; + import com.openintel.drl.security.pkcs7.ContentInfo; import com.openintel.drl.security.pkcs7.SignedData; import com.openintel.drl.security.x509.Certificate; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/utils/JarUtils.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/utils/JarUtils.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/utils/JarUtils.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/utils/JarUtils.java Tue Jan 17 03:45:03 2006 @@ -38,7 +38,8 @@ import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.BerInputStream; + import com.openintel.drl.security.pkcs7.ContentInfo; import com.openintel.drl.security.pkcs7.SignedData; import com.openintel.drl.security.pkcs7.SignerInfo; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeType.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeType.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeType.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeType.java Tue Jan 17 03:45:03 2006 @@ -20,8 +20,9 @@ package com.openintel.drl.security.x501; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.ObjectIdentifier; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.ObjectIdentifier; + /** * X.501 Attribute Type Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeTypeAndValue.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeTypeAndValue.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeTypeAndValue.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeTypeAndValue.java Tue Jan 17 03:45:03 2006 @@ -28,13 +28,14 @@ import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.ASN1Constants; -import com.openintel.drl.security.asn1.ASN1Oid; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1StringType; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.BerInputStream; -import com.openintel.drl.security.asn1.BerOutputStream; +import org.apache.harmony.security.asn1.ASN1Constants; +import org.apache.harmony.security.asn1.ASN1Oid; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1StringType; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.BerOutputStream; + import com.openintel.drl.security.utils.ObjectIdentifier; /** @@ -270,7 +271,7 @@ public AttributeTypeAndValue(String sOid, AttributeValue value) { if (sOid.charAt(0) >= '0' && sOid.charAt(0) <= '9') { - int[] array = com.openintel.drl.security.asn1.ObjectIdentifier + int[] array = org.apache.harmony.security.asn1.ObjectIdentifier .toIntArray(sOid); ObjectIdentifier thisOid = getOID(array); Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeValue.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeValue.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeValue.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/AttributeValue.java Tue Jan 17 03:45:03 2006 @@ -23,10 +23,11 @@ import java.io.IOException; -import com.openintel.drl.security.asn1.ASN1Constants; -import com.openintel.drl.security.asn1.ASN1StringType; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.DerInputStream; +import org.apache.harmony.security.asn1.ASN1Constants; +import org.apache.harmony.security.asn1.ASN1StringType; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.DerInputStream; + import com.openintel.drl.security.x509.Utils; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Attributes.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Attributes.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Attributes.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Attributes.java Tue Jan 17 03:45:03 2006 @@ -20,11 +20,12 @@ package com.openintel.drl.security.x501; -import com.openintel.drl.security.asn1.ASN1OpenType; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1SetOf; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.InformationObjectSet; +import org.apache.harmony.security.asn1.ASN1OpenType; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1SetOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.InformationObjectSet; + /** * X.501 Attributes Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/DirectoryString.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/DirectoryString.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/DirectoryString.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/DirectoryString.java Tue Jan 17 03:45:03 2006 @@ -21,10 +21,11 @@ package com.openintel.drl.security.x501; -import com.openintel.drl.security.asn1.ASN1Choice; -import com.openintel.drl.security.asn1.ASN1StringType; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ASN1Choice; +import org.apache.harmony.security.asn1.ASN1StringType; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Name.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Name.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Name.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x501/Name.java Tue Jan 17 03:45:03 2006 @@ -32,11 +32,12 @@ import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.ASN1Exception; -import com.openintel.drl.security.asn1.ASN1SequenceOf; -import com.openintel.drl.security.asn1.ASN1SetOf; -import com.openintel.drl.security.asn1.BerInputStream; -import com.openintel.drl.security.asn1.DerInputStream; +import org.apache.harmony.security.asn1.ASN1Exception; +import org.apache.harmony.security.asn1.ASN1SequenceOf; +import org.apache.harmony.security.asn1.ASN1SetOf; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.DerInputStream; + import com.openintel.drl.security.x509.DNParser; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AlgorithmIdentifier.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AlgorithmIdentifier.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AlgorithmIdentifier.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AlgorithmIdentifier.java Tue Jan 17 03:45:03 2006 @@ -23,12 +23,13 @@ import java.util.Arrays; -import com.openintel.drl.security.asn1.ASN1Any; -import com.openintel.drl.security.asn1.ASN1Oid; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.BerInputStream; -import com.openintel.drl.security.asn1.ObjectIdentifier; +import org.apache.harmony.security.asn1.ASN1Any; +import org.apache.harmony.security.asn1.ASN1Oid; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ObjectIdentifier; + /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AuthorityKeyIdentifier.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AuthorityKeyIdentifier.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AuthorityKeyIdentifier.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/AuthorityKeyIdentifier.java Tue Jan 17 03:45:03 2006 @@ -24,7 +24,14 @@ import java.math.BigInteger; import java.io.IOException; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1OctetString; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CRLDistributionPoints.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CRLDistributionPoints.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CRLDistributionPoints.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CRLDistributionPoints.java Tue Jan 17 03:45:03 2006 @@ -24,7 +24,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Collection; -import com.openintel.drl.security.asn1.*; + +import org.apache.harmony.security.asn1.ASN1SequenceOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Certificate.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Certificate.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Certificate.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Certificate.java Tue Jan 17 03:45:03 2006 @@ -21,11 +21,12 @@ package com.openintel.drl.security.x509; -import com.openintel.drl.security.asn1.ASN1BitString; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.BerInputStream; -import com.openintel.drl.security.asn1.BitString; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.BitString; + +import org.apache.harmony.security.asn1.ASN1BitString; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificateList.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificateList.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificateList.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificateList.java Tue Jan 17 03:45:03 2006 @@ -21,11 +21,12 @@ package com.openintel.drl.security.x509; -import com.openintel.drl.security.asn1.ASN1BitString; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.BerInputStream; -import com.openintel.drl.security.asn1.BitString; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.BitString; + +import org.apache.harmony.security.asn1.ASN1BitString; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificatePolicies.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificatePolicies.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificatePolicies.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/CertificatePolicies.java Tue Jan 17 03:45:03 2006 @@ -27,7 +27,11 @@ import java.util.Collection; import java.util.List; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1SequenceOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPoint.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPoint.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPoint.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPoint.java Tue Jan 17 03:45:03 2006 @@ -22,7 +22,13 @@ package com.openintel.drl.security.x509; import java.io.IOException; -import com.openintel.drl.security.asn1.*; + +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPointName.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPointName.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPointName.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/DistributionPointName.java Tue Jan 17 03:45:03 2006 @@ -21,7 +21,11 @@ package com.openintel.drl.security.x509; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Choice; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Type; + +import org.apache.harmony.security.asn1.*; import com.openintel.drl.security.x501.Name; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/EDIPartyName.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/EDIPartyName.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/EDIPartyName.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/EDIPartyName.java Tue Jan 17 03:45:03 2006 @@ -23,7 +23,12 @@ import java.io.IOException; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Explicit; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; import com.openintel.drl.security.x501.DirectoryString; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extension.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extension.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extension.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extension.java Tue Jan 17 03:45:03 2006 @@ -29,20 +29,21 @@ import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.ASN1BitString; -import com.openintel.drl.security.asn1.ASN1Boolean; -import com.openintel.drl.security.asn1.ASN1Enumerated; -import com.openintel.drl.security.asn1.ASN1GeneralizedTime; -import com.openintel.drl.security.asn1.ASN1Integer; -import com.openintel.drl.security.asn1.ASN1OctetString; -import com.openintel.drl.security.asn1.ASN1Oid; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1SequenceOf; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.BerInputStream; -import com.openintel.drl.security.asn1.BitString; -import com.openintel.drl.security.asn1.ObjectIdentifier; +import org.apache.harmony.security.asn1.ASN1Boolean; +import org.apache.harmony.security.asn1.ASN1Enumerated; +import org.apache.harmony.security.asn1.ASN1GeneralizedTime; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1OctetString; +import org.apache.harmony.security.asn1.ASN1Oid; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1SequenceOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.BitString; +import org.apache.harmony.security.asn1.ObjectIdentifier; + import com.openintel.drl.security.x501.Name; +import org.apache.harmony.security.asn1.ASN1BitString; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extensions.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extensions.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extensions.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Extensions.java Tue Jan 17 03:45:03 2006 @@ -32,7 +32,9 @@ import java.util.HashMap; import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1SequenceOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralName.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralName.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralName.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralName.java Tue Jan 17 03:45:03 2006 @@ -30,7 +30,16 @@ import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Choice; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1OctetString; +import org.apache.harmony.security.asn1.ASN1Oid; +import org.apache.harmony.security.asn1.ASN1StringType; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ObjectIdentifier; + +import org.apache.harmony.security.asn1.*; import com.openintel.drl.security.x501.Name; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralNames.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralNames.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralNames.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralNames.java Tue Jan 17 03:45:03 2006 @@ -27,9 +27,10 @@ import java.util.Collection; import java.util.List; -import com.openintel.drl.security.asn1.ASN1Type; -import com.openintel.drl.security.asn1.ASN1SequenceOf; -import com.openintel.drl.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ASN1SequenceOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtree.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtree.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtree.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtree.java Tue Jan 17 03:45:03 2006 @@ -21,7 +21,13 @@ package com.openintel.drl.security.x509; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtrees.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtrees.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtrees.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/GeneralSubtrees.java Tue Jan 17 03:45:03 2006 @@ -27,7 +27,11 @@ import java.util.Collection; import java.util.List; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1SequenceOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/NameConstraints.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/NameConstraints.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/NameConstraints.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/NameConstraints.java Tue Jan 17 03:45:03 2006 @@ -27,7 +27,13 @@ import java.util.Iterator; import java.util.List; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1OctetString; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ORAddress.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ORAddress.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ORAddress.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ORAddress.java Tue Jan 17 03:45:03 2006 @@ -23,7 +23,11 @@ import java.io.IOException; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/OtherName.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/OtherName.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/OtherName.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/OtherName.java Tue Jan 17 03:45:03 2006 @@ -21,7 +21,15 @@ package com.openintel.drl.security.x509; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Any; +import org.apache.harmony.security.asn1.ASN1Explicit; +import org.apache.harmony.security.asn1.ASN1Oid; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ObjectIdentifier; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyConstraints.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyConstraints.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyConstraints.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyConstraints.java Tue Jan 17 03:45:03 2006 @@ -28,7 +28,13 @@ import java.util.Iterator; import java.util.List; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyInformation.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyInformation.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyInformation.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyInformation.java Tue Jan 17 03:45:03 2006 @@ -21,7 +21,13 @@ package com.openintel.drl.security.x509; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Oid; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.ObjectIdentifier; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyQualifierInfo.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyQualifierInfo.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyQualifierInfo.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PolicyQualifierInfo.java Tue Jan 17 03:45:03 2006 @@ -21,10 +21,11 @@ package com.openintel.drl.security.x509; -import com.openintel.drl.security.asn1.ASN1Any; -import com.openintel.drl.security.asn1.ASN1Oid; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.ASN1Any; +import org.apache.harmony.security.asn1.ASN1Oid; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; + /** /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PrivateKeyUsagePeriod.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PrivateKeyUsagePeriod.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PrivateKeyUsagePeriod.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/PrivateKeyUsagePeriod.java Tue Jan 17 03:45:03 2006 @@ -24,7 +24,13 @@ import java.io.IOException; import java.util.Date; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1GeneralizedTime; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ReasonFlags.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ReasonFlags.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ReasonFlags.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/ReasonFlags.java Tue Jan 17 03:45:03 2006 @@ -22,7 +22,11 @@ package com.openintel.drl.security.x509; import java.io.IOException; -import com.openintel.drl.security.asn1.*; + +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.BerOutputStream; + +import org.apache.harmony.security.asn1.ASN1BitString; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/SubjectPublicKeyInfo.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/SubjectPublicKeyInfo.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/SubjectPublicKeyInfo.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/SubjectPublicKeyInfo.java Tue Jan 17 03:45:03 2006 @@ -26,10 +26,15 @@ import java.security.PublicKey; import java.security.spec.X509EncodedKeySpec; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.BitString; + import com.openintel.drlx.crypto.utils.AlgNameMapper; import com.openintel.drl.security.PublicKeyImpl; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertList.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertList.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertList.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertList.java Tue Jan 17 03:45:03 2006 @@ -29,7 +29,13 @@ import java.util.Date; import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Explicit; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1SequenceOf; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + import com.openintel.drl.security.x501.Name; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertificate.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertificate.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertificate.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/TBSCertificate.java Tue Jan 17 03:45:03 2006 @@ -23,7 +23,15 @@ import java.math.BigInteger; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Explicit; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; +import org.apache.harmony.security.asn1.BitString; + +import org.apache.harmony.security.asn1.*; import com.openintel.drl.security.x501.Name; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Time.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Time.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Time.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Time.java Tue Jan 17 03:45:03 2006 @@ -23,7 +23,13 @@ import java.io.IOException; import java.util.Date; -import com.openintel.drl.security.asn1.*; + +import org.apache.harmony.security.asn1.ASN1Choice; +import org.apache.harmony.security.asn1.ASN1GeneralizedTime; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.ASN1UTCTime; + +import org.apache.harmony.security.asn1.*; /** * Class represents the work with the following X.509 structure: Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Validity.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Validity.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Validity.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/x509/Validity.java Tue Jan 17 03:45:03 2006 @@ -24,7 +24,11 @@ import java.io.IOException; import java.util.Date; -import com.openintel.drl.security.asn1.*; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.BerInputStream; + +import org.apache.harmony.security.asn1.*; /** * The class incapsulates the ASN.1 DER encoding/decoding work Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/PolicyQualifierInfo.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/PolicyQualifierInfo.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/PolicyQualifierInfo.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/PolicyQualifierInfo.java Tue Jan 17 03:45:03 2006 @@ -23,7 +23,8 @@ import java.io.IOException; -import com.openintel.drl.security.asn1.ObjectIdentifier; +import org.apache.harmony.security.asn1.ObjectIdentifier; + import com.openintel.drl.security.utils.Array; /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CRLSelector.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CRLSelector.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CRLSelector.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CRLSelector.java Tue Jan 17 03:45:03 2006 @@ -29,8 +29,10 @@ import java.util.Date; import java.util.Iterator; import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.ASN1Integer; -import com.openintel.drl.security.asn1.ASN1OctetString; + +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1OctetString; + /** * @com.intel.drl.spec_ref Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CertSelector.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CertSelector.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CertSelector.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/java/security/cert/X509CertSelector.java Tue Jan 17 03:45:03 2006 @@ -38,8 +38,9 @@ import java.util.StringTokenizer; import javax.security.auth.x500.X500Principal; -import com.openintel.drl.security.asn1.ASN1OctetString; -import com.openintel.drl.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.ASN1OctetString; +import org.apache.harmony.security.asn1.ASN1Type; + import com.openintel.drl.security.x509.PrivateKeyUsagePeriod; import com.openintel.drl.security.x509.SubjectPublicKeyInfo; import com.openintel.drl.security.x509.AlgorithmIdentifier; Modified: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/javax/crypto/EncryptedPrivateKeyInfo.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/javax/crypto/EncryptedPrivateKeyInfo.java?rev=369758&r1=369757&r2=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/javax/crypto/EncryptedPrivateKeyInfo.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/javax/crypto/EncryptedPrivateKeyInfo.java Tue Jan 17 03:45:03 2006 @@ -32,13 +32,14 @@ import java.security.spec.InvalidKeySpecException; import java.security.spec.PKCS8EncodedKeySpec; -import com.openintel.drl.security.asn1.ASN1Any; -import com.openintel.drl.security.asn1.ASN1Implicit; -import com.openintel.drl.security.asn1.ASN1Integer; -import com.openintel.drl.security.asn1.ASN1OctetString; -import com.openintel.drl.security.asn1.ASN1Sequence; -import com.openintel.drl.security.asn1.ASN1SetOf; -import com.openintel.drl.security.asn1.ASN1Type; +import org.apache.harmony.security.asn1.ASN1Any; +import org.apache.harmony.security.asn1.ASN1Implicit; +import org.apache.harmony.security.asn1.ASN1Integer; +import org.apache.harmony.security.asn1.ASN1OctetString; +import org.apache.harmony.security.asn1.ASN1Sequence; +import org.apache.harmony.security.asn1.ASN1SetOf; +import org.apache.harmony.security.asn1.ASN1Type; + import com.openintel.drl.security.x509.AlgorithmIdentifier; import com.openintel.drlx.crypto.utils.AlgNameMapper; Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Any.java (from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Any.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Any.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Any.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Any.java&r1=369669&r2=369758&rev=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Any.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Any.java Tue Jan 17 03:45:03 2006 @@ -19,9 +19,10 @@ * @version $Revision$ */ -package com.openintel.drl.security.asn1; +package org.apache.harmony.security.asn1; import java.io.IOException; + /** * This class represents ASN.1 ANY type. Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1BitString.java (from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1BitString.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1BitString.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1BitString.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1BitString.java&r1=369669&r2=369758&rev=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1BitString.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1BitString.java Tue Jan 17 03:45:03 2006 @@ -19,7 +19,7 @@ * @version $Revision$ */ -package com.openintel.drl.security.asn1; +package org.apache.harmony.security.asn1; import java.io.IOException; @@ -53,7 +53,7 @@ * that is represented as BitString object. * * @return ASN.1 Bitstring type default implementation - * @see com.openintel.drl.security.asn1.BitString + * @see org.apache.harmony.security.asn1.BitString */ public static ASN1BitString getInstance() { return ASN1; Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Boolean.java (from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Boolean.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Boolean.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Boolean.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Boolean.java&r1=369669&r2=369758&rev=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Boolean.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Boolean.java Tue Jan 17 03:45:03 2006 @@ -19,9 +19,10 @@ * @version $Revision$ */ -package com.openintel.drl.security.asn1; +package org.apache.harmony.security.asn1; import java.io.IOException; + /** * This class represents ASN.1 Boolean type. Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Choice.java (from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Choice.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Choice.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Choice.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Choice.java&r1=369669&r2=369758&rev=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Choice.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Choice.java Tue Jan 17 03:45:03 2006 @@ -18,9 +18,10 @@ * @version $Revision$ */ -package com.openintel.drl.security.asn1; +package org.apache.harmony.security.asn1; import java.io.IOException; + /** * This abstract class represents ASN.1 Choice type. Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constants.java (from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constants.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constants.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constants.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constants.java&r1=369669&r2=369758&rev=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constants.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constants.java Tue Jan 17 03:45:03 2006 @@ -19,7 +19,7 @@ * @version $Revision$ */ -package com.openintel.drl.security.asn1; +package org.apache.harmony.security.asn1; /** * ASN.1 and some other constants holder interface Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constructured.java (from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constructured.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constructured.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constructured.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constructured.java&r1=369669&r2=369758&rev=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Constructured.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Constructured.java Tue Jan 17 03:45:03 2006 @@ -19,7 +19,8 @@ * @version $Revision$ */ -package com.openintel.drl.security.asn1; +package org.apache.harmony.security.asn1; + /** * This abstract class is the super class for all constructured ASN.1 types Copied: incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Enumerated.java (from r369669, incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Enumerated.java) URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Enumerated.java?p2=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Enumerated.java&p1=incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Enumerated.java&r1=369669&r2=369758&rev=369758&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/com/openintel/drl/security/asn1/ASN1Enumerated.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/security2/src/common/javasrc/org/apache/harmony/security/asn1/ASN1Enumerated.java Tue Jan 17 03:45:03 2006 @@ -19,9 +19,10 @@ * @version $Revision$ */ -package com.openintel.drl.security.asn1; +package org.apache.harmony.security.asn1; import java.io.IOException; + /** * This class represents ASN.1 Enumerated type.