aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorMimi Zohar <zohar@linux.vnet.ibm.com>2011-01-18 09:07:11 -0500
committerJames Morris <jmorris@namei.org>2011-01-24 10:14:22 +1100
commit4b174b6d281f5c87234fc65bafc02877f565c5cf (patch)
tree5c1f0519d2f4d642ac9ecec9a180019fe980958e /security
parent1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 (diff)
downloadlinux-linaro-4b174b6d281f5c87234fc65bafc02877f565c5cf.tar.gz
trusted-keys: rename trusted_defined files to trusted
Rename trusted_defined.c and trusted_defined.h files to trusted.c and trusted.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>
Diffstat (limited to 'security')
-rw-r--r--security/keys/Makefile2
-rw-r--r--security/keys/trusted.c (renamed from security/keys/trusted_defined.c)2
-rw-r--r--security/keys/trusted.h (renamed from security/keys/trusted_defined.h)0
3 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/Makefile b/security/keys/Makefile
index 6c941050f57..ad8da87653c 100644
--- a/security/keys/Makefile
+++ b/security/keys/Makefile
@@ -13,7 +13,7 @@ obj-y := \
request_key_auth.o \
user_defined.o
-obj-$(CONFIG_TRUSTED_KEYS) += trusted_defined.o
+obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted_defined.o
obj-$(CONFIG_KEYS_COMPAT) += compat.o
obj-$(CONFIG_PROC_FS) += proc.o
diff --git a/security/keys/trusted_defined.c b/security/keys/trusted.c
index 2836c6dc18a..3066f56c767 100644
--- a/security/keys/trusted_defined.c
+++ b/security/keys/trusted.c
@@ -29,7 +29,7 @@
#include <linux/tpm.h>
#include <linux/tpm_command.h>
-#include "trusted_defined.h"
+#include "trusted.h"
static const char hmac_alg[] = "hmac(sha1)";
static const char hash_alg[] = "sha1";
diff --git a/security/keys/trusted_defined.h b/security/keys/trusted.h
index 3249fbd2b65..3249fbd2b65 100644
--- a/security/keys/trusted_defined.h
+++ b/security/keys/trusted.h