diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-02-07 03:54:51 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-02-07 03:54:51 +0000 |
| commit | 0ae4a76a7a6b52210e4ee65fad298d9f5c1d484b (patch) | |
| tree | 1b70d88aa8c28469307e31f6dba5db0904ae8e8a /src/lib | |
| parent | 356a4b0ff46e03b30ff6c880443934572a54202d (diff) | |
added flags field to predicted_sam_response (fcusack)
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12008 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/krb5/asn.1/ChangeLog | 2 | ||||
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_k_decode.c | 11 | ||||
| -rw-r--r-- | src/lib/krb5/asn.1/asn1_k_encode.c | 11 |
3 files changed, 13 insertions, 11 deletions
diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog index 68bbdeff30..96f7098634 100644 --- a/src/lib/krb5/asn.1/ChangeLog +++ b/src/lib/krb5/asn.1/ChangeLog @@ -1,7 +1,7 @@ 2000-02-06 Ken Raeburn <raeburn@mit.edu> Patches from Frank Cusack for helping in preauth replay - detection. + detection and spec (passwd-04 draft) compliance. * asn1_k_decode.c (asn1_decode_enc_sam_response_enc): Update for field name change. (asn1_decode_predicted_sam_response): Handle new fields. diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c index e985977377..6f72d8e122 100644 --- a/src/lib/krb5/asn.1/asn1_k_decode.c +++ b/src/lib/krb5/asn.1/asn1_k_decode.c @@ -829,12 +829,13 @@ asn1_error_code asn1_decode_predicted_sam_response(buf, val) setup(); { begin_structure(); get_field(val->sam_key,0,asn1_decode_encryption_key); - get_field(val->stime,1,asn1_decode_kerberos_time); - get_field(val->susec,2,asn1_decode_int32); + get_field(val->sam_flags,1,asn1_decode_sam_flags); + get_field(val->stime,2,asn1_decode_kerberos_time); + get_field(val->susec,3,asn1_decode_int32); alloc_field(val->client,krb5_principal_data); - get_field(val->client,3,asn1_decode_realm); - get_field(val->client,4,asn1_decode_principal_name); - opt_string(val->msd,5,asn1_decode_octectstring); + 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); end_structure(); val->magic = KV5M_PREDICTED_SAM_RESPONSE; } diff --git a/src/lib/krb5/asn.1/asn1_k_encode.c b/src/lib/krb5/asn.1/asn1_k_encode.c index 2bc9b132c3..20857cd4f9 100644 --- a/src/lib/krb5/asn.1/asn1_k_encode.c +++ b/src/lib/krb5/asn.1/asn1_k_encode.c @@ -952,11 +952,12 @@ asn1_error_code asn1_encode_predicted_sam_response(buf, val, retlen) { asn1_setup(); - add_optstring(val->msd,5,asn1_encode_octetstring); - asn1_addfield(val->client,4,asn1_encode_principal_name); - asn1_addfield(val->client,3,asn1_encode_realm); - asn1_addfield(val->susec,2,asn1_encode_integer); - asn1_addfield(val->stime,1,asn1_encode_kerberos_time); + add_optstring(val->msd,6,asn1_encode_octetstring); + asn1_addfield(val->client,5,asn1_encode_principal_name); + asn1_addfield(val->client,4,asn1_encode_realm); + asn1_addfield(val->susec,3,asn1_encode_integer); + asn1_addfield(val->stime,2,asn1_encode_kerberos_time); + asn1_addfield(val->sam_flags,1,asn1_encode_sam_flags); asn1_addfield(&(val->sam_key),0,asn1_encode_encryption_key); asn1_makeseq(); |