Some updates to compile.

4 files changed, 29 insertions, 35 deletions

diff --git a/cryptodev_main.c b/cryptodev_main.c
index 9a6cb1c4942..09aa5bffed0 100644
--- a/cryptodev_main.c
+++ b/cryptodev_main.c
@@ -500,15 +500,14 @@ static int
 cryptodev_open(struct inode *inode, struct file *filp)
 {
 	struct crypt_priv *pcr;
-	int ret;
 
 	pcr = kmalloc(sizeof(*pcr), GFP_KERNEL);
 	if(!pcr)
 		return -ENOMEM;
 
 	memset(pcr, 0, sizeof(*pcr));
-	init_MUTEX(&pcr->fcrypt->sem);
-	INIT_LIST_HEAD(&fcr->fcrypt->list);
+	init_MUTEX(&pcr->fcrypt.sem);
+	INIT_LIST_HEAD(&pcr->fcrypt.list);
 	
 
 	pcr->ncr = ncr_init_lists();
@@ -524,12 +523,12 @@ cryptodev_open(struct inode *inode, struct file *filp)
 static int
 cryptodev_release(struct inode *inode, struct file *filp)
 {
-	struct crypt_priv *fcr = filp->private_data;
+	struct crypt_priv *pcr = filp->private_data;
 
-	if(fcr) {
-		crypto_finish_all_sessions(fcr);
-		ncr_deinit_lists(fcr->ncr);
-		kfree(fcr);
+	if(pcr) {
+		crypto_finish_all_sessions(&pcr->fcrypt);
+		ncr_deinit_lists(pcr->ncr);
+		kfree(pcr);
 		filp->private_data = NULL;
 	}
 
@@ -566,7 +565,7 @@ cryptodev_ioctl(struct inode *inode, struct file *filp,
 	if (unlikely(!pcr))
 		BUG();
 
-	fcr = pcr->fcr;
+	fcr = &pcr->fcrypt;
 
 	if (unlikely(!fcr))
 		BUG();
@@ -597,7 +596,7 @@ cryptodev_ioctl(struct inode *inode, struct file *filp,
 			return copy_to_user((void*)arg, &cop, sizeof(cop));
 
 		default:
-			return ncr_ioctl(file->f_cred->fsuid, pcr->ncr, cmd, arg);
+			return ncr_ioctl(filp->f_cred->fsuid, pcr->ncr, cmd, arg);
 	}
 }
 
diff --git a/ncr.c b/ncr.c
index a434d40bfc6..2d8436e6086 100644
--- a/ncr.c
+++ b/ncr.c
@@ -35,7 +35,6 @@
 void* ncr_init_lists(void)
 {
 	struct ncr_lists *lst;
-	int ret;
 
 	lst = kmalloc(sizeof(*lst), GFP_KERNEL);
 	if(!lst)
diff --git a/ncr.h b/ncr.h
index 001c32d7569..c3094b9b4e5 100644
--- a/ncr.h
+++ b/ncr.h
@@ -28,9 +28,9 @@ typedef enum {
 
 
 typedef enum {
-	NCR_KEY_TYPE_SECRET=1;
-	NCR_KEY_TYPE_PUBLIC=2;
-	NCR_KEY_TYPE_PRIVATE=3;
+	NCR_KEY_TYPE_SECRET=1,
+	NCR_KEY_TYPE_PUBLIC=2,
+	NCR_KEY_TYPE_PRIVATE=3,
 } ncr_key_type_t;
 
 /* Data Handling
@@ -76,20 +76,6 @@ typedef int ncr_key_t;
 #define NCR_KEY_FLAG_DECRYPT (1<<2)
 #define NCR_KEY_FLAG_SIGN (1<<3)
 
-struct ncr_key_generate_st {
-	ncr_key_t desc;
-	ncr_algorithm_t algorithm;
-	unsigned int bits;
-	unsigned int keyflags;
-};
-
-struct ncr_key_generate_st {
-	ncr_key_t desc; /* input */
-	ncr_algorithm_t algorithm; /* input */
-	unsigned int bits; /* input */
-	
-};
-
 struct ncr_key_generate_params_st {
 	ncr_algorithm_t algorithm;
 	unsigned int keyflags;
@@ -106,7 +92,7 @@ struct ncr_key_generate_params_st {
 			unsigned int bits;
 		} dsa;
 		struct {
-			usigned int bits;
+			unsigned int bits;
 		} dh;
 	} params;
 };
@@ -116,7 +102,7 @@ struct ncr_key_generate_params_st {
 struct ncr_key_generate_st {
 	ncr_key_t desc;
 	ncr_key_t desc2; /* when called with GENERATE_PAIR */
-	ncr_key_generate_params_st params;
+	struct ncr_key_generate_params_st params;
 };
 
 /* used in derivation/encryption
@@ -199,7 +185,7 @@ struct ncr_public_key_params_st
 #define NCRIO_KEY_EXPORT       	_IOWR('c', 209, struct ncr_key_data_st)
 #define NCRIO_KEY_IMPORT       	_IOWR('c', 210, struct ncr_key_data_st)
 #define NCRIO_KEY_GET_PUBLIC   	_IOWR('c', 211, struct ncr_public_key_params_st)
-#define NCRIO_DATA_DEINIT       _IOR ('c', 212, ncr_data_t)
+#define NCRIO_KEY_DEINIT       _IOR ('c', 212, ncr_key_t)
 
 
 /* Storage ioctls
@@ -251,13 +237,13 @@ struct ncr_storage_remove_st {
 
 struct ncr_storage_traverse_st {
 	int traverse_id;
-	ncr_storage_metadata_st metadata;
+	struct ncr_storage_metadata_st metadata;
 };
 
 
 #define NCRIO_STORAGE_TRAVERSE_INIT     	_IOW('c', 227, int)
 #define NCRIO_STORAGE_TRAVERSE_NEXT     	_IOWR('c', 228, struct ncr_storage_traverse_st)
-#define NCRIO_STORAGE_TRAVERSE_NEXT     	_IOWR('c', 229, int)
+#define NCRIO_STORAGE_TRAVERSE_DEINIT     	_IOWR('c', 229, int)
 
 
 /* FIXME key wrap ioctls
@@ -283,7 +269,7 @@ typedef int ncr_session_t;
 struct ncr_session_st {
 	/* input */
 	ncr_algorithm_t algorithm;
-	ncr_key_params_st params;
+	struct ncr_key_params_st params;
 	ncr_key_t key;
 	ncr_crypto_op_t op;
 
@@ -319,3 +305,5 @@ struct ncr_session_op_st {
 	ncr_error_t err;
 };
 
+
+#endif
diff --git a/ncr_int.h b/ncr_int.h
index 4e9e25aa637..1e0b7afaf0d 100644
--- a/ncr_int.h
+++ b/ncr_int.h
@@ -1,3 +1,8 @@
+#ifndef NCR_INT_H
+# define NCR_INT_H
+
+#include "ncr.h"
+
 struct data_item {
 	struct list_head list;
 	void* data;
@@ -23,5 +28,8 @@ struct ncr_lists {
 void* ncr_init_lists(void);
 void ncr_deinit_lists(struct ncr_lists *lst);
 
-int ncr_ioctl(struct ncr_lists* lists,
+int
+ncr_ioctl(unsigned int uid, struct ncr_lists* lst,
 		unsigned int cmd, unsigned long arg);
+
+#endif