k5-int.h: Added clockskew, kdc_req_sumtype, and kdc_default_options to

	the krb5_context structure.

krb5.hin: Added expected nonce and request_time fields to the
	krb5_response structure.  The fields are used to pass information
	from krb5_send_tgs() to krb5_get_cred_via_tkt() so that it can do
	sanity checking.

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 42c0913da3bfb6cc666f0bbe3546290f06a32f50..22dfcdf016cc5316083b938537946a554582442f 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,5 +1,13 @@
 Fri Sep  1 00:44:59 1995  Theodore Y. Ts'o  <tytso@dcl>
 
+       * k5-int.h: Added clockskew, kdc_req_sumtype, and
+               kdc_default_options to the krb5_context structure.
+
+       * krb5.hin: Added expected nonce and request_time fields to the
+               krb5_response structure.  The fields are used to pass
+               information from krb5_send_tgs() to
+               krb5_get_cred_via_tkt() so that it can do sanity checking.
+
        * k5-int.h: Add time offset field to the os_context structure.
                This offset is added to the system clock time to produce
                the "true" time.  

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index d4031dd12ebded1bd845a8b8e92841608a8b7e1e..e70dd97c9625a96a2f7e366f65fda4b0fd9548ad 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -891,16 +891,22 @@ typedef unsigned long profile_t;
 
 struct _krb5_context {
        krb5_magic      magic;
-       krb5_enctype  FAR *etypes;
+       krb5_enctype    FAR *etypes;
        int             etype_count;
-       void          FAR *os_context;
-       char          FAR *default_realm;
-       profile_t     profile;
-       void          FAR *db_context;
+       void            FAR *os_context;
+       char            FAR *default_realm;
+       profile_t       profile;
+       void            FAR *db_context;
        int             ser_ctx_count;
-       void          FAR *ser_ctx;
+       void            FAR *ser_ctx;
+       krb5_deltat     clockskew; /* allowable clock skew */
+       krb5_cksumtype  kdc_req_sumtype;
+       krb5_flags      kdc_default_options;
+       krb5_flags      library_options;
 };
 
+#define KRB5_LIBOPT_SYNC_KDCTIME       0x0001
+
 /*
  * Begin "asn1.h"
  */

diff --git a/src/include/krb5.hin b/src/include/krb5.hin
index 76a2a36d8680cbd93259ae00d21c027b6ad0d319..bbb2533d63c098d342d0fafb0d907c293c4002c1 100644 (file)
--- a/src/include/krb5.hin
+++ b/src/include/krb5.hin
@@ -874,6 +874,8 @@ typedef struct _krb5_response {
     krb5_magic magic;
     krb5_octet message_type;
     krb5_data response;
+    krb5_int32 expected_nonce; /* The expected nonce for KDC_REP messages */
+    krb5_timestamp request_time;   /* When we made the request */
 } krb5_response;
 
 typedef struct _krb5_safe {