From: John Kohl <jtkohl@mit.edu>
Date: Wed, 10 Oct 1990 16:44:02 +0000 (+0000)
Subject: more REQ-BODY to separate top-level type
X-Git-Tag: krb5-1.0-alpha2~190
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=728cbb17600dd50bf2a09edca7f41efe60a73414;p=krb5.git

more REQ-BODY to separate top-level type

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@1221 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/asn.1/KRB5-asn.py b/src/lib/krb5/asn.1/KRB5-asn.py
index 6f425a877..93ebaa763 100644
--- a/src/lib/krb5/asn.1/KRB5-asn.py
+++ b/src/lib/krb5/asn.1/KRB5-asn.py
@@ -155,28 +155,20 @@ AS-REQ ::= [APPLICATION 10] SEQUENCE {
 	msg-type[2]	INTEGER,
 	padata-type[3]	INTEGER,
 	padata[4]	OCTET STRING OPTIONAL, -- encoded AP-REQ XXX optional
-	req-body[5]	SEQUENCE {
-	 kdc-options[0]	KDCOptions,
-	 cname[1]	PrincipalName OPTIONAL, -- Used only in AS-REQ
-	 realm[2]	Realm, -- Server's realm  Also client's in AS-REQ
-	 sname[3]	PrincipalName,
-	 from[4]	KerberosTime OPTIONAL,
-	 till[5]	KerberosTime,
-	 rtime[6]	KerberosTime OPTIONAL,
-	 ctime[7]	KerberosTime,
-	 nonce[8]	INTEGER,
-	 etype[9]	INTEGER, -- EncryptionType
-	 addresses[10]	HostAddresses OPTIONAL,
-	 authorization-data[11]	AuthorizationData OPTIONAL,
-	 additional-tickets[12]	SEQUENCE OF Ticket OPTIONAL
-	}
+	req-body[5]	KDC-REQ-BODY
 }
 TGS-REQ ::= [APPLICATION 12] SEQUENCE {
 	pvno[1]	INTEGER,
 	msg-type[2]	INTEGER,
 	padata-type[3]	INTEGER,
 	padata[4]	OCTET STRING, -- encoded AP-REQ
-	req-body[5]	SEQUENCE {
+	req-body[5]	KDC-REQ-BODY
+}
+-- the preceding two sequences MUST be the same except for the
+-- APPLICATION identifier
+
+-- XXX this needs to feed back into the draft.
+KDC-REQ-BODY ::=	SEQUENCE {
 	 kdc-options[0]	KDCOptions,
 	 cname[1]	PrincipalName OPTIONAL, -- Used only in AS-REQ
 	 realm[2]	Realm, -- Server's realm  Also client's in AS-REQ
@@ -190,10 +182,7 @@ TGS-REQ ::= [APPLICATION 12] SEQUENCE {
 	 addresses[10]	HostAddresses OPTIONAL,
 	 authorization-data[11]	AuthorizationData OPTIONAL,
 	 additional-tickets[12]	SEQUENCE OF Ticket OPTIONAL
-	}
 }
--- the preceding two sequences MUST be the same except for the
--- APPLICATION identifier
 
 -- the following two sequences MUST be the same except for the
 -- APPLICATION identifier