[PATCH] ecryptfs: fs/Makefile and fs/Kconfig

eCryptfs is a stacked cryptographic filesystem for Linux.  It is derived from
Erez Zadok's Cryptfs, implemented through the FiST framework for generating
stacked filesystems.  eCryptfs extends Cryptfs to provide advanced key
management and policy features.  eCryptfs stores cryptographic metadata in the
header of each file written, so that encrypted files can be copied between
hosts; the file will be decryptable with the proper key, and there is no need
to keep track of any additional information aside from what is already in the
encrypted file itself.

[akpm@osdl.org: updates for ongoing API changes]
[bunk@stusta.de: cleanups]
[akpm@osdl.org: alpha build fix]
[akpm@osdl.org: cleanups]
[tytso@mit.edu: inode-diet updates]
[pbadari@us.ibm.com: generic_file_*_read/write() interface updates]
[rdunlap@xenotime.net: printk format fixes]
[akpm@osdl.org: make slab creation and teardown table-driven]
Signed-off-by: Phillip Hellewell <phillip@hellewell.homeip.net>
Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com>
Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Badari Pulavarty <pbadari@us.ibm.com>
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 123 insertions, 0 deletions

diff --git a/fs/ecryptfs/debug.c b/fs/ecryptfs/debug.c
new file mode 100644
index 00000000000..61f8e894284
--- /dev/null
+++ b/fs/ecryptfs/debug.c
@@ -0,0 +1,123 @@
+/**
+ * eCryptfs: Linux filesystem encryption layer
+ * Functions only useful for debugging.
+ *
+ * Copyright (C) 2006 International Business Machines Corp.
+ *   Author(s): Michael A. Halcrow <mahalcro@us.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "ecryptfs_kernel.h"
+
+/**
+ * ecryptfs_dump_auth_tok - debug function to print auth toks
+ *
+ * This function will print the contents of an ecryptfs authentication
+ * token.
+ */
+void ecryptfs_dump_auth_tok(struct ecryptfs_auth_tok *auth_tok)
+{
+        char salt[ECRYPTFS_SALT_SIZE * 2 + 1];
+        char sig[ECRYPTFS_SIG_SIZE_HEX + 1];
+
+        ecryptfs_printk(KERN_DEBUG, "Auth tok at mem loc [%p]:\n",
+                        auth_tok);
+        if (ECRYPTFS_CHECK_FLAG(auth_tok->flags, ECRYPTFS_PRIVATE_KEY)) {
+                ecryptfs_printk(KERN_DEBUG, " * private key type\n");
+                ecryptfs_printk(KERN_DEBUG, " * (NO PRIVATE KEY SUPPORT "
+                                "IN ECRYPTFS VERSION 0.1)\n");
+        } else {
+                ecryptfs_printk(KERN_DEBUG, " * passphrase type\n");
+                ecryptfs_to_hex(salt, auth_tok->token.password.salt,
+                                ECRYPTFS_SALT_SIZE);
+                salt[ECRYPTFS_SALT_SIZE * 2] = '\0';
+                ecryptfs_printk(KERN_DEBUG, " * salt = [%s]\n", salt);
+                if (ECRYPTFS_CHECK_FLAG(auth_tok->token.password.flags,
+                                        ECRYPTFS_PERSISTENT_PASSWORD)) {
+                        ecryptfs_printk(KERN_DEBUG, " * persistent\n");
+                }
+                memcpy(sig, auth_tok->token.password.signature,
+                       ECRYPTFS_SIG_SIZE_HEX);
+                sig[ECRYPTFS_SIG_SIZE_HEX] = '\0';
+                ecryptfs_printk(KERN_DEBUG, " * signature = [%s]\n", sig);
+        }
+        ecryptfs_printk(KERN_DEBUG, " * session_key.flags = [0x%x]\n",
+                        auth_tok->session_key.flags);
+        if (auth_tok->session_key.flags
+            & ECRYPTFS_USERSPACE_SHOULD_TRY_TO_DECRYPT)
+                ecryptfs_printk(KERN_DEBUG,
+                                " * Userspace decrypt request set\n");
+        if (auth_tok->session_key.flags
+            & ECRYPTFS_USERSPACE_SHOULD_TRY_TO_ENCRYPT)
+                ecryptfs_printk(KERN_DEBUG,
+                                " * Userspace encrypt request set\n");
+        if (auth_tok->session_key.flags & ECRYPTFS_CONTAINS_DECRYPTED_KEY) {
+                ecryptfs_printk(KERN_DEBUG, " * Contains decrypted key\n");
+                ecryptfs_printk(KERN_DEBUG,
+                                " * session_key.decrypted_key_size = [0x%x]\n",
+                                auth_tok->session_key.decrypted_key_size);
+                ecryptfs_printk(KERN_DEBUG, " * Decrypted session key "
+                                "dump:\n");
+                if (ecryptfs_verbosity > 0)
+                        ecryptfs_dump_hex(auth_tok->session_key.decrypted_key,
+                                          ECRYPTFS_DEFAULT_KEY_BYTES);
+        }
+        if (auth_tok->session_key.flags & ECRYPTFS_CONTAINS_ENCRYPTED_KEY) {
+                ecryptfs_printk(KERN_DEBUG, " * Contains encrypted key\n");
+                ecryptfs_printk(KERN_DEBUG,
+                                " * session_key.encrypted_key_size = [0x%x]\n",
+                                auth_tok->session_key.encrypted_key_size);
+                ecryptfs_printk(KERN_DEBUG, " * Encrypted session key "
+                                "dump:\n");
+                if (ecryptfs_verbosity > 0)
+                        ecryptfs_dump_hex(auth_tok->session_key.encrypted_key,
+                                          auth_tok->session_key.
+                                          encrypted_key_size);
+        }
+}
+
+/**
+ * ecryptfs_dump_hex - debug hex printer
+ * @data: string of bytes to be printed
+ * @bytes: number of bytes to print
+ *
+ * Dump hexadecimal representation of char array
+ */
+void ecryptfs_dump_hex(char *data, int bytes)
+{
+        int i = 0;
+        int add_newline = 1;
+
+        if (ecryptfs_verbosity < 1)
+                return;
+        if (bytes != 0) {
+                printk(KERN_DEBUG "0x%.2x.", (unsigned char)data[i]);
+                i++;
+        }
+        while (i < bytes) {
+                printk("0x%.2x.", (unsigned char)data[i]);
+                i++;
+                if (i % 16 == 0) {
+                        printk("\n");
+                        add_newline = 0;
+                } else
+                        add_newline = 1;
+        }
+        if (add_newline)
+                printk("\n");
+}
+