path: root/include/keys
diff options
authorSumit Garg <>2019-10-16 10:44:52 +0530
committerJarkko Sakkinen <>2019-11-12 21:45:37 +0200
commit74edff2d74c64ca5977a57efb5c238c8f5318ba9 (patch)
treee9c6925cd5f9f3ef214bfd98738fde76fdf92c59 /include/keys
parent44abdb377b7c399dfec48de7252c564bdde8d26e (diff)
tpm: Move tpm_buf code to include/linux/
Move tpm_buf code to common include/linux/tpm.h header so that it can be reused via other subsystems like trusted keys etc. Also rename trusted keys and asymmetric keys usage of TPM 1.x buffer implementation to tpm1_buf to avoid any compilation errors. Suggested-by: Jarkko Sakkinen <> Signed-off-by: Sumit Garg <> Reviewed-by: Jerry Snitselaar <> Reviewed-by: Jarkko Sakkinen <> Tested-by: Jarkko Sakkinen <> Signed-off-by: Jarkko Sakkinen <>
Diffstat (limited to 'include/keys')
1 files changed, 6 insertions, 6 deletions
diff --git a/include/keys/trusted.h b/include/keys/trusted.h
index 0071298b9b28..841ae111c976 100644
--- a/include/keys/trusted.h
+++ b/include/keys/trusted.h
@@ -17,7 +17,7 @@
#define LOAD32N(buffer, offset) (*(uint32_t *)&buffer[offset])
#define LOAD16(buffer, offset) (ntohs(*(uint16_t *)&buffer[offset]))
-struct tpm_buf {
+struct tpm1_buf {
int len;
unsigned char data[MAX_BUF_SIZE];
@@ -46,7 +46,7 @@ int TSS_checkhmac1(unsigned char *buffer,
unsigned int keylen, ...);
int trusted_tpm_send(unsigned char *cmd, size_t buflen);
-int oiap(struct tpm_buf *tb, uint32_t *handle, unsigned char *nonce);
+int oiap(struct tpm1_buf *tb, uint32_t *handle, unsigned char *nonce);
#define TPM_DEBUG 0
@@ -110,24 +110,24 @@ static inline void dump_tpm_buf(unsigned char *buf)
-static inline void store8(struct tpm_buf *buf, const unsigned char value)
+static inline void store8(struct tpm1_buf *buf, const unsigned char value)
buf->data[buf->len++] = value;
-static inline void store16(struct tpm_buf *buf, const uint16_t value)
+static inline void store16(struct tpm1_buf *buf, const uint16_t value)
*(uint16_t *) & buf->data[buf->len] = htons(value);
buf->len += sizeof value;
-static inline void store32(struct tpm_buf *buf, const uint32_t value)
+static inline void store32(struct tpm1_buf *buf, const uint32_t value)
*(uint32_t *) & buf->data[buf->len] = htonl(value);
buf->len += sizeof value;
-static inline void storebytes(struct tpm_buf *buf, const unsigned char *in,
+static inline void storebytes(struct tpm1_buf *buf, const unsigned char *in,
const int len)
memcpy(buf->data + buf->len, in, len);