runtime: tpm2 fix names in packagecheck
PATCH 1/9 runtime: tpm2 fix names in packagecheck
Signed-off-by Armin Kuster <[email protected]>
--- meta-tpm/lib/oeqa/runtime/cases/tpm2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-tpm/lib/oeqa/runtime/cases/tpm2.py +2 -2
@@ -16,9 +16,9 @@ class Tpm2Test(OERuntimeTestCase): if expected_endlines: self.fail('Missing expected line endings:\n %s' % '\n '.join(expected_endlines)) - @OEHasPackage(['tpm2.0-tss']) + @OEHasPackage(['tpm2-tss']) @OEHasPackage(['tpm2-abrmd']) - @OEHasPackage(['tpm2.0-tools']) + @OEHasPackage(['tpm2-tools']) @OEHasPackage(['ibmswtpm2']) @OETestDepends(['ssh.SSHTest.test_ssh']) def test_tpm2_sim(self):
Signature · 1 line
2.17.1
PATCH 2/9 tpm2 images: create tpm2 image and fix packagegroup
Signed-off-by Armin Kuster <[email protected]>
--- .../recipes-core/images/security-tpm2-image.bb | 18 ++++++++++++++++++ .../packagegroup/packagegroup-security-tpm2.bb | 5 ++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 meta-tpm/recipes-core/images/security-tpm2-image.bb
meta-tpm/recipes-core/images/security-tpm2-image.bb new file +18 -0
@@ -0,0 +1,18 @@ +DESCRIPTION = "A small image for building a tpm2 image for testing" + +IMAGE_FEATURES += "ssh-server-openssh" + +IMAGE_INSTALL = "\ + packagegroup-base \ + packagegroup-core-boot \ + packagegroup-security-tpm2 \ + os-release \ +" + +IMAGE_LINGUAS ?= " " + +LICENSE = "MIT" + +inherit core-image + +export IMAGE_BASENAME = "security-tpm2-image"
meta-tpm/recipes-core/packagegroup/packagegroup-security-tpm2.bb +4 -1
@@ -5,17 +5,20 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -PACKAGES = "packagegroup-security-tpm2" +PACKAGES = "${PN}" SUMMARY_packagegroup-security-tpm2 = "Security TPM 2.0 support" RDEPENDS_packagegroup-security-tpm2 = " \ tpm2-tools \ trousers \ + tpm2-tss \ libtss2 \ + libtss2-mu \ libtss2-tcti-device \ libtss2-tcti-mssim \ tpm2-abrmd \ tpm2-pkcs11 \ + ibmswtpm2 \ cryptsetup-tpm-incubator \ "
Signature · 1 line
2.17.1
PATCH 3/9 tpm image: split out tpm2
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- meta-tpm/recipes-core/images/security-tpm-image.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
meta-tpm/recipes-core/images/security-tpm-image.bb +3 -4
@@ -1,14 +1,13 @@ -DESCRIPTION = "A small image for building meta-security packages" +DESCRIPTION = "A small image for building a tpm image for testing" IMAGE_FEATURES += "ssh-server-openssh" IMAGE_INSTALL = "\ packagegroup-base \ packagegroup-core-boot \ - ${@bb.utils.contains('MACHINE_FEATURES', 'tpm', 'packagegroup-security-tpm', '', d)} \ - ${@bb.utils.contains('MACHINE_FEATURES', 'tpm2', 'packagegroup-security-tpm2', '', d)} \ + packagegroup-security-tpm \ os-release \ - ${CORE_IMAGE_EXTRA_INSTALL}" +" IMAGE_LINGUAS ?= " "
Signature · 1 line
2.17.1
PATCH 4/9 tpm2-pkcs11/tpm2-pkcs11: update to tip
In reply to Armin Kusterlicense-check-sum: Add SPDX format
Signed-off-by Armin Kuster <[email protected]>
--- meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_0.9.9.bb +2 -2
@@ -2,7 +2,7 @@ SUMMARY = "A PKCS#11 interface for TPM2 hardware" DESCRIPTION = "PKCS #11 is a Public-Key Cryptography Standard that defines a standard method to access cryptographic services from tokens/ devices such as hardware security modules (HSM), smart cards, etc. In this project we intend to use a TPM2 device as the cryptographic token." SECTION = "security/tpm" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b748af41ef1300c98e105b3b7ec4ecc1" +LIC_FILES_CHKSUM = "file://LICENSE;md5=93645981214b60a02688745c14f93c95" DEPENDS = "autoconf-archive pkgconfig dstat sqlite3 openssl libtss2-dev tpm2-tools"
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/tpm2-software/tpm2-pkcs11.git \ file://bootstrap_fixup.patch \ " -SRCREV = "3107d89b406ecd9c007884613733c9a344ef6d39" +SRCREV = "9eed9df823a960da481327468a73d477241befdb" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 5/9 tpm2-tcti-uefi: update to tip
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
--- meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta-tpm/recipes-tpm2/tpm2-tcti-uefi/tpm2-tcti-uefi_0.9.9.bb +1 -1
@@ -7,7 +7,7 @@ DEPENDS = "libtss2-dev gnu-efi-native gnu-efi pkgconfig" SRC_URI = "git://github.com/tpm2-software/tpm2-tcti-uefi.git \ file://configure_oe_fixup.patch \ " -SRCREV = "131889d12d2c7d8974711d2ebd1032cd32577b7f" +SRCREV = "7baf1eebfeb56a896bdd5d677fb24377d619eb9d" S = "${WORKDIR}/git"
Signature · 1 line
2.17.1
PATCH 6/9 tpm2-tools: update to 3.2.0
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
---
.../tpm2-tools/{tpm2-tools_3.1.3.bb => tpm2-tools_3.2.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-tpm/recipes-tpm2/tpm2-tools/{tpm2-tools_3.1.3.bb => tpm2-tools_3.2.0.bb} (86%)meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_3.2.0.bb renamed from meta-tpm/recipes-tpm2/tpm2-tools/tpm2-tools_3.1.3.bb +1 -1
@@ -6,7 +6,7 @@ SECTION = "tpm" DEPENDS = "pkgconfig tpm2-tss openssl curl autoconf-archive" -SRCREV = "74ba065e5914bc5d713ca3709d62a5751b097369" +SRCREV = "a17daa948fc67685651bf3b7a589ed341080ddd3" SRC_URI = "git://github.com/tpm2-software/tpm2-tools.git;branch=3.X"
Signature · 1 line
2.17.1
PATCH 7/9 tpm2-tss: update to 2.2.3
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
---
.../tpm2-tss/{tpm2-tss_2.2.1.bb => tpm2-tss_2.2.3.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-tpm/recipes-tpm2/tpm2-tss/{tpm2-tss_2.2.1.bb => tpm2-tss_2.2.3.bb} (97%)meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.2.3.bb renamed from meta-tpm/recipes-tpm2/tpm2-tss/tpm2-tss_2.2.1.bb +1 -1
@@ -6,7 +6,7 @@ SECTION = "tpm" DEPENDS = "autoconf-archive-native libgcrypt openssl" -SRCREV = "eb69e13559f20a0b49002a685c6f4a39be9503e2" +SRCREV = "36b1539c82bf675265d6f6a6cd808a189b6971f4" SRC_URI = "git://github.com/tpm2-software/tpm2-tss.git;branch=2.2.x"
Signature · 1 line
2.17.1
PATCH 8/9 tpm2-totp: update to offical release v0.1.1
In reply to Armin KusterClean up recipe to match actual app
Signed-off-by Armin Kuster <[email protected]>
--- .../recipes-tpm2/tpm2-totp/tpm2-totp_0.1.1.bb | 18 ++++++++++++++++++ .../recipes-tpm2/tpm2-totp/tpm2-totp_0.9.9.bb | 17 ----------------- 2 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.1.bb delete mode 100644 meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.9.9.bb
meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.1.1.bb new file +18 -0
@@ -0,0 +1,18 @@ +SUMMARY = "Attest the trustworthiness of a device against a human using time-based one-time passwords" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=ed23833e93c95173c8d8913745e4b4e1" + +SECTION = "security/tpm" + +DEPENDS = "autoconf-archive libtss2-dev qrencode" + +PE = "1" + +SRCREV = "2807a509a9da383e14dc0f759e71fd676db04ab1" +SRC_URI = "git://github.com/tpm2-software/tpm2-totp.git;branch=v0.1.x \ + file://litpm2_totp_build_fix.patch " + +inherit autotools-brokensep pkgconfig + +S = "${WORKDIR}/git"
meta-tpm/recipes-tpm2/tpm2-totp/tpm2-totp_0.9.9.bb deleted +0 -17
@@ -1,17 +0,0 @@ -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
PATCH 9/9 tpm2-tss-engine: update to 1.0.0
In reply to Armin KusterSigned-off-by Armin Kuster <[email protected]>
---
.../{tpm2-tss-engine_0.9.9.bb => tpm2-tss-engine_1.0.0.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-tpm/recipes-tpm2/tpm2-tss-engine/{tpm2-tss-engine_0.9.9.bb => tpm2-tss-engine_1.0.0.bb} (95%)meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_1.0.0.bb renamed from meta-tpm/recipes-tpm2/tpm2-tss-engine/tpm2-tss-engine_0.9.9.bb +1 -1
@@ -8,7 +8,7 @@ SECTION = "security/tpm" DEPENDS = "autoconf-archive-native bash-completion libtss2 libgcrypt openssl" -SRCREV = "bef89ec79cbb4c99963b0e336d9184827c545782" +SRCREV = "a81d44a8610e28e5987af64f8aae16e4a2d09eaa" SRC_URI = "git://github.com/tpm2-software/tpm2-tss-engine.git" inherit autotools-brokensep pkgconfig systemd
Signature · 1 line
2.17.1