mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-06-04 14:10:22 +00:00
Code Issues Projects Releases Wiki Activity

tpm2-totp: update to 0.2.0

Browse Source 
LIC_FILES_CHKSUM update to be true BSD-3-clause text
Drop patch included

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2019-12-02 08:46:48 -08:00
parent 42df7b4eb0
commit 5b1d0ff414
2 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch
-36
View File
@@ -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);
meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb → meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.2.0.bb
+3 -3
View File
@@ -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