Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
This commit is contained in:
commit
b85c804d5a
3 changed files with 9 additions and 4 deletions
|
@ -2,5 +2,9 @@
|
|||
# Makefile for encrypted keys
|
||||
#
|
||||
|
||||
obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o ecryptfs_format.o
|
||||
obj-$(CONFIG_TRUSTED_KEYS) += masterkey_trusted.o
|
||||
obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys.o
|
||||
|
||||
encrypted-keys-y := encrypted.o ecryptfs_format.o
|
||||
masterkey-$(CONFIG_TRUSTED_KEYS) := masterkey_trusted.o
|
||||
masterkey-$(CONFIG_TRUSTED_KEYS)-$(CONFIG_ENCRYPTED_KEYS) := masterkey_trusted.o
|
||||
encrypted-keys-y += $(masterkey-y) $(masterkey-m-m)
|
||||
|
|
|
@ -444,7 +444,7 @@ static struct key *request_master_key(struct encrypted_key_payload *epayload,
|
|||
goto out;
|
||||
|
||||
if (IS_ERR(mkey)) {
|
||||
int ret = PTR_ERR(epayload);
|
||||
int ret = PTR_ERR(mkey);
|
||||
|
||||
if (ret == -ENOTSUPP)
|
||||
pr_info("encrypted_key: key %s not supported",
|
||||
|
|
|
@ -2,7 +2,8 @@
|
|||
#define __ENCRYPTED_KEY_H
|
||||
|
||||
#define ENCRYPTED_DEBUG 0
|
||||
#ifdef CONFIG_TRUSTED_KEYS
|
||||
#if defined(CONFIG_TRUSTED_KEYS) || \
|
||||
(defined(CONFIG_TRUSTED_KEYS_MODULE) && defined(CONFIG_ENCRYPTED_KEYS_MODULE))
|
||||
extern struct key *request_trusted_key(const char *trusted_desc,
|
||||
u8 **master_key, size_t *master_keylen);
|
||||
#else
|
||||
|
|
Loading…
Reference in a new issue