Decode pa_type in the krb5_pa_data structure as a krb5_int32, since it

is now type krb5_preauthtype.

Decode etype in the krb5_etype_info_entry as krb5_enctype.

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

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 9101355449589fcf8282136a645ef2bb748670a1..583dd6872094a2cb0111866f881c3d8235fe824f 100644 (file)
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,5 +1,10 @@
 Wed Mar 20 22:43:17 1996  Theodore Y. Ts'o  <tytso@dcl>
 
+       * asn1_k_decode.c: Decode pa_type in the krb5_pa_data structure as
+               a krb5_int32, since it is now type krb5_preauthtype.
+               (asn1_decode_etype_info_entry): Decode etype in the
+               krb5_etype_info_entry as krb5_enctype.
+
        * krb5_decode.c (decode_krb5_pa_enc_ts): Fix 16 bit vs. 32bit
                error in the encoded timestamp structure.
 

diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c
index dac9a4c79eeda671b5b4bf6a5ad00e673e99149e..2d8654a2027dfabf16d90a584e3763adb7c38bfe 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_k_decode.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode.c
@@ -603,7 +603,7 @@ asn1_error_code asn1_decode_pa_data(buf, val)
 {
   setup();
   { begin_structure();
-    get_field(val->pa_type,1,asn1_decode_ui_2);
+    get_field(val->pa_type,1,asn1_decode_int32);
     get_lenfield(val->length,val->contents,2,asn1_decode_octetstring);
     end_structure();
     val->magic = KV5M_PA_DATA;
@@ -661,7 +661,7 @@ asn1_error_code asn1_decode_etype_info_entry(buf, val)
 {
   setup();
   { begin_structure();
-    get_field(val->etype,0,asn1_decode_ui_4);
+    get_field(val->etype,0,asn1_decode_enctype);
     if (tagnum == 1) {
            get_lenfield(val->length,val->salt,1,asn1_decode_octetstring);
     } else {