Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

encrypted-keys: module build fixes

Browse source 
Encrypted keys are encrypted/decrypted using either a trusted or
user-defined key type, which is referred to as the 'master' key.
The master key may be of type trusted iff the trusted key is
builtin or both the trusted key and encrypted keys are built as
modules.  This patch resolves the build dependency problem.

- Use "masterkey-$(CONFIG_TRUSTED_KEYS)-$(CONFIG_ENCRYPTED_KEYS)" construct
to encapsulate the above logic. (Suggested by Dimtry Kasatkin.)
- Fixing the encrypted-keys Makefile, results in a module name change
from encrypted.ko to encrypted-keys.ko.
- Add module dependency for request_trusted_key() definition

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
This commit is contained in:
Mimi Zohar 2011-10-16 19:17:48 -04:00
parent f4a0d5abef
commit 9c69898783
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
security/keys/encrypted-keys/Makefile
View file

@ -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)

3
security/keys/encrypted-keys/encrypted.h
View file

@ -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