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>

1 files changed, 8 insertions, 27 deletions

diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index e7eca9ec4c65..3f577954b85a 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -299,31 +299,6 @@ out:
 }
 
 /*
- * request_trusted_key - request the trusted key
- *
- * Trusted keys are sealed to PCRs and other metadata. Although userspace
- * manages both trusted/encrypted key-types, like the encrypted key type
- * data, trusted key type data is not visible decrypted from userspace.
- */
-static struct key *request_trusted_key(const char *trusted_desc,
-                                       u8 **master_key, size_t *master_keylen)
-{
-        struct trusted_key_payload *tpayload;
-        struct key *tkey;
-
-        tkey = request_key(&key_type_trusted, trusted_desc, NULL);
-        if (IS_ERR(tkey))
-                goto error;
-
-        down_read(&tkey->sem);
-        tpayload = rcu_dereference(tkey->payload.data);
-        *master_key = tpayload->key;
-        *master_keylen = tpayload->key_len;
-error:
-        return tkey;
-}
-
-/*
  * request_user_key - request the user key
  *
  * Use a user provided key to encrypt/decrypt an encrypted-key.
@@ -469,8 +444,14 @@ static struct key *request_master_key(struct encrypted_key_payload *epayload,
                 goto out;
 
         if (IS_ERR(mkey)) {
-                pr_info("encrypted_key: key %s not found",
-                        epayload->master_desc);
+                int ret = PTR_ERR(epayload);
+
+                if (ret == -ENOTSUPP)
+                        pr_info("encrypted_key: key %s not supported",
+                                epayload->master_desc);
+                else
+                        pr_info("encrypted_key: key %s not found",
+                                epayload->master_desc);
                 goto out;
         }