updates for cleaned-up ASN.1 on a few items

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

3 files changed, 55 insertions, 41 deletions

diff --git a/src/include/krb5/asn.1/KRB5-types-aux.h b/src/include/krb5/asn.1/KRB5-types-aux.h
index 9055bada03..00be520cff 100644
--- a/src/include/krb5/asn.1/KRB5-types-aux.h
+++ b/src/include/krb5/asn.1/KRB5-types-aux.h
@@ -50,12 +50,15 @@
 #undef encode_KRB5_TicketFlags
 #undef encode_KRB5_AS__REQ
 #undef encode_KRB5_TGS__REQ
+#undef encode_KRB5_KDC__REQ
 #undef encode_KRB5_PA__DATA
 #undef encode_KRB5_KDC__REQ__BODY
 #undef encode_KRB5_AS__REP
 #undef encode_KRB5_TGS__REP
+#undef encode_KRB5_KDC__REP
 #undef encode_KRB5_EncASRepPart
 #undef encode_KRB5_EncTGSRepPart
+#undef encode_KRB5_EncKDCRepPart
 #undef encode_KRB5_AP__REQ
 #undef encode_KRB5_APOptions
 #undef encode_KRB5_AP__REP
@@ -84,12 +87,15 @@
 #undef decode_KRB5_TicketFlags
 #undef decode_KRB5_AS__REQ
 #undef decode_KRB5_TGS__REQ
+#undef decode_KRB5_KDC__REQ
 #undef decode_KRB5_PA__DATA
 #undef decode_KRB5_KDC__REQ__BODY
 #undef decode_KRB5_AS__REP
 #undef decode_KRB5_TGS__REP
+#undef decode_KRB5_KDC__REP
 #undef decode_KRB5_EncASRepPart
 #undef decode_KRB5_EncTGSRepPart
+#undef decode_KRB5_EncKDCRepPart
 #undef decode_KRB5_AP__REQ
 #undef decode_KRB5_APOptions
 #undef decode_KRB5_AP__REP
@@ -114,12 +120,15 @@
 #undef free_KRB5_Authenticator
 #undef free_KRB5_AS__REQ
 #undef free_KRB5_TGS__REQ
+#undef free_KRB5_KDC__REQ
 #undef free_KRB5_PA__DATA
 #undef free_KRB5_KDC__REQ__BODY
 #undef free_KRB5_AS__REP
 #undef free_KRB5_TGS__REP
+#undef free_KRB5_KDC__REP
 #undef free_KRB5_EncASRepPart
 #undef free_KRB5_EncTGSRepPart
+#undef free_KRB5_EncKDCRepPart
 #undef free_KRB5_AP__REQ
 #undef free_KRB5_AP__REP
 #undef free_KRB5_EncAPRepPart
