Author: erodriguez Date: Sat Jan 15 17:11:37 2005 New Revision: 125325 URL: http://svn.apache.org/viewcvs?view=rev&rev=125325 Log: Redirecting Kerberos ASN.1 DER encoding to use Apache libraries. Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ApplicationReplyEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncApRepPartEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncAsRepPartEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKdcRepPartEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKrbPrivPartEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTgsRepPartEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTicketPartEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ErrorMessageEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReplyEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReqBodyEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KerberosMessageEncoder.java incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/PrivateMessageEncoder.java
Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ApplicationReplyEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ApplicationReplyEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ApplicationReplyEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ApplicationReplyEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ApplicationReplyEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ApplicationReplyEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,12 +14,19 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.messages.application.*; -import org.bouncycastle.asn1.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; -import java.io.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.ASN1OutputStream; +import org.apache.asn1.der.DERApplicationSpecific; +import org.apache.asn1.der.DERInteger; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.messages.application.ApplicationReply; public class ApplicationReplyEncoder extends KerberosMessageEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncApRepPartEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncApRepPartEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncApRepPartEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncApRepPartEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncApRepPartEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncApRepPartEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,12 +14,19 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.messages.components.*; -import org.bouncycastle.asn1.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; -import java.io.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.ASN1OutputStream; +import org.apache.asn1.der.DERApplicationSpecific; +import org.apache.asn1.der.DERInteger; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.messages.components.EncApRepPart; public class EncApRepPartEncoder extends KerberosMessageEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncAsRepPartEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncAsRepPartEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncAsRepPartEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncAsRepPartEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncAsRepPartEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncAsRepPartEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,6 +14,7 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; public class EncAsRepPartEncoder extends EncKdcRepPartEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKdcRepPartEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKdcRepPartEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKdcRepPartEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKdcRepPartEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKdcRepPartEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKdcRepPartEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,12 +14,19 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.messages.*; -import org.bouncycastle.asn1.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; -import java.io.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.ASN1OutputStream; +import org.apache.asn1.der.DERApplicationSpecific; +import org.apache.asn1.der.DERInteger; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.messages.KdcReply; public abstract class EncKdcRepPartEncoder extends KerberosMessageEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKrbPrivPartEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKrbPrivPartEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKrbPrivPartEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKrbPrivPartEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKrbPrivPartEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncKrbPrivPartEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,12 +14,20 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.messages.components.*; -import org.bouncycastle.asn1.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; -import java.io.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.ASN1OutputStream; +import org.apache.asn1.der.DERApplicationSpecific; +import org.apache.asn1.der.DERInteger; +import org.apache.asn1.der.DEROctetString; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.messages.components.EncKrbPrivPart; public class EncKrbPrivPartEncoder extends KerberosMessageEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTgsRepPartEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTgsRepPartEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTgsRepPartEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTgsRepPartEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTgsRepPartEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTgsRepPartEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,6 +14,7 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; public class EncTgsRepPartEncoder extends EncKdcRepPartEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTicketPartEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTicketPartEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTicketPartEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTicketPartEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTicketPartEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/EncTicketPartEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,12 +14,18 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.messages.components.*; -import org.bouncycastle.asn1.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; -import java.io.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.ASN1OutputStream; +import org.apache.asn1.der.DERApplicationSpecific; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.messages.components.EncTicketPart; public class EncTicketPartEncoder extends KerberosMessageEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ErrorMessageEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ErrorMessageEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ErrorMessageEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ErrorMessageEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ErrorMessageEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/ErrorMessageEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,12 +14,22 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.messages.*; -import org.bouncycastle.asn1.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.OutputStream; -import java.io.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.ASN1OutputStream; +import org.apache.asn1.der.DERApplicationSpecific; +import org.apache.asn1.der.DERGeneralString; +import org.apache.asn1.der.DERInteger; +import org.apache.asn1.der.DEROctetString; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.messages.ErrorMessage; public class ErrorMessageEncoder extends KerberosMessageEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReplyEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReplyEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReplyEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReplyEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReplyEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReplyEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,13 +14,21 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.messages.*; -import org.apache.kerberos.messages.value.*; -import org.bouncycastle.asn1.*; +import java.io.IOException; +import java.io.OutputStream; -import java.io.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.ASN1OutputStream; +import org.apache.asn1.der.DERApplicationSpecific; +import org.apache.asn1.der.DERInteger; +import org.apache.asn1.der.DEROctetString; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.messages.KdcReply; +import org.apache.kerberos.messages.value.PreAuthenticationData; public class KdcReplyEncoder extends KerberosMessageEncoder { /* Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReqBodyEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReqBodyEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReqBodyEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReqBodyEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReqBodyEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KdcReqBodyEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,12 +14,18 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.messages.*; -import org.bouncycastle.asn1.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; -import java.io.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.ASN1OutputStream; +import org.apache.asn1.der.DERInteger; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.messages.KdcRequest; public class KdcReqBodyEncoder extends KerberosMessageEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KerberosMessageEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KerberosMessageEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KerberosMessageEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KerberosMessageEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KerberosMessageEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/KerberosMessageEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,16 +14,40 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.crypto.encryption.*; -import org.apache.kerberos.messages.components.*; -import org.apache.kerberos.messages.value.*; -import org.bouncycastle.asn1.*; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; -import java.util.*; +import javax.security.auth.kerberos.KerberosPrincipal; -import javax.security.auth.kerberos.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.DERApplicationSpecific; +import org.apache.asn1.der.DERBitString; +import org.apache.asn1.der.DERGeneralString; +import org.apache.asn1.der.DERGeneralizedTime; +import org.apache.asn1.der.DERInteger; +import org.apache.asn1.der.DEROctetString; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.crypto.encryption.EncryptionType; +import org.apache.kerberos.messages.components.Ticket; +import org.apache.kerberos.messages.value.ApOptions; +import org.apache.kerberos.messages.value.AuthorizationData; +import org.apache.kerberos.messages.value.AuthorizationDataEntry; +import org.apache.kerberos.messages.value.Checksum; +import org.apache.kerberos.messages.value.EncryptedData; +import org.apache.kerberos.messages.value.EncryptionKey; +import org.apache.kerberos.messages.value.HostAddress; +import org.apache.kerberos.messages.value.HostAddresses; +import org.apache.kerberos.messages.value.KdcOptions; +import org.apache.kerberos.messages.value.KerberosTime; +import org.apache.kerberos.messages.value.LastRequest; +import org.apache.kerberos.messages.value.LastRequestEntry; +import org.apache.kerberos.messages.value.TicketFlags; +import org.apache.kerberos.messages.value.TransitedEncoding; public abstract class KerberosMessageEncoder { Modified: incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/PrivateMessageEncoder.java Url: http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/PrivateMessageEncoder.java?view=diff&rev=125325&p1=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/PrivateMessageEncoder.java&r1=125324&p2=incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/PrivateMessageEncoder.java&r2=125325 ============================================================================== --- incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/PrivateMessageEncoder.java (original) +++ incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/io/encoder/PrivateMessageEncoder.java Sat Jan 15 17:11:37 2005 @@ -14,12 +14,19 @@ * limitations under the License. * */ + package org.apache.kerberos.io.encoder; -import org.apache.kerberos.messages.application.*; -import org.bouncycastle.asn1.*; +import java.io.ByteArrayOutputStream; +import java.io.IOException; -import java.io.*; +import org.apache.asn1.der.ASN1EncodableVector; +import org.apache.asn1.der.ASN1OutputStream; +import org.apache.asn1.der.DERApplicationSpecific; +import org.apache.asn1.der.DERInteger; +import org.apache.asn1.der.DERSequence; +import org.apache.asn1.der.DERTaggedObject; +import org.apache.kerberos.messages.application.PrivateMessage; public class PrivateMessageEncoder extends KerberosMessageEncoder {
