Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dddfa461 authored by Michael Halcrow's avatar Michael Halcrow Committed by Linus Torvalds
Browse files

[PATCH] eCryptfs: Public key; packet management 



Public key support code.  This reads and writes packets in the header that
contain public key encrypted file keys.  It calls the messaging code in the
previous patch to send and receive encryption and decryption request
packets from the userspace daemon.

[akpm@osdl.org: cleab fix]
Signed-off-by: default avatarMichael Halcrow <mhalcrow@us.ibm.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 88b4a07e

fs/ecryptfs/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,4 +4,4 @@ 


obj-$(CONFIG_ECRYPT_FS) += ecryptfs.o



ecryptfs-objs := dentry.o file.o inode.o main.o super.o mmap.o crypto.o keystore.o debug.o
 
ecryptfs-objs := dentry.o file.o inode.o main.o super.o mmap.o crypto.o keystore.o messaging.o netlink.o debug.o

fs/ecryptfs/ecryptfs_kernel.h

+5 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/fs_stack.h>

#include <linux/namei.h>

#include <linux/scatterlist.h>

#include <linux/hash.h>



/* Version verification for shared data structures w/ userspace */

#define ECRYPTFS_VERSION_MAJOR 0x00
@@ -47,7 +48,8 @@ 
#define ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH 0x00000004

#define ECRYPTFS_VERSIONING_POLICY 0x00000008

#define ECRYPTFS_VERSIONING_MASK (ECRYPTFS_VERSIONING_PASSPHRASE \

                                  | ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH)

                                  | ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH \

                                  | ECRYPTFS_VERSIONING_PUBKEY)



#define ECRYPTFS_MAX_PASSWORD_LENGTH 64

#define ECRYPTFS_MAX_PASSPHRASE_BYTES ECRYPTFS_MAX_PASSWORD_LENGTH
@@ -558,7 +560,8 @@ int ecryptfs_close_lower_file(struct file *lower_file); 


int ecryptfs_process_helo(unsigned int transport, uid_t uid, pid_t pid);

int ecryptfs_process_quit(uid_t uid, pid_t pid);

int ecryptfs_process_response(struct ecryptfs_message *msg, pid_t pid, u32 seq);

int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t uid,

			      pid_t pid, u32 seq);

int ecryptfs_send_message(unsigned int transport, char *data, int data_len,

			  struct ecryptfs_msg_ctx **msg_ctx);

int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx,