diff options
| author | James Morris <jmorris@namei.org> | 2011-11-18 01:17:23 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-11-18 01:17:23 +0100 |
| commit | b85c804d5ad48f239871b95afbddd84422e06f25 (patch) | |
| tree | b78af4d780dc7eec0c7b866194385150e6b29500 /security/keys/encrypted-keys/encrypted.h | |
| parent | Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus (diff) | |
| parent | encrypted-keys: module build fixes (diff) | |
| download | linux-b85c804d5ad48f239871b95afbddd84422e06f25.tar.xz linux-b85c804d5ad48f239871b95afbddd84422e06f25.zip | |
Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
Diffstat (limited to 'security/keys/encrypted-keys/encrypted.h')
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.h | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ #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 |