From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: tpmdd-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org
Cc: peterhuewe@gmx.de, gregkh@linuxfoundation.org,
jgunthorpe@obsidianresearch.com, dhowells@redhat.com,
artem.bityutskiy@linux.intel.com,
Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
David Safford <safford@us.ibm.com>,
Mimi Zohar <zohar@linux.vnet.ibm.com>,
James Morris <james.l.morris@oracle.com>,
"Serge E. Hallyn" <serge@hallyn.com>,
linux-security-module@vger.kernel.org (open list:KEYS-TRUSTED),
keyrings@vger.kernel.org (open list:KEYS-TRUSTED)
Subject: [PATCH 07/10] keys, trusted: move struct trusted_key_options to trusted-type.h
Date: Fri, 16 Oct 2015 21:40:26 +0300 [thread overview]
Message-ID: <1445020843-9382-8-git-send-email-jarkko.sakkinen@linux.intel.com> (raw)
In-Reply-To: <1445020843-9382-1-git-send-email-jarkko.sakkinen@linux.intel.com>
Moved struct trusted_key_options to trustes-type.h so that the fields
can be accessed from drivers/char/tpm.
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
include/keys/trusted-type.h | 12 ++++++++++++
security/keys/trusted.h | 11 -----------
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/include/keys/trusted-type.h b/include/keys/trusted-type.h
index 56f82e5..c91651f 100644
--- a/include/keys/trusted-type.h
+++ b/include/keys/trusted-type.h
@@ -12,10 +12,12 @@
#include <linux/key.h>
#include <linux/rcupdate.h>
+#include <linux/tpm.h>
#define MIN_KEY_SIZE 32
#define MAX_KEY_SIZE 128
#define MAX_BLOB_SIZE 320
+#define MAX_PCRINFO_SIZE 64
struct trusted_key_payload {
struct rcu_head rcu;
@@ -26,6 +28,16 @@ struct trusted_key_payload {
unsigned char blob[MAX_BLOB_SIZE];
};
+struct trusted_key_options {
+ uint16_t keytype;
+ uint32_t keyhandle;
+ unsigned char keyauth[TPM_DIGEST_SIZE];
+ unsigned char blobauth[TPM_DIGEST_SIZE];
+ uint32_t pcrinfo_len;
+ unsigned char pcrinfo[MAX_PCRINFO_SIZE];
+ int pcrlock;
+};
+
extern struct key_type key_type_trusted;
#endif /* _KEYS_TRUSTED_TYPE_H */
diff --git a/security/keys/trusted.h b/security/keys/trusted.h
index 3249fbd..ff001a5 100644
--- a/security/keys/trusted.h
+++ b/security/keys/trusted.h
@@ -2,7 +2,6 @@
#define __TRUSTED_KEY_H
/* implementation specific TPM constants */
-#define MAX_PCRINFO_SIZE 64
#define MAX_BUF_SIZE 512
#define TPM_GETRANDOM_SIZE 14
#define TPM_OSAP_SIZE 36
@@ -36,16 +35,6 @@ enum {
SRK_keytype = 4
};
-struct trusted_key_options {
- uint16_t keytype;
- uint32_t keyhandle;
- unsigned char keyauth[SHA1_DIGEST_SIZE];
- unsigned char blobauth[SHA1_DIGEST_SIZE];
- uint32_t pcrinfo_len;
- unsigned char pcrinfo[MAX_PCRINFO_SIZE];
- int pcrlock;
-};
-
#define TPM_DEBUG 0
#if TPM_DEBUG
--
2.5.0
next prev parent reply other threads:[~2015-10-16 18:41 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 18:40 [PATCH 00/10] TPM2 updates for 4.4 Jarkko Sakkinen
2015-10-16 18:40 ` Jarkko Sakkinen
2015-10-16 18:40 ` [PATCH 01/10] tpm, tpm_crb: fix unaligned read of the command buffer address Jarkko Sakkinen
2015-10-18 3:02 ` Peter Hüwe
2015-10-18 11:15 ` Jarkko Sakkinen
2015-10-16 18:40 ` [PATCH 02/10] tpm, tpm_tis: fix tpm_tis ACPI detection issue with TPM 2.0 Jarkko Sakkinen
2015-10-16 18:40 ` [PATCH 03/10] sysfs: added __compat_only_sysfs_link_entry_to_kobj() Jarkko Sakkinen
2015-10-18 1:37 ` Peter Hüwe
2015-10-18 11:21 ` Jarkko Sakkinen
2015-11-07 0:23 ` Jeremiah Mahler
2015-11-09 22:32 ` Jason Gunthorpe
2015-11-07 2:55 ` [BUG, PATCH " Jeremiah Mahler
2015-11-07 10:55 ` Jarkko Sakkinen
2015-11-07 11:41 ` Jarkko Sakkinen
2015-11-07 18:08 ` Jeremiah Mahler
2015-11-07 22:31 ` Jarkko Sakkinen
2015-11-07 23:11 ` Jeremiah Mahler
2015-11-08 0:49 ` Jarkko Sakkinen
2015-11-08 3:04 ` Jeremiah Mahler
2015-11-08 7:46 ` Jarkko Sakkinen
2015-10-16 18:40 ` [PATCH 04/10] tpm: move the PPI attributes to character device directory Jarkko Sakkinen
2015-11-04 18:17 ` [BUG, bisect, PATCH " Jeremiah Mahler
2015-11-05 9:22 ` Jarkko Sakkinen
2015-11-05 11:05 ` [tpmdd-devel] " Jarkko Sakkinen
2015-11-05 16:47 ` Jeremiah Mahler
2015-11-05 17:46 ` Jarkko Sakkinen
2015-11-05 18:17 ` Jeremiah Mahler
2015-11-06 13:45 ` Jarkko Sakkinen
2015-11-07 2:54 ` Jeremiah Mahler
2015-10-16 18:40 ` [PATCH 05/10] tpm: update PPI documentation to address the location change Jarkko Sakkinen
2015-10-16 18:40 ` Jarkko Sakkinen
2015-10-16 18:40 ` [PATCH 06/10] tpm: introduce tpm_buf Jarkko Sakkinen
2015-10-18 2:57 ` Peter Hüwe
2015-10-18 11:19 ` Jarkko Sakkinen
2015-10-16 18:40 ` Jarkko Sakkinen [this message]
2015-10-16 18:40 ` [PATCH 08/10] tpm: seal/unseal for TPM 2.0 Jarkko Sakkinen
2015-11-07 18:58 ` Jeremiah Mahler
2015-11-07 21:39 ` Jarkko Sakkinen
2015-10-16 18:40 ` [PATCH 09/10] keys, trusted: seal/unseal with TPM 2.0 chips Jarkko Sakkinen
2015-10-16 18:40 ` [PATCH 10/10] MAINTAINERS: add new maintainer for TPM DEVICE DRIVER Jarkko Sakkinen
2015-10-16 19:06 ` [tpmdd-devel] [PATCH 00/10] TPM2 updates for 4.4 Kevin Strasser
2015-10-16 19:06 ` Kevin Strasser
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445020843-9382-8-git-send-email-jarkko.sakkinen@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=artem.bityutskiy@linux.intel.com \
--cc=dhowells@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=james.l.morris@oracle.com \
--cc=jgunthorpe@obsidianresearch.com \
--cc=keyrings@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=peterhuewe@gmx.de \
--cc=safford@us.ibm.com \
--cc=serge@hallyn.com \
--cc=tpmdd-devel@lists.sourceforge.net \
--cc=zohar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.