diff options
| author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-08-27 22:21:26 -0400 |
|---|---|---|
| committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2011-09-14 15:23:49 -0400 |
| commit | 982e617a313b57abee3bcfa53381c356d00fd64a (patch) | |
| tree | ba23ab206aaff2331bca116cebd11ad4ef580c32 /security/keys/encrypted-keys/encrypted.h | |
| parent | 61cf45d0199041df1a8ba334b6bf4a3a13b7f904 (diff) | |
| download | kernel_goldelico_gta04-982e617a313b57abee3bcfa53381c356d00fd64a.zip kernel_goldelico_gta04-982e617a313b57abee3bcfa53381c356d00fd64a.tar.gz kernel_goldelico_gta04-982e617a313b57abee3bcfa53381c356d00fd64a.tar.bz2 | |
encrypted-keys: remove trusted-keys dependency
Encrypted keys are decrypted/encrypted using either a trusted-key or,
for those systems without a TPM, a user-defined key. This patch
removes the trusted-keys and TCG_TPM dependencies.
Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Diffstat (limited to 'security/keys/encrypted-keys/encrypted.h')
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/security/keys/encrypted-keys/encrypted.h b/security/keys/encrypted-keys/encrypted.h index cef5e2f..b6ade89 100644 --- a/security/keys/encrypted-keys/encrypted.h +++ b/security/keys/encrypted-keys/encrypted.h @@ -2,6 +2,17 @@ #define __ENCRYPTED_KEY_H #define ENCRYPTED_DEBUG 0 +#ifdef CONFIG_TRUSTED_KEYS +extern struct key *request_trusted_key(const char *trusted_desc, + u8 **master_key, size_t *master_keylen); +#else +static inline struct key *request_trusted_key(const char *trusted_desc, + u8 **master_key, + size_t *master_keylen) +{ + return ERR_PTR(-EOPNOTSUPP); +} +#endif #if ENCRYPTED_DEBUG static inline void dump_master_key(const u8 *master_key, size_t master_keylen) |