diff options
author | Armin Kuster <akuster808@gmail.com> | 2019-12-02 08:46:48 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-12-05 18:00:46 -0800 |
commit | 5b1d0ff41442bc9d91d3bbb39ed550783814dddc (patch) | |
tree | 493cc31d715af181d65bad710b7a82067562e57c | |
parent | 42df7b4eb0804fcb3390a9d313e1a51f29f3759c (diff) | |
download | meta-security-5b1d0ff41442bc9d91d3bbb39ed550783814dddc.tar.gz |
tpm2-totp: update to 0.2.0
LIC_FILES_CHKSUM update to be true BSD-3-clause text
Drop patch included
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch | 36 | ||||
-rw-r--r-- | meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.2.0.bb (renamed from meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.2.bb) | 6 |
2 files changed, 3 insertions, 39 deletions
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 @@ | |||
1 | C99 fixes: | ||
2 | |||
3 | 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=] | ||
4 | | dbg("Calling Esys_GetRandom for %li bytes", SECRETLEN - *secret_size); | ||
5 | |||
6 | 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=] | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Armin Kuster <akuster808@gmail.com> | ||
10 | |||
11 | Index: git/src/libtpm2-totp.c | ||
12 | =================================================================== | ||
13 | --- git.orig/src/libtpm2-totp.c | ||
14 | +++ git/src/libtpm2-totp.c | ||
15 | @@ -169,7 +169,7 @@ tpm2totp_generateKey(uint32_t pcrs, uint | ||
16 | if (rc != TPM2_RC_INITIALIZE) chkrc(rc, goto error); | ||
17 | |||
18 | while (*secret_size < SECRETLEN) { | ||
19 | - dbg("Calling Esys_GetRandom for %li bytes", SECRETLEN - *secret_size); | ||
20 | + dbg("Calling Esys_GetRandom for %li bytes", (long int) (SECRETLEN - *secret_size)); | ||
21 | rc = Esys_GetRandom(ctx, | ||
22 | ESYS_TR_NONE, ESYS_TR_NONE, ESYS_TR_NONE, | ||
23 | SECRETLEN - *secret_size, &t); | ||
24 | Index: git/src/tpm2-totp.c | ||
25 | =================================================================== | ||
26 | --- git.orig/src/tpm2-totp.c | ||
27 | +++ git/src/tpm2-totp.c | ||
28 | @@ -340,7 +340,7 @@ main(int argc, char **argv) | ||
29 | localtime (&now)); | ||
30 | chkrc(rc, exit(1)); | ||
31 | } | ||
32 | - printf("%s%06ld", timestr, totp); | ||
33 | + printf("%s%06ld", timestr, (long int)totp); | ||
34 | break; | ||
35 | case CMD_RESEAL: | ||
36 | 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 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" | |||
9 | 9 | ||
10 | PE = "1" | 10 | PE = "1" |
11 | 11 | ||
12 | SRCREV = "15cc8fbc8fe71be9c04c3169ee1f70450d52a51a" | 12 | SRCREV = "994b4203e4769baefa6e7719915629bc8210e90a" |
13 | SRC_URI = "git://github.com/tpm2-software/tpm2-totp.git;branch=v0.1.x \ | 13 | SRC_URI = "git://github.com/tpm2-software/tpm2-totp.git;branch=v0.2.x \ |
14 | file://litpm2_totp_build_fix.patch " | 14 | " |
15 | 15 | ||
16 | inherit autotools-brokensep pkgconfig | 16 | inherit autotools-brokensep pkgconfig |
17 | 17 | ||