Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 3999 invoked from network); 29 Jan 2007 07:14:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 29 Jan 2007 07:14:10 -0000 Received: (qmail 52599 invoked by uid 500); 29 Jan 2007 07:14:15 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 52576 invoked by uid 500); 29 Jan 2007 07:14:15 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 52567 invoked by uid 99); 29 Jan 2007 07:14:15 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Jan 2007 23:14:15 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Jan 2007 23:14:08 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id A8E4D1A981A; Sun, 28 Jan 2007 23:13:48 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r500954 - in /harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common: javax/security/auth/kerberos/KerberosPrincipal.java org/apache/harmony/auth/internal/kerberos/v5/PrincipalName.java Date: Mon, 29 Jan 2007 07:13:48 -0000 To: commits@harmony.apache.org From: smishura@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070129071348.A8E4D1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: smishura Date: Sun Jan 28 23:13:47 2007 New Revision: 500954 URL: http://svn.apache.org/viewvc?view=rev&rev=500954 Log: PrincipalName: change encoder's access from public to package Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/kerberos/KerberosPrincipal.java harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/PrincipalName.java Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/kerberos/KerberosPrincipal.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/kerberos/KerberosPrincipal.java?view=diff&rev=500954&r1=500953&r2=500954 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/kerberos/KerberosPrincipal.java (original) +++ harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/javax/security/auth/kerberos/KerberosPrincipal.java Sun Jan 28 23:13:47 2007 @@ -145,7 +145,7 @@ s.defaultReadObject(); - PrincipalName principalName = (PrincipalName) PrincipalName.ASN1.decode((byte[]) s + PrincipalName principalName = PrincipalName.instanceOf((byte[]) s .readObject()); realm = (String) ASN1StringType.GENERALSTRING.decode((byte[]) s.readObject()); @@ -189,10 +189,7 @@ } } - byte[] enc = PrincipalName.ASN1.encode(new PrincipalName(type, nameString)); - s.writeObject(enc); - - enc = ASN1StringType.GENERALSTRING.encode(realm); - s.writeObject(enc); + s.writeObject(new PrincipalName(type, nameString).getEncoded()); + s.writeObject(ASN1StringType.GENERALSTRING.encode(realm)); } } Modified: harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/PrincipalName.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/PrincipalName.java?view=diff&rev=500954&r1=500953&r2=500954 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/PrincipalName.java (original) +++ harmony/enhanced/classlib/trunk/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/PrincipalName.java Sun Jan 28 23:13:47 2007 @@ -72,6 +72,10 @@ return name; } + public byte[] getEncoded() { + return ASN1.encode(this); + } + @Override public boolean equals(Object obj) { if (this == obj) { @@ -87,6 +91,10 @@ return type == that.type && Arrays.equals(that.name, name); } + public static PrincipalName instanceOf(byte[] enc) throws IOException { + return (PrincipalName) ASN1.decode(enc); + } + @Override public int hashCode() { return type + Arrays.hashCode(name); @@ -107,11 +115,11 @@ return buf.toString(); } - /** - * PrincipalName ::= SEQUENCE { name-type [0] Int32, name-string [1] - * SEQUENCE OF KerberosString } - */ - public static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] { + // PrincipalName ::= SEQUENCE { + // name-type [0] Int32, + // name-string [1] SEQUENCE OF KerberosString + // } + static final ASN1Sequence ASN1 = new ASN1Sequence(new ASN1Type[] { new ASN1Explicit(0, ASN1Integer.getInstance()), new ASN1Explicit(1, new ASN1SequenceOf(ASN1StringType.GENERALSTRING)), }) {