diff options
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
-rw-r--r-- | fs/ecryptfs/ecryptfs_kernel.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index 508648efa447..f21385f97da5 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <linux/fs_stack.h> | 33 | #include <linux/fs_stack.h> |
34 | #include <linux/namei.h> | 34 | #include <linux/namei.h> |
35 | #include <linux/scatterlist.h> | 35 | #include <linux/scatterlist.h> |
36 | #include <linux/hash.h> | ||
36 | 37 | ||
37 | /* Version verification for shared data structures w/ userspace */ | 38 | /* Version verification for shared data structures w/ userspace */ |
38 | #define ECRYPTFS_VERSION_MAJOR 0x00 | 39 | #define ECRYPTFS_VERSION_MAJOR 0x00 |
@@ -47,7 +48,8 @@ | |||
47 | #define ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH 0x00000004 | 48 | #define ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH 0x00000004 |
48 | #define ECRYPTFS_VERSIONING_POLICY 0x00000008 | 49 | #define ECRYPTFS_VERSIONING_POLICY 0x00000008 |
49 | #define ECRYPTFS_VERSIONING_MASK (ECRYPTFS_VERSIONING_PASSPHRASE \ | 50 | #define ECRYPTFS_VERSIONING_MASK (ECRYPTFS_VERSIONING_PASSPHRASE \ |
50 | | ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH) | 51 | | ECRYPTFS_VERSIONING_PLAINTEXT_PASSTHROUGH \ |
52 | | ECRYPTFS_VERSIONING_PUBKEY) | ||
51 | 53 | ||
52 | #define ECRYPTFS_MAX_PASSWORD_LENGTH 64 | 54 | #define ECRYPTFS_MAX_PASSWORD_LENGTH 64 |
53 | #define ECRYPTFS_MAX_PASSPHRASE_BYTES ECRYPTFS_MAX_PASSWORD_LENGTH | 55 | #define ECRYPTFS_MAX_PASSPHRASE_BYTES ECRYPTFS_MAX_PASSWORD_LENGTH |
@@ -558,7 +560,8 @@ int ecryptfs_close_lower_file(struct file *lower_file); | |||
558 | 560 | ||
559 | int ecryptfs_process_helo(unsigned int transport, uid_t uid, pid_t pid); | 561 | int ecryptfs_process_helo(unsigned int transport, uid_t uid, pid_t pid); |
560 | int ecryptfs_process_quit(uid_t uid, pid_t pid); | 562 | int ecryptfs_process_quit(uid_t uid, pid_t pid); |
561 | int ecryptfs_process_response(struct ecryptfs_message *msg, pid_t pid, u32 seq); | 563 | int ecryptfs_process_response(struct ecryptfs_message *msg, uid_t uid, |
564 | pid_t pid, u32 seq); | ||
562 | int ecryptfs_send_message(unsigned int transport, char *data, int data_len, | 565 | int ecryptfs_send_message(unsigned int transport, char *data, int data_len, |
563 | struct ecryptfs_msg_ctx **msg_ctx); | 566 | struct ecryptfs_msg_ctx **msg_ctx); |
564 | int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx, | 567 | int ecryptfs_wait_for_response(struct ecryptfs_msg_ctx *msg_ctx, |