Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b85c804d authored by James Morris's avatar James Morris
Browse files

Merge branch 'encrypted-key-fixes' of... 

Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
parents fe8a0df4 9c698987

security/keys/encrypted-keys/Makefile

+6 −2
Original line number Original line Diff line number Diff line
@@ -2,5 +2,9 @@ 
# Makefile for encrypted keys

# Makefile for encrypted keys

#

#





obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted.o ecryptfs_format.o

obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys.o

obj-$(CONFIG_TRUSTED_KEYS) += masterkey_trusted.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)

security/keys/encrypted-keys/encrypted.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -444,7 +444,7 @@ static struct key *request_master_key(struct encrypted_key_payload *epayload, 
		goto out;

		goto out;





	if (IS_ERR(mkey)) {

	if (IS_ERR(mkey)) {

		int ret = PTR_ERR(epayload);

		int ret = PTR_ERR(mkey);





		if (ret == -ENOTSUPP)

		if (ret == -ENOTSUPP)

			pr_info("encrypted_key: key %s not supported",

			pr_info("encrypted_key: key %s not supported",

security/keys/encrypted-keys/encrypted.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,8 @@ 
#define __ENCRYPTED_KEY_H

#define __ENCRYPTED_KEY_H





#define ENCRYPTED_DEBUG 0

#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,

extern struct key *request_trusted_key(const char *trusted_desc,

				       u8 **master_key, size_t *master_keylen);

				       u8 **master_key, size_t *master_keylen);

#else

#else