[Pvfs2-cvs] commit by nlmills in pvfs2/include: pvfs2-mgmt.h pvfs2-sysint.h pvfs2-types.h pvfs2-util.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/include
In directory parlweb1:/tmp/cvs-serv5632/include

Modified Files:
      Tag: cu-security-branch
	pvfs2-mgmt.h pvfs2-sysint.h pvfs2-types.h pvfs2-util.h 
Log Message:
moved security types into main pvfs2-types.h header


Index: pvfs2-mgmt.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-mgmt.h,v
diff -p -u -r1.62.4.4 -r1.62.4.5
--- pvfs2-mgmt.h	25 Aug 2009 17:55:45 -0000	1.62.4.4
+++ pvfs2-mgmt.h	2 Jun 2010 18:50:48 -0000	1.62.4.5
@@ -25,7 +25,6 @@
 
 #include "pvfs2-sysint.h"
 #include "pvfs2-types.h"
-#include "security-types.h"
 
 /* non-blocking mgmt operation handle */
 typedef PVFS_id_gen_t PVFS_mgmt_op_id;

Index: pvfs2-sysint.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-sysint.h,v
diff -p -u -r1.75.8.10 -r1.75.8.11
--- pvfs2-sysint.h	21 May 2010 21:38:12 -0000	1.75.8.10
+++ pvfs2-sysint.h	2 Jun 2010 18:50:48 -0000	1.75.8.11
@@ -22,7 +22,6 @@
 
 #include "pvfs2-types.h"
 #include "pvfs2-request.h"
-#include "security-types.h"
 
 /** Options supported by get_info() and set_info(). */
 enum PVFS_sys_setinfo_opt

Index: pvfs2-types.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-types.h,v
diff -p -u -r1.147.4.7 -r1.147.4.8
--- pvfs2-types.h	21 May 2010 17:33:56 -0000	1.147.4.7
+++ pvfs2-types.h	2 Jun 2010 18:50:48 -0000	1.147.4.8
@@ -419,17 +419,6 @@ typedef struct
     int32_t    __pad1;
 } PVFS_object_ref;
 
-/** Credentials (stubbed for future authentication methods). */
-typedef struct
-{
-    PVFS_uid uid;
-    PVFS_gid gid;
-} PVFS_credentials;
-endecode_fields_2(
-    PVFS_credentials,
-    PVFS_uid, uid,
-    PVFS_gid, gid);
-
 /* max length of BMI style URI's for identifying servers */
 #define PVFS_MAX_SERVER_ADDR_LEN 256
 /* max length of PVFS filename */
@@ -869,6 +858,58 @@ enum PVFS_io_type
  * reserved handle values
  */
 #define PVFS_MGMT_RESERVED 1
+
+/*
+ * New types for robust security implementation.
+ */
+typedef unsigned char *PVFS_signature;
+
+typedef struct PVFS_capability PVFS_capability;
+struct PVFS_capability
+{
+    char *issuer;              /* alias of the issuing server */
+    PVFS_fs_id fsid;           /* fsid for which this capability is valid */
+    uint32_t sig_size;         /* length of the signature in bytes */
+    PVFS_signature signature;  /* digital signature */
+    PVFS_time timeout;         /* seconds after epoch to time out */
+    uint32_t op_mask;          /* allowed operations mask */
+    uint32_t num_handles;      /* number of elements in the handle array */
+    PVFS_handle *handle_array; /* handles in this capability */
+};
+endecode_fields_3a2a_struct (
+    PVFS_capability,
+    string, issuer,
+    PVFS_fs_id, fsid,
+    skip4,,
+    uint32_t, sig_size,
+    PVFS_signature, signature,
+    PVFS_time, timeout,
+    uint32_t, op_mask,
+    uint32_t, num_handles,
+    PVFS_handle, handle_array)
+
+typedef struct PVFS_credential PVFS_credential;
+struct PVFS_credential 
+{
+    PVFS_uid userid;           /* user id */
+    uint32_t num_groups;       /* length of group_array */
+    PVFS_gid *group_array;     /* groups for which the user is a member */
+    char *issuer;              /* alias of the issuing server */
+    PVFS_time timeout;         /* seconds after epoch to time out */
+    uint32_t sig_size;         /* length of the signature in bytes */
+    PVFS_signature signature;  /* digital signature */
+};
+endecode_fields_3a2a_struct (
+    PVFS_credential,
+    skip4,,
+    skip4,,
+    PVFS_uid, userid,
+    uint32_t, num_groups,
+    PVFS_gid, group_array,
+    string, issuer,
+    PVFS_time, timeout,
+    uint32_t, sig_size,
+    PVFS_signature, signature)
 
 #endif /* __PVFS2_TYPES_H */
 

Index: pvfs2-util.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-util.h,v
diff -p -u -r1.50.8.5 -r1.50.8.6
--- pvfs2-util.h	27 May 2010 04:38:02 -0000	1.50.8.5
+++ pvfs2-util.h	2 Jun 2010 18:50:48 -0000	1.50.8.6
@@ -14,7 +14,6 @@
 
 #include "pvfs2.h"
 #include "pvfs2-types.h"
-#include "security-types.h"
 
 /* Define min macro with pvfs2 prefix */
 #ifndef PVFS_util_min