@@ -149,12 +158,15 @@ int encode_KRB5_Authenticator P_TYPE_((PE *, int , integer , char *, struct type
 int encode_KRB5_TicketFlags P_TYPE_((PE *, int , integer , char *, struct type_KRB5_TicketFlags *));
 int encode_KRB5_AS__REQ P_TYPE_((PE *, int , integer , char *, struct type_KRB5_AS__REQ *));
 int encode_KRB5_TGS__REQ P_TYPE_((PE *, int , integer , char *, struct type_KRB5_TGS__REQ *));
+int encode_KRB5_KDC__REQ P_TYPE_((PE *, int , integer , char *, struct type_KRB5_KDC__REQ *));
 int encode_KRB5_PA__DATA P_TYPE_((PE *, int , integer , char *, struct type_KRB5_PA__DATA *));
 int encode_KRB5_KDC__REQ__BODY P_TYPE_((PE *, int , integer , char *, struct type_KRB5_KDC__REQ__BODY *));
 int encode_KRB5_AS__REP P_TYPE_((PE *, int , integer , char *, struct type_KRB5_AS__REP *));
 int encode_KRB5_TGS__REP P_TYPE_((PE *, int , integer , char *, struct type_KRB5_TGS__REP *));
+int encode_KRB5_KDC__REP P_TYPE_((PE *, int , integer , char *, struct type_KRB5_KDC__REP *));
 int encode_KRB5_EncASRepPart P_TYPE_((PE *, int , integer , char *, struct type_KRB5_EncASRepPart *));
 int encode_KRB5_EncTGSRepPart P_TYPE_((PE *, int , integer , char *, struct type_KRB5_EncTGSRepPart *));
+int encode_KRB5_EncKDCRepPart P_TYPE_((PE *, int , integer , char *, struct type_KRB5_EncKDCRepPart *));
 int encode_KRB5_AP__REQ P_TYPE_((PE *, int , integer , char *, struct type_KRB5_AP__REQ *));
 int encode_KRB5_APOptions P_TYPE_((PE *, int , integer , char *, struct type_KRB5_APOptions *));
 int encode_KRB5_AP__REP P_TYPE_((PE *, int , integer , char *, struct type_KRB5_AP__REP *));
@@ -182,13 +194,16 @@ int decode_KRB5_EncTicketPart P_TYPE_((PE , int , integer *, char **, struct typ
 int decode_KRB5_Authenticator P_TYPE_((PE , int , integer *, char **, struct type_KRB5_Authenticator **));
 int decode_KRB5_TicketFlags P_TYPE_((PE , int , integer *, char **, struct type_KRB5_TicketFlags **));
 int decode_KRB5_AS__REQ P_TYPE_((PE , int , integer *, char **, struct type_KRB5_AS__REQ **));
+int decode_KRB5_KDC__REQ P_TYPE_((PE , int , integer *, char **, struct type_KRB5_KDC__REQ **));
 int decode_KRB5_TGS__REQ P_TYPE_((PE , int , integer *, char **, struct type_KRB5_TGS__REQ **));
 int decode_KRB5_PA__DATA P_TYPE_((PE , int , integer *, char **, struct type_KRB5_PA__DATA **));
 int decode_KRB5_KDC__REQ__BODY P_TYPE_((PE , int , integer *, char **, struct type_KRB5_KDC__REQ__BODY **));
 int decode_KRB5_AS__REP P_TYPE_((PE , int , integer *, char **, struct type_KRB5_AS__REP **));
 int decode_KRB5_TGS__REP P_TYPE_((PE , int , integer *, char **, struct type_KRB5_TGS__REP **));
+int decode_KRB5_KDC__REP P_TYPE_((PE , int , integer *, char **, struct type_KRB5_KDC__REP **));
 int decode_KRB5_EncASRepPart P_TYPE_((PE , int , integer *, char **, struct type_KRB5_EncASRepPart **));
 int decode_KRB5_EncTGSRepPart P_TYPE_((PE , int , integer *, char **, struct type_KRB5_EncTGSRepPart **));
+int decode_KRB5_EncKDCRepPart P_TYPE_((PE , int , integer *, char **, struct type_KRB5_EncKDCRepPart **));
 int decode_KRB5_AP__REQ P_TYPE_((PE , int , integer *, char **, struct type_KRB5_AP__REQ **));
 int decode_KRB5_APOptions P_TYPE_((PE , int , integer *, char **, struct type_KRB5_APOptions **));
 int decode_KRB5_AP__REP P_TYPE_((PE , int , integer *, char **, struct type_KRB5_AP__REP **));
@@ -214,12 +229,15 @@ void free_KRB5_EncTicketPart P_TYPE_((struct type_KRB5_EncTicketPart *));
 void free_KRB5_Authenticator P_TYPE_((struct type_KRB5_Authenticator *));
 void free_KRB5_AS__REQ P_TYPE_((struct type_KRB5_AS__REQ *));
 void free_KRB5_TGS__REQ P_TYPE_((struct type_KRB5_TGS__REQ *));
+void free_KRB5_KDC__REQ P_TYPE_((struct type_KRB5_KDC__REQ *));
 void free_KRB5_PA__DATA P_TYPE_((struct type_KRB5_PA__DATA *));
 void free_KRB5_KDC__REQ__BODY P_TYPE_((struct type_KRB5_KDC__REQ__BODY *));
 void free_KRB5_AS__REP P_TYPE_((struct type_KRB5_AS__REP *));
 void free_KRB5_TGS__REP P_TYPE_((struct type_KRB5_TGS__REP *));
+void free_KRB5_KDC__REP P_TYPE_((struct type_KRB5_KDC__REP *));
 void free_KRB5_EncASRepPart P_TYPE_((struct type_KRB5_EncASRepPart *));
 void free_KRB5_EncTGSRepPart P_TYPE_((struct type_KRB5_EncTGSRepPart *));
+void free_KRB5_EncKDCRepPart P_TYPE_((struct type_KRB5_EncKDCRepPart *));
 void free_KRB5_AP__REQ P_TYPE_((struct type_KRB5_AP__REQ *));
 void free_KRB5_AP__REP P_TYPE_((struct type_KRB5_AP__REP *));
 void free_KRB5_EncAPRepPart P_TYPE_((struct type_KRB5_EncAPRepPart *));
diff --git a/src/include/krb5/asn.1/asn1defs.h b/src/include/krb5/asn.1/asn1defs.h
index 0a228e6e1b..ff13105b98 100644
--- a/src/include/krb5/asn.1/asn1defs.h
+++ b/src/include/krb5/asn.1/asn1defs.h
@@ -69,8 +69,8 @@ krb5_enc_data *KRB5_EncryptedData2krb5_enc_data
 	PROTOTYPE((const struct type_KRB5_EncryptedData *, int *));
 
 /* ekrp2kekrp.c */
-krb5_enc_kdc_rep_part *KRB5_EncTGSRepPart2krb5_enc_kdc_rep_part
-	PROTOTYPE((const struct type_KRB5_EncTGSRepPart *, int *));
+krb5_enc_kdc_rep_part *KRB5_EncKDCRepPart2krb5_enc_kdc_rep_part
+	PROTOTYPE((const struct type_KRB5_EncKDCRepPart *, int *));
 
 /* enck2kkey.c */
 krb5_keyblock *KRB5_EncryptionKey2krb5_keyblock
@@ -112,10 +112,6 @@ struct type_KRB5_AP__REQ *krb5_ap_req2KRB5_AP__REQ
 struct type_KRB5_EncAPRepPart *krb5_ap_rep_enc_part2KRB5_EncAPRepPart
 	PROTOTYPE((const krb5_ap_rep_enc_part *, int *));
 
-/* kasrp2kdcr.c */
-struct type_KRB5_AS__REP *krb5_as_rep2KRB5_KDC__REP
-	PROTOTYPE((const krb5_kdc_rep *, int *));
-
 /* kauth2auth.c */
 struct type_KRB5_Authenticator *krb5_authenticator2KRB5_Authenticator
 	PROTOTYPE((const krb5_authenticator *, int *));
@@ -124,10 +120,6 @@ struct type_KRB5_Authenticator *krb5_authenticator2KRB5_Authenticator
 struct type_KRB5_Checksum *krb5_checksum2KRB5_Checksum
 	PROTOTYPE((const krb5_checksum *, int *));
 
-/* kdcr2kasrp.c */
-krb5_kdc_rep *KRB5_KDC__REP2krb5_as_rep
-	PROTOTYPE((const struct type_KRB5_AS__REP *, int *));
-
 /* kdcr2kkdcr.c */
 krb5_kdc_rep *KRB5_KDC__REP2krb5_kdc_rep
 	PROTOTYPE((const struct type_KRB5_TGS__REP *, int *));
@@ -141,7 +133,7 @@ struct type_KRB5_EncryptedData *krb5_enc_data2KRB5_EncryptedData
 	PROTOTYPE((const krb5_enc_data *, int *));
 
 /* kekrp2ekrp.c */
-struct type_KRB5_EncTGSRepPart *krb5_enc_kdc_rep_part2KRB5_EncTGSRepPart
+struct type_KRB5_EncKDCRepPart *krb5_enc_kdc_rep_part2KRB5_EncKDCRepPart
 	PROTOTYPE((const krb5_enc_kdc_rep_part *, int *));
 
 /* kerr2err.c */
@@ -179,7 +171,7 @@ struct type_KRB5_KRB__SAFE *krb5_safe2KRB5_KRB__SAFE
 /* ktgrq2tgrq.c */
 struct type_KRB5_KDC__REQ__BODY *krb5_kdc_req2KRB5_KDC__REQ__BODY
 	PROTOTYPE((const krb5_kdc_req *, int *));
-struct type_KRB5_TGS__REQ *krb5_kdc_req2KRB5_TGS__REQ
+struct type_KRB5_KDC__REQ *krb5_kdc_req2KRB5_KDC__REQ
 	PROTOTYPE((const krb5_kdc_req *, int *));
 
 /* ktgsr2kdcr.c */
@@ -217,8 +209,8 @@ krb5_safe *KRB5_KRB__SAFE2krb5_safe
 /* tgrq2ktgrq.c */
 krb5_kdc_req *KRB5_KDC__REQ__BODY2krb5_kdc_req
 	PROTOTYPE((const struct type_KRB5_KDC__REQ__BODY *, int *));
-krb5_kdc_req *KRB5_TGS__REQ2krb5_kdc_req
-	PROTOTYPE((const struct type_KRB5_TGS__REQ *, int *));
+krb5_kdc_req *KRB5_KDC__REQ2krb5_kdc_req
+	PROTOTYPE((const struct type_KRB5_KDC__REQ *, int *));
 
 /* tkt2ktkt.c */
 krb5_ticket *KRB5_Ticket2krb5_ticket
diff --git a/src/include/krb5/asn.1/encode.h b/src/include/krb5/asn.1/encode.h
index d77c96cfe4..7e7ad52f80 100644
--- a/src/include/krb5/asn.1/encode.h
+++ b/src/include/krb5/asn.1/encode.h
@@ -49,26 +49,6 @@ krb5_error_code krb5_decode_generic
 		   translator_func,
 		   free_func));
 
-/* decode_arp.c */
-krb5_error_code decode_krb5_as_rep
-	PROTOTYPE((krb5_data *,
-		   krb5_kdc_rep **));
-
-/* decode_arq.c */
-krb5_error_code decode_krb5_as_req
-	PROTOTYPE((krb5_data *,
-		   krb5_kdc_req **));
-
-/* encode_arp.c */
-krb5_error_code encode_krb5_as_rep
-	PROTOTYPE((const krb5_kdc_rep *,
-		   krb5_data **));
-
-/* encode_arq.c */
-krb5_error_code encode_krb5_as_req
-	PROTOTYPE((const krb5_kdc_req *,
-		   krb5_data **));
-
 #define encode_krb5_authenticator(pauth, output) \
     krb5_encode_generic((krb5_const_pointer)pauth,  output, \
 		   (encoder_func) encode_KRB5_Authenticator, \
@@ -105,23 +85,36 @@ krb5_error_code encode_krb5_as_req
 #define encode_krb5_enc_kdc_rep_part(req, output) \
     krb5_encode_generic((krb5_const_pointer)req, output, \
 		   (encoder_func) encode_KRB5_EncTGSRepPart, \
-		   (translator_func) krb5_enc_kdc_rep_part2KRB5_EncTGSRepPart, \
+		   (translator_func) krb5_enc_kdc_rep_part2KRB5_EncKDCRepPart, \
 		   (free_func) free_KRB5_EncTGSRepPart)
 #define decode_krb5_enc_kdc_rep_part(req, output) \
     krb5_decode_generic(req, (krb5_pointer *) output, \
 		   (decoder_func) decode_KRB5_EncTGSRepPart, \
-		   (translator_func) KRB5_EncTGSRepPart2krb5_enc_kdc_rep_part, \
+		   (translator_func) KRB5_EncKDCRepPart2krb5_enc_kdc_rep_part, \
 		   (free_func) free_KRB5_EncTGSRepPart)
 
+/* yes, the translation is identical to that used for KDC__REP */ 
+#define encode_krb5_as_rep(req, output) \
+    krb5_encode_generic((krb5_const_pointer)req, output, \
+		   (encoder_func) encode_KRB5_AS__REP, \
+		   (translator_func) krb5_kdc_rep2KRB5_KDC__REP, \
+		   (free_func) free_KRB5_AS__REP)
+#define decode_krb5_as_rep(req, output) \
+    krb5_decode_generic(req, (krb5_pointer *) output, \
+		   (decoder_func) decode_KRB5_AS__REP, \
+		   (translator_func) KRB5_KDC__REP2krb5_kdc_rep, \
+		   (free_func) free_KRB5_AS__REP)
+
+/* yes, the translation is identical to that used for KDC__REP */ 
 #define encode_krb5_tgs_rep(req, output) \
     krb5_encode_generic((krb5_const_pointer)req, output, \
 		   (encoder_func) encode_KRB5_TGS__REP, \
-		   (translator_func) krb5_tgs_rep2KRB5_KDC__REP, \
+		   (translator_func) krb5_kdc_rep2KRB5_KDC__REP, \
 		   (free_func) free_KRB5_TGS__REP)
 #define decode_krb5_tgs_rep(req, output) \
     krb5_decode_generic(req, (krb5_pointer *) output, \
 		   (decoder_func) decode_KRB5_TGS__REP, \
-		   (translator_func) KRB5_KDC__REP2krb5_tgs_rep, \
+		   (translator_func) KRB5_KDC__REP2krb5_kdc_rep, \
 		   (free_func) free_KRB5_TGS__REP)
 
 #define encode_krb5_ap_req(req, output) \
@@ -157,15 +150,26 @@ krb5_error_code encode_krb5_as_req
 		    (translator_func) KRB5_EncAPRepPart2krb5_ap_rep_enc_part, \
 		    (free_func) free_KRB5_EncAPRepPart)
 
+#define encode_krb5_as_req(pauth, output) \
+    krb5_encode_generic((krb5_const_pointer)pauth,  output, \
+		   (encoder_func) encode_KRB5_AS__REQ, \
+		   (translator_func) krb5_kdc_req2KRB5_KDC__REQ, \
+		   (free_func) free_KRB5_AS__REQ)
+#define decode_krb5_as_req(pauth, output) \
+    krb5_decode_generic(pauth, (krb5_pointer *) output, \
+		   (decoder_func) decode_KRB5_AS__REQ, \
+		   (translator_func) KRB5_KDC__REQ2krb5_kdc_req, \
+		   (free_func) free_KRB5_AS__REQ)
+
 #define encode_krb5_tgs_req(req, output) \
     krb5_encode_generic((krb5_const_pointer)req, output, \
 		   (encoder_func) encode_KRB5_TGS__REQ, \
-		   (translator_func) krb5_kdc_req2KRB5_TGS__REQ, \
+		   (translator_func) krb5_kdc_req2KRB5_KDC__REQ, \
 		   (free_func) free_KRB5_TGS__REQ)
 #define decode_krb5_tgs_req(req, output) \
     krb5_decode_generic(req, (krb5_pointer *) output, \
 		   (decoder_func) decode_KRB5_TGS__REQ, \
-		   (translator_func) KRB5_TGS__REQ2krb5_kdc_req, \
+		   (translator_func) KRB5_KDC__REQ2krb5_kdc_req, \
 		   (free_func) free_KRB5_TGS__REQ)
 
 #define encode_krb5_kdc_req_body(req, output) \
@@ -175,7 +179,7 @@ krb5_error_code encode_krb5_as_req
 		   (free_func) free_KRB5_KDC__REQ__BODY)
 #define decode_krb5_kdc_req_body(req, output) \
     krb5_decode_generic(req, (krb5_pointer *) output, \
-		   (decoder_func) decode_KRB5_TGS__REQ__BODY, \
+		   (decoder_func) decode_KRB5_KDC__REQ__BODY, \
 		   (translator_func) KRB5_KDC__REQ__BODY2krb5_kdc_req, \
 		   (free_func) free_KRB5_KDC__REQ__BODY)