From: "Armpit" <akuster808@gmail.com>
To: yocto@lists.yoctoproject.org
Subject: [meta-security][PATCH 5/6] tpm2-totp: update to 0.2.0
Date: Tue, 3 Dec 2019 18:36:01 -0800 [thread overview]
Message-ID: <20191204023602.31748-5-akuster808@gmail.com> (raw)
In-Reply-To: <20191204023602.31748-1-akuster808@gmail.com>
LIC_FILES_CHKSUM update to be true BSD-3-clause text
Drop patch included
Signed-off-by: Armin Kuster <akuster808@gmail.com>
---
.../files/litpm2_totp_build_fix.patch | 36 -------------------
...{tpm2-totp_0.1.2.bb => tpm2-totp_0.2.0.bb} | 6 ++--
2 files changed, 3 insertions(+), 39 deletions(-)
delete mode 100644 meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch
rename meta-tpm/recipes-tpm2/tpm2-totp/{tpm2-totp_0.1.2.bb => tpm2-totp_0.2.0.bb} (79%)
diff --git a/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch b/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch
deleted file mode 100644
index c147054..0000000
--- a/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-C99 fixes:
-
- src/libtpm2-totp.c:172:13: error: format '%li' expects argument of type 'long int', but argument 3 has type 'size_t' {aka 'unsigned int'} [-Werror=format=]
-| dbg("Calling Esys_GetRandom for %li bytes", SECRETLEN - *secret_size);
-
-src/tpm2-totp.c:343:23: error: format '%ld' expects argument of type 'long int', but argument 3 has type 'uint64_t' {aka 'long long unsigned int'} [-Werror=format=]
-
-Upstream-Status: Pending
-Signed-off-by: Armin Kuster <akuster808@gmail.com>
-
-Index: git/src/libtpm2-totp.c
-===================================================================
---- git.orig/src/libtpm2-totp.c
-+++ git/src/libtpm2-totp.c
-@@ -169,7 +169,7 @@ tpm2totp_generateKey(uint32_t pcrs, uint
- if (rc != TPM2_RC_INITIALIZE) chkrc(rc, goto error);
-
- while (*secret_size < SECRETLEN) {
-- dbg("Calling Esys_GetRandom for %li bytes", SECRETLEN - *secret_size);
-+ dbg("Calling Esys_GetRandom for %li bytes", (long int) (SECRETLEN - *secret_size));
- rc = Esys_GetRandom(ctx,
- ESYS_TR_NONE, ESYS_TR_NONE, ESYS_TR_NONE,
- SECRETLEN - *secret_size, &t);
-Index: git/src/tpm2-totp.c
-===================================================================
---- git.orig/src/tpm2-totp.c
-+++ git/src/tpm2-totp.c
-@@ -340,7 +340,7 @@ main(int argc, char **argv)
- localtime (&now));
- chkrc(rc, exit(1));
- }
-- printf("%s%06ld", timestr, totp);
-+ printf("%s%06ld", timestr, (long int)totp);
- break;
- case CMD_RESEAL:
- rc = tpm2totp_loadKey_nv(opt.nvindex, &keyBlob, &keyBlob_size);
diff --git a/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb b/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.2.0.bb
similarity index 79%
rename from meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb
rename to meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.2.0.bb
index 8a2504d..0dad673 100644
--- a/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb
+++ b/meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.2.0.bb
@@ -9,9 +9,9 @@ DEPENDS = "autoconf-archive libtss2-dev qrencode"
PE = "1"
-SRCREV = "15cc8fbc8fe71be9c04c3169ee1f70450d52a51a"
-SRC_URI = "git://github.com/tpm2-software/tpm2-totp.git;branch=v0.1.x \
- file://litpm2_totp_build_fix.patch "
+SRCREV = "994b4203e4769baefa6e7719915629bc8210e90a"
+SRC_URI = "git://github.com/tpm2-software/tpm2-totp.git;branch=v0.2.x \
+ "
inherit autotools-brokensep pkgconfig
--
2.17.1
next prev parent reply other threads:[~2019-12-04 2:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 2:35 [meta-security][PATCH 1/6] tpm2-pkcs11: update to tip Armpit
2019-12-04 2:35 ` [meta-security][PATCH 2/6] tpm2-abrmd": update to 2.3.0 Armpit
2019-12-04 2:35 ` [meta-security][PATCH 3/6] tpm2-tools: update to 4.0.1 Armpit
2019-12-04 2:36 ` [meta-security][PATCH 4/6] tpm2-tss-engine: update to tip to us tss-tools 4.0.x Armpit
2019-12-04 2:36 ` Armpit [this message]
2019-12-04 2:36 ` [meta-security][PATCH 6/6] README: update mailing list to new groups.io Armpit
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=20191204023602.31748-5-akuster808@gmail.com \
--to=akuster808@gmail.com \
--cc=yocto@lists.yoctoproject.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox