diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-01-18 09:07:12 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-01-24 10:27:57 +1100 |
| commit | b9703449347603289cac0bd04e574ac2e777275d (patch) | |
| tree | 287d7d8cccfad36f238d826f87e474afb8db424d | |
| parent | 4b174b6d281f5c87234fc65bafc02877f565c5cf (diff) | |
| download | kernel_samsung_tuna-b9703449347603289cac0bd04e574ac2e777275d.zip kernel_samsung_tuna-b9703449347603289cac0bd04e574ac2e777275d.tar.gz kernel_samsung_tuna-b9703449347603289cac0bd04e574ac2e777275d.tar.bz2 | |
encrypted-keys: rename encrypted_defined files to encrypted
Rename encrypted_defined.c and encrypted_defined.h files to encrypted.c and
encrypted.h, respectively. Based on request from David Howells.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Acked-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
| -rw-r--r-- | security/keys/Makefile | 2 | ||||
| -rw-r--r-- | security/keys/encrypted.c (renamed from security/keys/encrypted_defined.c) | 3 | ||||
| -rw-r--r-- | security/keys/encrypted.h (renamed from security/keys/encrypted_defined.h) | 0 |
3 files changed, 3 insertions, 2 deletions
diff --git a/security/keys/Makefile b/security/keys/Makefile index ad8da87..1bf090a 100644 --- 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) += encrypted_defined.o +obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o obj-$(CONFIG_KEYS_COMPAT) += compat.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSCTL) += sysctl.o diff --git a/security/keys/encrypted_defined.c b/security/keys/encrypted.c index 28791a6..9e7e4ce 100644 --- a/security/keys/encrypted_defined.c +++ b/security/keys/encrypted.c @@ -30,7 +30,7 @@ #include <crypto/sha.h> #include <crypto/aes.h> -#include "encrypted_defined.h" +#include "encrypted.h" static const char KEY_TRUSTED_PREFIX[] = "trusted:"; static const char KEY_USER_PREFIX[] = "user:"; @@ -888,6 +888,7 @@ static int __init init_encrypted(void) out: encrypted_shash_release(); return ret; + } static void __exit cleanup_encrypted(void) diff --git a/security/keys/encrypted_defined.h b/security/keys/encrypted.h index cef5e2f..cef5e2f 100644 --- a/security/keys/encrypted_defined.h +++ b/security/keys/encrypted.h |