diff options
Diffstat (limited to 'security/keys')
| -rw-r--r-- | security/keys/Makefile | 2 | ||||
| -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 6c941050f573..ad8da87653cf 100644 --- a/security/keys/Makefile +++ b/security/keys/Makefile | |||
| @@ -13,7 +13,7 @@ obj-y := \ | |||
| 13 | request_key_auth.o \ | 13 | request_key_auth.o \ |
| 14 | user_defined.o | 14 | user_defined.o |
| 15 | 15 | ||
| 16 | obj-$(CONFIG_TRUSTED_KEYS) += trusted_defined.o | 16 | obj-$(CONFIG_TRUSTED_KEYS) += trusted.o |
| 17 | obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted_defined.o | 17 | obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted_defined.o |
| 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 |
diff --git a/security/keys/trusted_defined.c b/security/keys/trusted.c index 2836c6dc18a3..3066f56c7676 100644 --- a/security/keys/trusted_defined.c +++ b/security/keys/trusted.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #include <linux/tpm.h> | 29 | #include <linux/tpm.h> |
| 30 | #include <linux/tpm_command.h> | 30 | #include <linux/tpm_command.h> |
| 31 | 31 | ||
| 32 | #include "trusted_defined.h" | 32 | #include "trusted.h" |
| 33 | 33 | ||
| 34 | static const char hmac_alg[] = "hmac(sha1)"; | 34 | static const char hmac_alg[] = "hmac(sha1)"; |
| 35 | static const char hash_alg[] = "sha1"; | 35 | static const char hash_alg[] = "sha1"; |
diff --git a/security/keys/trusted_defined.h b/security/keys/trusted.h index 3249fbd2b653..3249fbd2b653 100644 --- a/security/keys/trusted_defined.h +++ b/security/keys/trusted.h | |||