diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2001-06-12 15:00:40 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2001-06-12 15:00:40 +0000 |
| commit | c5ba710abb12c4742e978fce00f88c7c04e8bfd4 (patch) | |
| tree | 3b94ae54544e492a20b5927682c250c8cc57fe77 /src | |
| parent | 5a8a71616280869914154d895a446be58ec90405 (diff) | |
| download | krb5-c5ba710abb12c4742e978fce00f88c7c04e8bfd4.tar.gz krb5-c5ba710abb12c4742e978fce00f88c7c04e8bfd4.tar.xz krb5-c5ba710abb12c4742e978fce00f88c7c04e8bfd4.zip | |
* 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/asn.1/ChangeLog | 6 | ||||
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_k_decode.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index 87decd05b..7024cbfdd 100644 --- 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 845f92b51..bbb99b304 100644 --- 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; } |