diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2000-02-07 00:18:02 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2000-02-07 00:18:02 +0000 |
| commit | 0d55ad7285d5d52e9c8133213a9614afe2431d65 (patch) | |
| tree | 8c48421d9f34aed2ca3e24e89c43bb5d9f8c75ad /src/include | |
| parent | 2b426291e60da4555aae4c20f697431185842095 (diff) | |
| download | krb5-0d55ad7285d5d52e9c8133213a9614afe2431d65.tar.gz krb5-0d55ad7285d5d52e9c8133213a9614afe2431d65.tar.xz krb5-0d55ad7285d5d52e9c8133213a9614afe2431d65.zip | |
Frank Cusack changes, set 1, diffs 1-3 of 4
Rename "sam_passcode" field to "sam_sad". Add data to predicted-sam-response
structure, in part to (prepare to) help with replay detection.
Fix some memory allocation problems.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@12005 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ChangeLog | 7 | ||||
| -rw-r--r-- | src/include/k5-int.h | 7 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/include/ChangeLog b/src/include/ChangeLog index 52948ae7b..bbc0bf9b5 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,10 @@ +2000-02-06 Ken Raeburn <raeburn@mit.edu> + + Patches from Frank Cusack for hw preauth. + * k5-int.h (krb5_predicted_sam_response): Add timestamp, client + principal, and per-mechanism data fields. + (krb5_enc_sam_response_enc): Change "passcode" field to "sad". + 2000-02-01 Danilo Almeida <dalmeida@mit.edu> * krb5.hin (krb5_decode_ticket): Declare. diff --git a/src/include/k5-int.h b/src/include/k5-int.h index 419946d6c..41a588b32 100644 --- a/src/include/k5-int.h +++ b/src/include/k5-int.h @@ -356,6 +356,11 @@ typedef krb5_etype_info_entry ** krb5_etype_info; typedef struct _krb5_predicted_sam_response { krb5_magic magic; krb5_keyblock sam_key; + krb5_timestamp stime; /* time on server, for replay detection */ + krb5_int32 susec; + krb5_principal client; + krb5_data msd; /* mechanism specific data */ + } krb5_predicted_sam_response; typedef struct _krb5_sam_challenge { @@ -382,7 +387,7 @@ typedef struct _krb5_enc_sam_response_enc { krb5_int32 sam_nonce; krb5_timestamp sam_timestamp; krb5_int32 sam_usec; - krb5_data sam_passcode; + krb5_data sam_sad; } krb5_enc_sam_response_enc; typedef struct _krb5_sam_response { |