encrypted-keys: create encrypted-keys directory

Move all files associated with encrypted keys to keys/encrypted-keys.

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>

diff --git a/security/keys/Makefile b/security/keys/Makefile
index b34cc6ee6900c3be1453e6aa205b5469f5461f03..a56f1ffdc64d0f8c3fcde694832a20dafe78f21d 100644 (file)
--- a/security/keys/Makefile
+++ b/security/keys/Makefile
@@ -14,7 +14,7 @@ obj-y := \
        user_defined.o
 
 obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
-obj-$(CONFIG_ENCRYPTED_KEYS) += ecryptfs_format.o encrypted.o
+obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys/
 obj-$(CONFIG_KEYS_COMPAT) += compat.o
 obj-$(CONFIG_PROC_FS) += proc.o
 obj-$(CONFIG_SYSCTL) += sysctl.o

diff --git a/security/keys/encrypted-keys/Makefile b/security/keys/encrypted-keys/Makefile
new file mode 100644 (file)
index 0000000..cbd3f8d
--- /dev/null
+++ b/security/keys/encrypted-keys/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for encrypted keys
+#
+
+obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o ecryptfs_format.o

diff --git a/security/keys/ecryptfs_format.c b/security/keys/encrypted-keys/ecryptfs_format.c
similarity index 100%
rename from security/keys/ecryptfs_format.c
rename to security/keys/encrypted-keys/ecryptfs_format.c

diff --git a/security/keys/ecryptfs_format.h b/security/keys/encrypted-keys/ecryptfs_format.h
similarity index 100%
rename from security/keys/ecryptfs_format.h
rename to security/keys/encrypted-keys/ecryptfs_format.h

diff --git a/security/keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
similarity index 100%
rename from security/keys/encrypted.c
rename to security/keys/encrypted-keys/encrypted.c

diff --git a/security/keys/encrypted.h b/security/keys/encrypted-keys/encrypted.h
similarity index 100%
rename from security/keys/encrypted.h
rename to security/keys/encrypted-keys/encrypted.h