From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> To: denkenz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org, jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org, jejb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org Cc: tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org, linux-integrity-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, keyrings-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH 13/23] TPMLIB: Rename store8() and storebytes() Date: Tue, 21 Aug 2018 16:58:17 +0100 Message-ID: <153486709741.13066.7109350297231028843.stgit@warthog.procyon.org.uk> (raw) In-Reply-To: <153486700916.13066.12870860668352070081.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> Rename store8() and storebytes() so that the names are the same length as for store16() and store32() and their parameters line up, making blocks of them easier to read. Signed-off-by: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> --- drivers/char/tpm/tpm-library.c | 28 ++++++++++++++-------------- drivers/char/tpm/tpm-library.h | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/drivers/char/tpm/tpm-library.c b/drivers/char/tpm/tpm-library.c index 1c64282d1d0d..1eea483cf36b 100644 --- a/drivers/char/tpm/tpm-library.c +++ b/drivers/char/tpm/tpm-library.c @@ -427,7 +427,7 @@ static int tpm_create_osap(struct tpm_chip *chip, store32(tb, TPM_ORD_OSAP); store16(tb, keytype); store32(tb, keyhandle); - storebytes(tb, ononce.data, TPM_NONCE_SIZE); + store_s(tb, ononce.data, TPM_NONCE_SIZE); ret = tpm_send_dump(chip, tb->data, MAX_BUF_SIZE, "creating OSAP session"); @@ -579,15 +579,15 @@ int tpm_seal(struct tpm_chip *chip, store32(tb, TPM_SEAL_SIZE + pcrinfosize + rawlen); store32(tb, TPM_ORD_SEAL); store32(tb, keyhandle); - storebytes(tb, td->encauth, SHA1_DIGEST_SIZE); + store_s(tb, td->encauth, SHA1_DIGEST_SIZE); store32(tb, pcrinfosize); - storebytes(tb, pcrinfo, pcrinfosize); + store_s(tb, pcrinfo, pcrinfosize); store32(tb, rawlen); - storebytes(tb, rawdata, rawlen); + store_s(tb, rawdata, rawlen); store32(tb, sess.handle); - storebytes(tb, td->ononce.data, TPM_NONCE_SIZE); - store8(tb, cont); - storebytes(tb, td->pubauth, SHA1_DIGEST_SIZE); + store_s(tb, td->ononce.data, TPM_NONCE_SIZE); + store_8(tb, cont); + store_s(tb, td->pubauth, SHA1_DIGEST_SIZE); ret = tpm_send_dump(chip, tb->data, MAX_BUF_SIZE, "sealing data"); @@ -688,15 +688,15 @@ int tpm_unseal(struct tpm_chip *chip, struct tpm_buf *tb, store32(tb, TPM_UNSEAL_SIZE + enclen); store32(tb, TPM_ORD_UNSEAL); store32(tb, keyhandle); - storebytes(tb, encdata, enclen); + store_s(tb, encdata, enclen); store32(tb, authhandle1); - storebytes(tb, ononce.data, TPM_NONCE_SIZE); - store8(tb, cont); - storebytes(tb, authdata1, SHA1_DIGEST_SIZE); + store_s(tb, ononce.data, TPM_NONCE_SIZE); + store_8(tb, cont); + store_s(tb, authdata1, SHA1_DIGEST_SIZE); store32(tb, authhandle2); - storebytes(tb, ononce.data, TPM_NONCE_SIZE); - store8(tb, cont); - storebytes(tb, authdata2, SHA1_DIGEST_SIZE); + store_s(tb, ononce.data, TPM_NONCE_SIZE); + store_8(tb, cont); + store_s(tb, authdata2, SHA1_DIGEST_SIZE); ret = tpm_send_dump(chip, tb->data, MAX_BUF_SIZE, "unsealing data"); diff --git a/drivers/char/tpm/tpm-library.h b/drivers/char/tpm/tpm-library.h index ceb0ea1cd2bb..c1af99dba08d 100644 --- a/drivers/char/tpm/tpm-library.h +++ b/drivers/char/tpm/tpm-library.h @@ -29,25 +29,25 @@ struct tpm_osapsess { struct tpm_even_nonce enonce; }; -static inline void store8(struct tpm_buf *buf, const unsigned char value) +static inline void store_8(struct tpm_buf *buf, 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 tpm_buf *buf, uint16_t value) { - *(uint16_t *) & buf->data[buf->len] = htons(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 tpm_buf *buf, uint32_t value) { - *(uint32_t *) & buf->data[buf->len] = htonl(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, - const int len) +static inline void store_s(struct tpm_buf *buf, const unsigned char *in, + int len) { memcpy(buf->data + buf->len, in, len); buf->len += len; ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
next prev parent reply index Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-08-21 15:56 tpm: Provide a TPM access library David Howells [not found] ` <153486700916.13066.12870860668352070081.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-08-21 15:56 ` [PATCH 01/23] TPM: Add new TPMs to the tail of the list to prevent inadvertent change of dev David Howells [not found] ` <153486701644.13066.13372706238885253812.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-08-21 18:30 ` Jason Gunthorpe [not found] ` <20180821183004.GB25543-uk2M96/98Pc@public.gmane.org> 2018-08-24 6:24 ` Jarkko Sakkinen [not found] ` <20180824062434.GB3584-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2018-08-24 6:25 ` Jarkko Sakkinen [not found] ` <20180824062557.GC3584-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2018-08-24 11:22 ` Mimi Zohar 2018-08-24 6:19 ` Jarkko Sakkinen 2018-08-21 15:57 ` [PATCH 02/23] TPM: Provide a facility for a userspace TPM emulator David Howells [not found] ` <153486702302.13066.15889029286852815542.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-08-21 18:31 ` Jason Gunthorpe [not found] ` <20180821183140.GD25543-uk2M96/98Pc@public.gmane.org> 2018-08-24 6:29 ` Jarkko Sakkinen 2018-08-21 15:57 ` [PATCH 03/23] TPM: Provide a platform driver for the user emulator driver David Howells [not found] ` <153486702979.13066.16900998092976336647.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-08-24 6:30 ` Jarkko Sakkinen 2018-08-21 15:57 ` [PATCH 04/23] TPM: Expose struct tpm_chip and related find_get and put functions David Howells [not found] ` <153486703636.13066.16209594327379341518.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-08-21 18:31 ` Jason Gunthorpe [not found] ` <20180821183108.GC25543-uk2M96/98Pc@public.gmane.org> 2018-08-21 18:35 ` David Howells 2018-08-21 15:57 ` [PATCH 05/23] TPM: Use struct tpm_chip rather than chip number as interface parameter David Howells [not found] ` <153486704294.13066.8818198038331415342.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-08-24 7:42 ` Jarkko Sakkinen 2018-08-21 15:57 ` [PATCH 06/23] TPM: Move ordinal values from interface file to header with other ordinals David Howells 2018-08-21 15:57 ` [PATCH 07/23] TPM: Consolidate tpm_send(), transmit_cmd() and tpm_transmit() David Howells 2018-08-21 15:57 ` [PATCH 08/23] TPMLIB: Break TPM bits out of security/keys/trusted.c David Howells [not found] ` <153486706322.13066.3105842100625841410.stgit-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-08-24 7:52 ` Jarkko Sakkinen [not found] ` <20180824075227.GG3584-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2018-08-24 8:49 ` Jarkko Sakkinen [not found] ` <20180824084930.GA10266-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2018-08-24 9:33 ` David Howells [not found] ` <25340.1535103190-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-08-27 8:25 ` Jarkko Sakkinen 2018-08-21 15:57 ` [PATCH 09/23] TPMLIB: Do some source cleanups David Howells 2018-08-21 15:57 ` [PATCH 10/23] TPMLIB: Better format calls to TSS_*hmac*() David Howells 2018-08-21 15:58 ` [PATCH 11/23] TPMLIB: Put banner comments on public TPM library functions David Howells 2018-08-21 15:58 ` [PATCH 12/23] TPMLIB: Create tpm_{even, odd}_nonce structs to represent nonces David Howells 2018-08-21 15:58 ` David Howells [this message] 2018-08-21 15:58 ` [PATCH 14/23] TPMLIB: Make store_s() take a void* data argument, not unsigned char* David Howells 2018-08-21 15:58 ` [PATCH 15/23] TPMLIB: Use __be32 rather than int32_t and use cpu_to_beX() and co David Howells 2018-08-21 15:58 ` [PATCH 16/23] TPMLIB: Put more comments into the HMAC generation functions David Howells 2018-08-21 15:58 ` [PATCH 17/23] TPMLIB: Provide a wrapper to load bytes out of the reply David Howells 2018-08-21 15:58 ` [PATCH 18/23] TPMLIB: Encapsulate XOR-based encryption with authkey derivative David Howells 2018-08-21 15:58 ` [PATCH 19/23] TPMLIB: Add some debugging code David Howells 2018-08-21 15:59 ` [PATCH 20/23] TPMLIB: Implement call to TPM_CreateWrapKey David Howells 2018-08-21 15:59 ` [PATCH 21/23] TPMLIB: Implement call to TPM_LoadKey2 David Howells 2018-08-21 15:59 ` [PATCH 22/23] TPMLIB: Provide call for TPM_FlushSpecific David Howells 2018-08-21 15:59 ` [PATCH 23/23] TPM: Add an asymmetric key subtype for handling TPM-based keys David Howells 2018-08-22 14:19 ` tpm: Provide a TPM access library Jarkko Sakkinen [not found] ` <20180822141956.GA28110-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> 2018-08-22 14:45 ` David Howells [not found] ` <13611.1534949106-S6HVgzuS8uM4Awkfq6JHfwNdhmdF6hFW@public.gmane.org> 2018-08-23 22:49 ` Jarkko Sakkinen
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=153486709741.13066.7109350297231028843.stgit@warthog.procyon.org.uk \ --to=dhowells-h+wxahxf7alqt0dzr+alfa@public.gmane.org \ --cc=denkenz-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \ --cc=jarkko.sakkinen-VuQAYsv1563Yd54FQh9/CA@public.gmane.org \ --cc=jejb-23VcF4HTsmIX0ybBhKVfKdBPR1lH4CV8@public.gmane.org \ --cc=keyrings-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-integrity-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=tpmdd-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \ /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
tpmdd-devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/tpmdd-devel/0 tpmdd-devel/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 tpmdd-devel tpmdd-devel/ https://lore.kernel.org/tpmdd-devel \ tpmdd-devel@lists.sourceforge.net public-inbox-index tpmdd-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/net.sourceforge.lists.tpmdd-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git