diff options
Diffstat (limited to 'security/keys/encrypted-keys')
-rw-r--r-- | security/keys/encrypted-keys/Makefile | 8 | ||||
-rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 2 | ||||
-rw-r--r-- | security/keys/encrypted-keys/encrypted.h | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/security/keys/encrypted-keys/Makefile b/security/keys/encrypted-keys/Makefile index 6bc7a86d1027..d6f8433250a5 100644 --- a/security/keys/encrypted-keys/Makefile +++ b/security/keys/encrypted-keys/Makefile | |||
@@ -2,5 +2,9 @@ | |||
2 | # Makefile for encrypted keys | 2 | # Makefile for encrypted keys |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o ecryptfs_format.o | 5 | obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys.o |
6 | obj-$(CONFIG_TRUSTED_KEYS) += masterkey_trusted.o | 6 | |
7 | encrypted-keys-y := encrypted.o ecryptfs_format.o | ||
8 | masterkey-$(CONFIG_TRUSTED_KEYS) := masterkey_trusted.o | ||
9 | masterkey-$(CONFIG_TRUSTED_KEYS)-$(CONFIG_ENCRYPTED_KEYS) := masterkey_trusted.o | ||
10 | encrypted-keys-y += $(masterkey-y) $(masterkey-m-m) | ||
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index dcc843cb0f80..41144f71d615 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c | |||
@@ -444,7 +444,7 @@ static struct key *request_master_key(struct encrypted_key_payload *epayload, | |||
444 | goto out; | 444 | goto out; |
445 | 445 | ||
446 | if (IS_ERR(mkey)) { | 446 | if (IS_ERR(mkey)) { |
447 | int ret = PTR_ERR(epayload); | 447 | int ret = PTR_ERR(mkey); |
448 | 448 | ||
449 | if (ret == -ENOTSUPP) | 449 | if (ret == -ENOTSUPP) |
450 | pr_info("encrypted_key: key %s not supported", | 450 | pr_info("encrypted_key: key %s not supported", |
diff --git a/security/keys/encrypted-keys/encrypted.h b/security/keys/encrypted-keys/encrypted.h index b6ade8945250..8136a2d44c63 100644 --- a/security/keys/encrypted-keys/encrypted.h +++ b/security/keys/encrypted-keys/encrypted.h | |||
@@ -2,7 +2,8 @@ | |||
2 | #define __ENCRYPTED_KEY_H | 2 | #define __ENCRYPTED_KEY_H |
3 | 3 | ||
4 | #define ENCRYPTED_DEBUG 0 | 4 | #define ENCRYPTED_DEBUG 0 |
5 | #ifdef CONFIG_TRUSTED_KEYS | 5 | #if defined(CONFIG_TRUSTED_KEYS) || \ |
6 | (defined(CONFIG_TRUSTED_KEYS_MODULE) && defined(CONFIG_ENCRYPTED_KEYS_MODULE)) | ||
6 | extern struct key *request_trusted_key(const char *trusted_desc, | 7 | extern struct key *request_trusted_key(const char *trusted_desc, |
7 | u8 **master_key, size_t *master_keylen); | 8 | u8 **master_key, size_t *master_keylen); |
8 | #else | 9 | #else |