From 5ead1e508818df1218e69f47199a1863eb2336e4 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 6 Dec 2019 10:10:29 -0500 Subject: meta-security: subtree update:fa800e5261..2df7dd9fba Armin Kuster (6): tpm2-pkcs11: update to tip tpm2-abrmd": update to 2.3.0 tpm2-tools: update to 4.0.1 tpm2-tss-engine: update to tip to us tss-tools 4.0.x tpm2-totp: update to 0.2.0 README: update mailing list to new groups.io Change-Id: Iae675505d3cf5b70686599a26d9162bb8aaee1b3 Signed-off-by: Brad Bishop --- .../tpm2-totp/files/litpm2_totp_build_fix.patch | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100644 meta-security/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch (limited to 'meta-security/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch') diff --git a/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch b/meta-security/meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch deleted file mode 100644 index c14705458..000000000 --- a/meta-security/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 - -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); -- cgit v1.2.3