diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-09-14 15:06:00 -0400 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-09-14 15:22:26 -0400 |
commit | 61cf45d0199041df1a8ba334b6bf4a3a13b7f904 (patch) | |
tree | b287399eb3704b766d2ba3d9a36de0bb57f70139 | |
parent | a8f7640963ada66c412314c3559c11ff6946c1a5 (diff) |
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>
-rw-r--r-- | security/keys/Makefile | 2 | ||||
-rw-r--r-- | security/keys/encrypted-keys/Makefile | 5 | ||||
-rw-r--r-- | security/keys/encrypted-keys/ecryptfs_format.c (renamed from security/keys/ecryptfs_format.c) | 0 | ||||
-rw-r--r-- | security/keys/encrypted-keys/ecryptfs_format.h (renamed from security/keys/ecryptfs_format.h) | 0 | ||||
-rw-r--r-- | security/keys/encrypted-keys/encrypted.c (renamed from security/keys/encrypted.c) | 0 | ||||
-rw-r--r-- | security/keys/encrypted-keys/encrypted.h (renamed from security/keys/encrypted.h) | 0 |
6 files changed, 6 insertions, 1 deletions
diff --git a/security/keys/Makefile b/security/keys/Makefile index b34cc6ee6900..a56f1ffdc64d 100644 --- a/security/keys/Makefile +++ b/security/keys/Makefile | |||
@@ -14,7 +14,7 @@ obj-y := \ | |||
14 | user_defined.o | 14 | user_defined.o |
15 | 15 | ||
16 | obj-$(CONFIG_TRUSTED_KEYS) += trusted.o | 16 | obj-$(CONFIG_TRUSTED_KEYS) += trusted.o |
17 | obj-$(CONFIG_ENCRYPTED_KEYS) += ecryptfs_format.o encrypted.o | 17 | obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys/ |
18 | obj-$(CONFIG_KEYS_COMPAT) += compat.o | 18 | obj-$(CONFIG_KEYS_COMPAT) += compat.o |
19 | obj-$(CONFIG_PROC_FS) += proc.o | 19 | obj-$(CONFIG_PROC_FS) += proc.o |
20 | obj-$(CONFIG_SYSCTL) += sysctl.o | 20 | obj-$(CONFIG_SYSCTL) += sysctl.o |
diff --git a/security/keys/encrypted-keys/Makefile b/security/keys/encrypted-keys/Makefile new file mode 100644 index 000000000000..cbd3f8de37bb --- /dev/null +++ b/security/keys/encrypted-keys/Makefile | |||
@@ -0,0 +1,5 @@ | |||
1 | # | ||
2 | # Makefile for encrypted keys | ||
3 | # | ||
4 | |||
5 | 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 index 6daa3b6ff9ed..6daa3b6ff9ed 100644 --- a/security/keys/ecryptfs_format.c +++ b/security/keys/encrypted-keys/ecryptfs_format.c | |||
diff --git a/security/keys/ecryptfs_format.h b/security/keys/encrypted-keys/ecryptfs_format.h index 40294de238bb..40294de238bb 100644 --- a/security/keys/ecryptfs_format.h +++ b/security/keys/encrypted-keys/ecryptfs_format.h | |||
diff --git a/security/keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index e7eca9ec4c65..e7eca9ec4c65 100644 --- a/security/keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c | |||
diff --git a/security/keys/encrypted.h b/security/keys/encrypted-keys/encrypted.h index cef5e2f2b7d1..cef5e2f2b7d1 100644 --- a/security/keys/encrypted.h +++ b/security/keys/encrypted-keys/encrypted.h | |||