aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/ecryptfs_kernel.h
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
-rw-r--r--fs/ecryptfs/ecryptfs_kernel.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 3fbc0ff79699..e74cb2a0b299 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -31,6 +31,7 @@
31#include <crypto/skcipher.h> 31#include <crypto/skcipher.h>
32#include <keys/user-type.h> 32#include <keys/user-type.h>
33#include <keys/encrypted-type.h> 33#include <keys/encrypted-type.h>
34#include <linux/kernel.h>
34#include <linux/fs.h> 35#include <linux/fs.h>
35#include <linux/fs_stack.h> 36#include <linux/fs_stack.h>
36#include <linux/namei.h> 37#include <linux/namei.h>
@@ -51,7 +52,13 @@
51#define ECRYPTFS_XATTR_NAME "user.ecryptfs" 52#define ECRYPTFS_XATTR_NAME "user.ecryptfs"
52 53
53void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok); 54void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok);
54extern void ecryptfs_to_hex(char *dst, char *src, size_t src_size); 55static inline void
56ecryptfs_to_hex(char *dst, char *src, size_t src_size)
57{
58 char *end = bin2hex(dst, src, src_size);
59 *end = '\0';
60}
61
55extern void ecryptfs_from_hex(char *dst, char *src, int dst_size); 62extern void ecryptfs_from_hex(char *dst, char *src, int dst_size);
56 63
57struct ecryptfs_key_record { 64struct ecryptfs_key_record {