[Pvfs2-cvs] commit by dbonnie in pvfs2/src/common/security: security-hash.h security-hash.c pint-security.h

[CVS commit program]

Update of /anoncvs/pvfs2/src/common/security
In directory parlweb1:/tmp/cvs-serv7718/src/common/security

Modified Files:
      Tag: cu-security-branch
	security-hash.h security-hash.c pint-security.h 
Log Message:
Switch from PVFS_handle to uint32_t to identify servers.


Index: security-hash.h
===================================================================
RCS file: /anoncvs/pvfs2/src/common/security/Attic/security-hash.h,v
diff -p -u -r1.1.2.3 -r1.1.2.4
--- security-hash.h	15 May 2008 00:18:22 -0000	1.1.2.3
+++ security-hash.h	15 May 2008 19:20:29 -0000	1.1.2.4
@@ -14,8 +14,8 @@
 
 
 int SECURITY_hash_initialize(void);
-int SECURITY_add_pubkey(PVFS_handle host, EVP_PKEY *pubkey);
-EVP_PKEY *SECURITY_lookup_pubkey(PVFS_handle host);
+int SECURITY_add_pubkey(uint32_t host, EVP_PKEY *pubkey);
+EVP_PKEY *SECURITY_lookup_pubkey(uint32_t host);
 void SECURITY_hash_finalize(void);
 
 

Index: security-hash.c
===================================================================
RCS file: /anoncvs/pvfs2/src/common/security/Attic/security-hash.c,v
diff -p -u -r1.1.2.6 -r1.1.2.7
--- security-hash.c	15 May 2008 16:45:37 -0000	1.1.2.6
+++ security-hash.c	15 May 2008 19:20:29 -0000	1.1.2.7
@@ -22,7 +22,7 @@
 
 typedef struct pubkey_entry_s {
     struct qlist_head hash_link;
-    PVFS_handle host;
+    uint32_t host;
     EVP_PKEY *pubkey;
 } pubkey_entry_t;
 
@@ -45,7 +45,7 @@ int SECURITY_hash_initialize(void)
         return -1;
     }
     
-    pubkey_table = qhash_init(pubkey_compare, quickhash_64bit_hash,
+    pubkey_table = qhash_init(pubkey_compare, quickhash_32bit_hash,
                               DEFAULT_SECURITY_TABLE_SIZE);
 
     if (pubkey_table == NULL)
@@ -76,7 +76,7 @@ void SECURITY_hash_finalize(void)
     gen_mutex_unlock(&hash_mutex);
 }
 
-int SECURITY_add_pubkey(PVFS_handle host, EVP_PKEY *pubkey)
+int SECURITY_add_pubkey(uint32_t host, EVP_PKEY *pubkey)
 {    
     gen_mutex_lock(&hash_mutex);
     pubkey_entry_t *entry;
@@ -103,7 +103,7 @@ int SECURITY_add_pubkey(PVFS_handle host
     return 0;
 }
 
-EVP_PKEY *SECURITY_lookup_pubkey(PVFS_handle host)
+EVP_PKEY *SECURITY_lookup_pubkey(uint32_t host)
 {
     struct qhash_head *temp;
     pubkey_entry_t *entry;
@@ -121,7 +121,7 @@ EVP_PKEY *SECURITY_lookup_pubkey(PVFS_ha
 
 static int pubkey_compare(void *key, struct qhash_head *link)
 {
-    PVFS_handle host = *((PVFS_handle *)key);
+    uint32_t host = *((uint32_t *)key);
     pubkey_entry_t *temp;
 
     temp = qlist_entry(link, pubkey_entry_t, hash_link);

Index: pint-security.h
===================================================================
RCS file: /anoncvs/pvfs2/src/common/security/Attic/pint-security.h,v
diff -p -u -r1.1.2.3 -r1.1.2.4
--- pint-security.h	14 May 2008 21:40:40 -0000	1.1.2.3
+++ pint-security.h	15 May 2008 19:20:29 -0000	1.1.2.4
@@ -16,7 +16,7 @@
 
 typedef struct PVFS_capability PVFS_capability;
 struct PVFS_capability {
-        PVFS_handle owner;
+        uint32_t owner;
         PVFS_sig signature;
 	PVFS_time timeout;  /* seconds after epoch to time out */
 	uint32_t op_mask;