r18022@luminous: jaltman | 2006-05-19 05:18:37 -0400

 Updates of portable CCAPI sources.   All code compiles.
 
 
 r18025@luminous:  jaltman | 2006-05-20 23:48:39 -0400
 Construct an outline of a sample platform specific main.c
 
 Add ccs_serv_cleanup() routine.  Currently does nothing.
 
 Correct field names used within the authorization check.
 
 
 r18026@luminous:  jaltman | 2006-05-22 02:25:43 -0400
 More byte order conversions in the server operations code.
 
 
 
 r18027@luminous:  jaltman | 2006-05-22 13:12:49 -0400
 Source files containing common routines used by both 
 the client and the server.
 
 
 
 r18028@luminous:  jaltman | 2006-05-22 13:17:07 -0400
 Move msg.c and marshall.c to common library.
 
 Add dllmain.c which contains the Windows DllMain() entry 
 point.  This must be moved later to a Windows specific 
 directory.
 
 Cleanup type usage and function name references.  
 
 All that is missing now from the client DLL is a definition
 of cci_perform_rpc() which is the entry point to the IPC
 routine.
 
 
 r18029@luminous:  jaltman | 2006-05-22 13:18:27 -0400
 Move generic list functions to common/generic_lists.c
 so they can be used by both the client dll and the server.
 
 Fix type utilization in serv_ops.c
 
 
 r18083@luminous:  jaltman | 2006-06-05 13:49:34 -0400
 improved error handling
 
 
 r18094@luminous:  jaltman | 2006-06-09 10:42:04 -0400
 * corrections to windows rpc layer
 
 * corrections to network byte order conversions
 
 
 r18095@luminous:  lxs | 2006-06-09 17:46:24 -0400
 cci_msg_retrieve_blob(): changed argument 4 from void** to char** 
 to suppress the warnings from gcc.
 
 r18096@luminous:  lxs | 2006-06-09 17:55:32 -0400
 moved enum cc_list_type to generic_lists.h to avoid "incomplete enum" 
 warnings when compiling generic_lists.c
 
 r18097@luminous:  lxs | 2006-06-09 17:56:15 -0400
 Removed ancient Metrowerks tests from public headers.
 
 r18098@luminous:  lxs | 2006-06-09 17:57:20 -0400
 Include string.h to get memcpy, strlen, etc on BSD OSes.
 
 r18099@luminous:  lxs | 2006-06-09 17:59:36 -0400
 Added Mac OS X project file and Mach-IPC support code
 
 
 r18106@luminous:  jaltman | 2006-06-12 09:56:31 -0400
 remove duplicate header file and obsolete source file
 
 
 r18193@luminous:  jaltman | 2006-06-22 12:57:14 -0400
 This commit updates lib/krb5/ccache/ccapi to support CCAPI Version 3
 and above.  Specify -DUSE_CCAPI_V3=1 when compiling to use CCAPI Version 3
 
 
 r18194@luminous:  jaltman | 2006-06-22 12:58:37 -0400
 Fix parameter name in cc_credentials_iterator_t next()
 
 
 r18195@luminous:  jaltman | 2006-06-22 12:59:08 -0400
 Add missing header
 
 
 r18196@luminous:  jaltman | 2006-06-22 13:11:37 -0400
 Use the old exported names for setup and shutdown
 
 
 r18197@luminous:  jaltman | 2006-06-22 13:18:14 -0400
 krb5_stdccv3_setup is ok
 
 

=== Please enter your commit message above this line ===

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

1 files changed, 31 insertions, 42 deletions

