Skip to contentSkip to conversation

tpm2-abrmd: updatet to 2.1.1

PATCH New Armin Kuster 1 participant 6 messages Mar 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/6 tpm2-abrmd: updatet to 2.1.1

switch SRC_URI to upstream

---
 .../tpm2-abrmd/{tpm2-abrmd_2.1.0.bb => tpm2-abrmd_2.1.1.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-tpm/recipes-tpm/tpm2-abrmd/{tpm2-abrmd_2.1.0.bb => tpm2-abrmd_2.1.1.bb} (94%)
meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.1.bb renamed from meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.0.bb +2 -2
similarity index 94%
rename from meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.0.bb
rename to meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.1.bb
index 0120360..13dbf5a 100644
@@ -14,12 +14,12 @@ DEPENDS = "autoconf-archive dbus glib-2.0 tpm2.0-tss glib-2.0-native \
 
 
 SRC_URI = "\
-    git://github.com/01org/tpm2-abrmd.git \
+    git://github.com/tpm2-software/tpm2-abrmd.git \
     file://tpm2-abrmd-init.sh \
     file://tpm2-abrmd.default \
 "
 
-SRCREV = "e2f30eebd79079ed92952e78a6f8ab1c2c6194da"
+SRCREV = "06d9d433ba27159687255406baa37940db15465b"
 
 S = "${WORKDIR}/git"
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/6 tpm2.0-tools: update SRC_URI

---
 meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_3.1.3.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_3.1.3.bb +2 -2
index 22fae0b..6cceba6 100644
@@ -8,8 +8,8 @@ DEPENDS = "pkgconfig tpm2.0-tss openssl curl autoconf-archive"
 
 SRCREV = "74ba065e5914bc5d713ca3709d62a5751b097369"
 
-SRC_URI = "git://github.com/01org/tpm2.0-tools.git;name=tpm2.0-tools;destsuffix=tpm2.0-tools;branch=3.X"
+SRC_URI = "https://github.com/tpm2-software/tpm2-tools.git;branch=3.X"
 
-S = "${WORKDIR}/tpm2.0-tools"
+S = "${WORKDIR}/git"
 
 inherit autotools pkgconfig
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/6 tpm2-tss-engine: add new package

In reply to Armin Kuster
---
 .../tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 meta-tpm/recipes-tpm/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb
meta-tpm/recipes-tpm/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb new file +23 -0
new file mode 100644
index 0000000..36530be
@@ -0,0 +1,23 @@
+SUMMARY = "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL." 
+DESCRIPTION = "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL for Trusted Platform Module (TPM 2.0) using the tpm2-tss software stack that follows the Trusted Computing Groups (TCG) TPM Software Stack (TSS 2.0). It uses the Enhanced System API (ESAPI) interface of the TSS 2.0 for downwards communication. It supports RSA decryption and signatures as well as ECDSA signatures."
+
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3fb0047fd29391478a71e8e6101c76eb"
+
+SECTION = "security/tpm"
+
+DEPENDS = "autoconf-archive-native bash-completion libtss2 libgcrypt openssl"
+
+SRCREV = "bef89ec79cbb4c99963b0e336d9184827c545782"
+SRC_URI = "git://github.com/tpm2-software/tpm2-tss-engine.git"
+
+inherit autotools-brokensep pkgconfig systemd
+
+S = "${WORKDIR}/git"
+
+PACKAGES += "${PN}-engines ${PN}-engines-staticdev ${PN}-bash-completion"
+
+FILES_${PN}-dev = "${libdir}/engines-1.1/tpm2tss.so ${includedir}/*"
+FILES_${PN}-engines = "${libdir}/engines-1.1/lib*.so*"
+FILES_${PN}-engines-staticdev = "${libdir}/engines-1.1/libtpm2tss.a"
+FILES_${PN}-bash-completion += "${datadir}/bash-completion/completions"
Signature · 1 line
2.17.1
#3 lore raw

PATCH 4/6 tpm2: move tpm2 apps to recipes-tpm2

In reply to Armin Kuster
---
 .../tpm2-abrmd/files/tpm2-abrmd-init.sh                           | 0
 .../tpm2-abrmd/files/tpm2-abrmd.default                           | 0
 .../{recipes-tpm => recipes-tpm2}/tpm2-abrmd/tpm2-abrmd_2.1.1.bb  | 0
 .../tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb                      | 0
 .../tpm2.0-tools/tpm2.0-tools_3.1.3.bb                            | 0
 .../tpm2.0-tss/tpm2.0-tss/ax_pthread.m4                           | 0
 .../tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch           | 0
 .../{recipes-tpm => recipes-tpm2}/tpm2.0-tss/tpm2.0-tss_2.2.1.bb  | 0
 .../tpm2simulator/tpm2simulator_138.bb                            | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-tpm/{recipes-tpm => recipes-tpm2}/tpm2-abrmd/files/tpm2-abrmd-init.sh (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm2}/tpm2-abrmd/files/tpm2-abrmd.default (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm2}/tpm2-abrmd/tpm2-abrmd_2.1.1.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm2}/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm2}/tpm2.0-tools/tpm2.0-tools_3.1.3.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm2}/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm2}/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm2}/tpm2.0-tss/tpm2.0-tss_2.2.1.bb (100%)
 rename meta-tpm/{recipes-tpm => recipes-tpm2}/tpm2simulator/tpm2simulator_138.bb (100%)
meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh renamed from meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh +0 -0
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd-init.sh
rename to meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh
meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default renamed from meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default +0 -0
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm2-abrmd/files/tpm2-abrmd.default
rename to meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default
meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb renamed from meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.1.bb +0 -0
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm2-abrmd/tpm2-abrmd_2.1.1.bb
rename to meta-tpm/recipes-tpm2/tpm2-abrmd/tpm2-abrmd_2.1.1.bb
meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb renamed from meta-tpm/recipes-tpm/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb +0 -0
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb
rename to meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb
meta-tpm/recipes-tpm2/tpm2.0-tools/tpm2.0-tools_3.1.3.bb renamed from meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_3.1.3.bb +0 -0
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm2.0-tools/tpm2.0-tools_3.1.3.bb
rename to meta-tpm/recipes-tpm2/tpm2.0-tools/tpm2.0-tools_3.1.3.bb
meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 renamed from meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4 +0 -0
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
rename to meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss/ax_pthread.m4
meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch renamed from meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch +0 -0
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
rename to meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss/fix_musl_select_include.patch
meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss_2.2.1.bb renamed from meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.2.1.bb +0 -0
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm2.0-tss/tpm2.0-tss_2.2.1.bb
rename to meta-tpm/recipes-tpm2/tpm2.0-tss/tpm2.0-tss_2.2.1.bb
meta-tpm/recipes-tpm2/tpm2simulator/tpm2simulator_138.bb renamed from meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator_138.bb +0 -0
similarity index 100%
rename from meta-tpm/recipes-tpm/tpm2simulator/tpm2simulator_138.bb
rename to meta-tpm/recipes-tpm2/tpm2simulator/tpm2simulator_138.bb
Signature · 1 line
2.17.1
#4 lore raw

PATCH 5/6 tpm2-totp: add new package

In reply to Armin Kuster
---
 .../files/litpm2_totp_build_fix.patch         | 36 +++++++++++++++++++
 .../recipes-tpm2/tpm2-totp/tpm2-totp_0.9.9.bb | 17 +++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch
 create mode 100644 meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.9.9.bb
meta-tpm/recipes-tpm2/tpm2-totp/files/litpm2_totp_build_fix.patch new file +36 -0
new file mode 100644
index 0000000..c147054
@@ -0,0 +1,36 @@
+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 <[email protected]>
+
+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.9.9.bb new file +17 -0
new file mode 100644
index 0000000..bc94ab7
@@ -0,0 +1,17 @@
+SUMMARY = "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL." 
+DESCRIPTION = "The tpm2-tss-engine project implements a cryptographic engine for OpenSSL for Trusted Platform Module (TPM 2.0) using the tpm2-tss software stack that follows the Trusted Computing Groups (TCG) TPM Software Stack (TSS 2.0). It uses the Enhanced System API (ESAPI) interface of the TSS 2.0 for downwards communication. It supports RSA decryption and signatures as well as ECDSA signatures."
+
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ed23833e93c95173c8d8913745e4b4e1"
+
+SECTION = "security/tpm"
+
+DEPENDS = "autoconf-archive libtss2-dev qrencode"
+
+SRCREV = "44fcb6819f79302d5a088b3def648616e3551d4a"
+SRC_URI = "git://github.com/tpm2-software/tpm2-totp.git \
+           file://litpm2_totp_build_fix.patch "
+
+inherit autotools-brokensep pkgconfig
+
+S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
#5 lore raw

PATCH 6/6 lynis: update to 2.7.2

In reply to Armin Kuster
---
 .../recipes-auditors/lynis/{lynis_2.7.0.bb => lynis_2.7.2.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-security-compliance/recipes-auditors/lynis/{lynis_2.7.0.bb => lynis_2.7.2.bb} (89%)
meta-security-compliance/recipes-auditors/lynis/lynis_2.7.2.bb renamed from meta-security-compliance/recipes-auditors/lynis/lynis_2.7.0.bb +2 -2
similarity index 89%
rename from meta-security-compliance/recipes-auditors/lynis/lynis_2.7.0.bb
rename to meta-security-compliance/recipes-auditors/lynis/lynis_2.7.2.bb
index 0fd53d7..3ba82f9 100644
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3edd6782854304fd11da4975ab9799c1"
 
 SRC_URI = "https://cisofy.com/files/${BPN}-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "ac0ae8086e31f263f2da0c5c553686ba"
-SRC_URI[sha256sum] = "c9cb9b77dcdc782decbf06ddca30c0e853605b99029d8e86ade8449a0959be3b"
+SRC_URI[md5sum] = "3422cee3b12fc33338fcde003d65e234"
+SRC_URI[sha256sum] = "fde6ccf8d6ec0ae1e9c9f4a6d640cddcde4bf7a92f8437d47d16a5477e21bfda"
 
 S = "${WORKDIR}/${BPN}"
 
Signature · 1 line
2.17.1