Skip to contentSkip to conversation

package/package/tpm2-totp: bump to version 0.1.2

PATCH New unixmania at gmail.com 2 participants 2 messages Aug 9, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/package/tpm2-totp: bump to version 0.1.2

From: Carlos Santos <[email protected]>

Drop patches; issues fixed upstream.

---
 ...tring-warnings-when-building-for-32b.patch | 60 -------------------
 ...ion-failure-due-to-variable-may-be-u.patch | 42 -------------
 package/tpm2-totp/tpm2-totp.hash              |  2 +-
 package/tpm2-totp/tpm2-totp.mk                |  2 +-
 4 files changed, 2 insertions(+), 104 deletions(-)
 delete mode 100644 package/tpm2-totp/0001-src-fix-format-string-warnings-when-building-for-32b.patch
 delete mode 100644 package/tpm2-totp/0002-src-fix-compilation-failure-due-to-variable-may-be-u.patch
package/tpm2-totp/0001-src-fix-format-string-warnings-when-building-for-32b.patch deleted +0 -60
deleted file mode 100644
index 5dce95cc14..0000000000
@@ -1,60 +0,0 @@
-From 1d39994398a886584c5fb14b3a646c4ae6b0d35c Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-Date: Mon, 8 Apr 2019 11:03:09 +0200
-Subject: [PATCH] src: fix format string warnings when building for 32bit
- architectures
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Building currently gives the following warnings (which fails the build
-because of Werror) about format string mismatches:
-
-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=]
-         printf("%s%06ld", timestr, totp);
-                   ~~~~^            ~~~~
-                   %06lld
-
-src/libtpm2-totp.c: In function ?tpm2totp_generateKey?:
-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);
-                                         ~~^
-                                         %i
-
-Fix it by using PRIu64 from inttypes.h for uint64_t and %zu for size_t.
-
-Signed-off-by: Peter Korsgaard <[email protected]>
----
- src/libtpm2-totp.c | 2 +-
- src/tpm2-totp.c    | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libtpm2-totp.c b/src/libtpm2-totp.c
-index e740ab1..6942771 100644
---- a/src/libtpm2-totp.c
-+++ b/src/libtpm2-totp.c
-@@ -169,7 +169,7 @@ tpm2totp_generateKey(uint32_t pcrs, uint32_t banks, const char *password,
-     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 %zu bytes", SECRETLEN - *secret_size);
-         rc = Esys_GetRandom(ctx,
-                             ESYS_TR_NONE, ESYS_TR_NONE, ESYS_TR_NONE,
-                             SECRETLEN - *secret_size, &t);
-diff --git a/src/tpm2-totp.c b/src/tpm2-totp.c
-index 47b661a..d5dcdce 100644
---- a/src/tpm2-totp.c
-+++ b/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%06" PRIu64, timestr, totp);
-         break;
-     case CMD_RESEAL:
-         rc = tpm2totp_loadKey_nv(opt.nvindex, &keyBlob, &keyBlob_size);
--- 
-2.11.0
-
package/tpm2-totp/0002-src-fix-compilation-failure-due-to-variable-may-be-u.patch deleted +0 -42

42 lines not on this page · raw message

package/tpm2-totp/tpm2-totp.hash +1 -1
index c8bc28ea6c..0449f9513a 100644
@@ -1,3 +1,3 @@
 # Locally computed:
-sha256 a6aa41df2d0773e67f5cf853621d46b89ae2181bc3ef5ff91ad597992259c192  tpm2-totp-0.1.1.tar.gz
+sha256 2ce2a518c96540942b0e78bc73efaefb76a2784b7e2dd1b3f14e7d31d97b33b7  tpm2-totp-0.1.2.tar.gz
 sha256 67bc21a0bff2b0890307cfaa883bd3f5337f461eb6d8a612a015cea6d704e9ed  LICENSE
package/tpm2-totp/tpm2-totp.mk +1 -1
index 1ce40e20d5..ca557388e6 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TPM2_TOTP_VERSION = 0.1.1
+TPM2_TOTP_VERSION = 0.1.2
 TPM2_TOTP_SITE = https://github.com/tpm2-software/tpm2-totp/releases/download/v$(TPM2_TOTP_VERSION)
 TPM2_TOTP_LICENSE = BSD-3-Clause
 TPM2_TOTP_LICENSE_FILES = LICENSE
Signature · 1 line
2.18.1
#1 lore raw

PATCH 1/1 package/package/tpm2-totp: bump to version 0.1.2

Quoted 5 lines · On Fri, 9 Aug 2019 00:02:11 -0300 unixmania at gmail.com wrote:

From: Carlos Santos <[email protected]>

Drop patches; issues fixed upstream.

Quoted 8 lines
---
 ...tring-warnings-when-building-for-32b.patch | 60 -------------------
 ...ion-failure-due-to-variable-may-be-u.patch | 42 -------------
 package/tpm2-totp/tpm2-totp.hash              |  2 +-
 package/tpm2-totp/tpm2-totp.mk                |  2 +-
 4 files changed, 2 insertions(+), 104 deletions(-)
 delete mode 100644 package/tpm2-totp/0001-src-fix-format-string-warnings-when-building-for-32b.patch
 delete mode 100644 package/tpm2-totp/0002-src-fix-compilation-failure-due-to-variable-may-be-u.patch

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com