diff --git a/src/lib/ccapi/include/msg_headers.h b/src/lib/ccapi/include/msg_headers.h
index a27c2d2f12..b5a9acd6d5 100644
--- a/src/lib/ccapi/include/msg_headers.h
+++ b/src/lib/ccapi/include/msg_headers.h
@@ -1,6 +1,6 @@
 /* $Copyright:
  *
- * Copyright 2004 by the Massachusetts Institute of Technology.
+ * Copyright 2004-2006 by the Massachusetts Institute of Technology.
  * 
  * All rights reserved.
  * 
@@ -57,6 +57,8 @@
  * size divisible by 4. This is to ensure correct alignment
  * and stop different compilers from inserting padding bytes in
  * different places.
+ *
+ * All values are stored in network byte order.
  */
 
 struct ccmsg_ctx_only_t {
@@ -81,18 +83,18 @@ struct ccmsg_init_resp_t {
 typedef struct ccmsg_init_t ccmsg_init_t;
 typedef struct ccmsg_init_resp_t ccmsg_init_resp_t;
 
-struct ccmsg_clone_t {
+struct ccmsg_ctx_clone_t {
     cc_handle   ctx;
     cc_uint32	in_version;		/*client API version*/
 };
-struct ccmsg_clone_resp_t {
+struct ccmsg_ctx_clone_resp_t {
     cc_handle	out_ctx;		/*handle on this ctx*/
     cc_uint32	out_version;		/*server API version*/
     cc_uint32	vendor_offset;		/*offset of vendor blob*/
     cc_uint32	vendor_length;		/*length of vendor blob*/
 };      
-typedef struct ccmsg_clone_t ccmsg_clone_t;
-typedef struct ccmsg_clone_resp_t ccmsg_clone_resp_t;
+typedef struct ccmsg_ctx_clone_t ccmsg_ctx_clone_t;
+typedef struct ccmsg_ctx_clone_resp_t ccmsg_ctx_clone_resp_t;
 
 struct ccmsg_ctx_release_t {
     cc_handle 	ctx;	/*# of ctx to release*/
@@ -103,7 +105,7 @@ struct ccmsg_ctx_get_change_time_t {
     cc_handle	ctx;
 };
 struct ccmsg_ctx_get_change_time_resp_t {
-    cc_time_t	time;
+    cc_time64	time;
 };
 typedef struct ccmsg_ctx_get_change_time_t ccmsg_ctx_get_change_time_t;
 typedef struct ccmsg_ctx_get_change_time_resp_t ccmsg_ctx_get_change_time_resp_t;
@@ -304,7 +306,7 @@ struct ccmsg_ccache_get_last_default_time_t {
     cc_handle	ccache;
 };
 struct ccmsg_ccache_get_last_default_time_resp_t {
-    cc_time_t	last_default_time;
+    cc_time64	last_default_time;
 };
 typedef struct ccmsg_ccache_get_last_default_time_t ccmsg_ccache_get_last_default_time_t;
 typedef struct ccmsg_ccache_get_last_default_time_resp_t ccmsg_ccache_get_last_default_time_resp_t;
@@ -314,7 +316,7 @@ struct ccmsg_ccache_get_change_time_t {
     cc_handle	ccache;
 };
 struct ccmsg_ccache_get_change_time_resp_t {
-    cc_time_t	time;
+    cc_time64	time;
 };
 typedef struct ccmsg_ccache_get_change_time_t ccmsg_ccache_get_change_time_t;
 typedef struct ccmsg_ccache_get_change_time_resp_t ccmsg_ccache_get_change_time_resp_t;
@@ -336,7 +338,7 @@ struct ccmsg_ccache_get_kdc_time_offset_t {
     cc_int32    creds_version;
 };      
 struct ccmsg_ccache_get_kdc_time_offset_resp_t {
-    cc_time_t	offset;
+    cc_time64	offset;
 };
 typedef struct ccmsg_ccache_get_kdc_time_offset_t ccmsg_ccache_get_kdc_time_offset_t;
 typedef struct ccmsg_ccache_get_kdc_time_offset_resp_t ccmsg_ccache_get_kdc_time_offset_resp_t;
@@ -344,7 +346,7 @@ typedef struct ccmsg_ccache_get_kdc_time_offset_resp_t ccmsg_ccache_get_kdc_time
 struct ccmsg_ccache_set_kdc_time_offset_t {
     cc_handle	ctx;
     cc_handle	ccache;
-    cc_time_t	offset;
+    cc_time64	offset;
     cc_int32    creds_version;
 };
 typedef struct ccmsg_ccache_set_kdc_time_offset_t ccmsg_ccache_set_kdc_time_offset_t;
@@ -372,6 +374,16 @@ struct ccmsg_ccache_iterator_next_resp_t {
 typedef struct ccmsg_ccache_iterator_next_t ccmsg_ccache_iterator_next_t;
 typedef struct ccmsg_ccache_iterator_next_resp_t ccmsg_ccache_iterator_next_resp_t;
 
+struct ccmsg_ccache_iterator_clone_t {
+    cc_handle   ctx;
+    cc_handle	iterator;
+};
+struct ccmsg_ccache_iterator_clone_resp_t {
+    cc_handle	iterator;
+};      
+typedef struct ccmsg_ccache_iterator_clone_t ccmsg_ccache_iterator_clone_t;
+typedef struct ccmsg_ccache_iterator_clone_resp_t ccmsg_ccache_iterator_clone_resp_t;
+
 struct ccmsg_creds_iterator_release_t {
     cc_handle	ctx;
     cc_handle	ccache;
@@ -393,37 +405,14 @@ struct ccmsg_creds_iterator_next_resp_t {
 typedef struct ccmsg_creds_iterator_next_t ccmsg_creds_iterator_next_t;
 typedef struct ccmsg_creds_iterator_next_resp_t ccmsg_creds_iterator_next_resp_t;
 
-struct ccmsg_creds_v4_t {
-    cc_uint32 offset;
-    cc_uint32 len;
-};
-typedef struct ccmsg_creds_v4_t ccmsg_creds_v4_t;
-
-struct ccmsg_creds_v5_t {
-    cc_uint32 client_offset;
-    cc_uint32 client_len;
-    cc_uint32 server_offset;
-    cc_uint32 server_len;
-    cc_uint32 keyblock_offset;
-    cc_uint32 keyblock_len;
-    cc_time_t authtime;
-    cc_time_t starttime;
-    cc_time_t endtime;
-    cc_time_t renewtime;
-    cc_uint32 is_skey;
-    cc_uint32 ticket_flags;
-    cc_uint32 address_count;
-    cc_uint32 address_offset;
-    cc_uint32 address_len;
-    cc_uint32 ticket_offset;
-    cc_uint32 ticket_len;
-    cc_uint32 ticket2_offset;
-    cc_uint32 ticket2_len;
-    cc_uint32 authdata_count;
-    cc_uint32 authdata_offset;
-    cc_uint32 authdata_len;
-};
-typedef struct ccmsg_creds_v5_t ccmsg_creds_v5_t;
-
+struct ccmsg_creds_iterator_clone_t {
+    cc_handle   ctx;
+    cc_handle	iterator;
+};
+struct ccmsg_creds_iterator_clone_resp_t {
+    cc_handle	iterator;
+};      
+typedef struct ccmsg_creds_iterator_clone_t ccmsg_creds_iterator_clone_t;
+typedef struct ccmsg_creds_iterator_clone_resp_t ccmsg_creds_iterator_clone_resp_t;
 
 #endif /*__MSG_HEADERS_H__*/