more fcusack changes - rest of first set

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

diff --git a/src/lib/krb5/asn.1/ChangeLog b/src/lib/krb5/asn.1/ChangeLog
index c75e244ddcc50ebd1ed378b9a92f5b845235def5..68bbdeff30eeb73c58238f2f9c9d02acfd1bf99a 100644 (file)
--- a/src/lib/krb5/asn.1/ChangeLog
+++ b/src/lib/krb5/asn.1/ChangeLog
@@ -1,8 +1,13 @@
-2000-02-06  Ken Raeburn  <raeburn@raeburn.org>
+2000-02-06  Ken Raeburn  <raeburn@mit.edu>
 
+       Patches from Frank Cusack for helping in preauth replay
+       detection.
        * asn1_k_decode.c (asn1_decode_enc_sam_response_enc): Update for
        field name change.
-       * asn1_k_encode.c (asn1_encode_enc_sam_response_enc): Likewise.
+       (asn1_decode_predicted_sam_response): Handle new fields.
+       * asn1_k_encode.c (asn1_encode_enc_sam_response_enc): Update for
+       field name change.
+       (asn1_encode_predicted_sam_response): Handle new fields.
 
 2000-02-01  Danilo Almeida  <dalmeida@mit.edu>
 

diff --git a/src/lib/krb5/asn.1/asn1_k_decode.c b/src/lib/krb5/asn.1/asn1_k_decode.c
index 788dbf57518c291a86243275ed555018b1daddec..e9859773771d9d60ff7fffd8eea5cc6153b2bf6e 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_k_decode.c
+++ b/src/lib/krb5/asn.1/asn1_k_decode.c
@@ -829,6 +829,12 @@ 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);
+    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);
     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 8b02aa29a985e87fa26f2449a4d8b1dfd4ca26b7..2bc9b132c363ed5dd0d1bd29689f3f71c557d836 100644 (file)
--- a/src/lib/krb5/asn.1/asn1_k_encode.c
+++ b/src/lib/krb5/asn.1/asn1_k_encode.c
@@ -952,6 +952,11 @@ 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);
   asn1_addfield(&(val->sam_key),0,asn1_encode_encryption_key);
 
   asn1_makeseq();

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 054f69f94f011cc31de75b15bd5bc7d6958e8080..90d41760be33783121a9efb54fefbb48c0391f69 100644 (file)
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,5 +1,6 @@
 2000-02-06  Ken Raeburn  <raeburn@raeburn.org>
 
+       Patches from Frank Cusack:
        * kfree.c (krb5_free_predicted_sam_response_contents): Fix typo.
        Free new data fields if needed.
        (krb5_free_enc_sam_response_enc_contents): Update for field name