* asn1_k_decode.c (asn1_decode_predicted_sam_response): Use

	asn1_decode_charstring() instead of asn1_decode_octetstring() to
	decode krb5_data.

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

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index 87decd05bb87b23c619e53c781eaee64fd771982..7024cbfdd5a10ced09cde5532fa2b12daf910286 100644 (file)
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,3 +1,9 @@
+2001-06-12  Ezra Peisach  <epeisach@mit.edu>
+
+       * asn1_k_decode.c (asn1_decode_predicted_sam_response): Use
+       asn1_decode_charstring() instead of asn1_decode_octetstring() to
+       decode krb5_data.
+
 2000-10-26  Tom Yu  <tlyu@mit.edu>
 
        * asn1buf.c (asn1buf_sync): Add new arguments to include the full

diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c
index 845f92b51e597177977b6659121a23b06c759373..bbb99b3044c4f3d159b2c4638cac2a9957ed7b1d 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_k_decode.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode.c
@@ -36,7 +36,7 @@ asn1_construction construction;\
 asn1_tagnum tagnum;\
 unsigned int length,taglen
 
-#define unused_var(x) if(0) x=0
+#define unused_var(x) if(0) {x=0; x=x-x;}
 
 #define next_tag()\
 retval = asn1_get_tag_indef(&subbuf,&class,&construction,\
@@ -887,7 +887,7 @@ asn1_error_code asn1_decode_predicted_sam_response(buf, val)
     alloc_field(val->client,krb5_principal_data);
     get_field(val->client,4,asn1_decode_realm);
     get_field(val->client,5,asn1_decode_principal_name);
-    opt_string(val->msd,6,asn1_decode_octetstring);
+    opt_string(val->msd,6,asn1_decode_charstring); /* should be octet */
     end_structure();
     val->magic = KV5M_PREDICTED_SAM_RESPONSE;
   }