mirrors/meta-security
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-security synced 2026-06-05 02:20:50 +00:00
Code Issues Projects Releases Wiki Activity

tpm2-pkcs11: update to 1.4.0

Browse Source 
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2020-10-14 17:29:57 +00:00
parent 02b62b859d
commit 0a07bf8046
2 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-tpm/recipes-tpm2/tpm2-pkcs11/files/0001-remove-local-binary-checkes.patch
+77
View File
@@ -0,0 +1,77 @@
From 9e3ef6f253f9427596baf3e7d748a79854cadfa9 Mon Sep 17 00:00:00 2001
From: Armin Kuster <akuster808@gmail.com>
Date: Wed, 14 Oct 2020 08:55:33 -0700
Subject: [PATCH] remove local binary checkes
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Upsteam-Status: Inappropriate
These are only needed to run on the tartget so we add an RDPENDS.
Not needed for building.
---
configure.ac | 48 ------------------------------------------------
1 file changed, 48 deletions(-)
diff --git a/configure.ac b/configure.ac
index 50e7d4b..2b9abcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -219,54 +219,6 @@ AX_PROG_JAVAC()
AX_PROG_JAVA()
m4_popdef([AC_MSG_ERROR])
-AC_CHECK_PROG([tpm2_createprimary], [tpm2_createprimary], [yes], [no])
- AS_IF([test "x$tpm2_createprimary" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_createprimary, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_create], [tpm2_create], [yes], [no])
- AS_IF([test "x$tpm2_create" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_create, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_evictcontrol], [tpm2_evictcontrol], [yes], [no])
- AS_IF([test "x$tpm2_evictcontrol" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_evictcontrol, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_readpublic], [tpm2_readpublic], [yes], [no])
- AS_IF([test "x$tpm2_readpublic" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_readpublic, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_load], [tpm2_load], [yes], [no])
- AS_IF([test "x$tpm2_load" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_load, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_loadexternal], [tpm2_loadexternal], [yes], [no])
- AS_IF([test "x$tpm2_loadexternal" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_loadexternal, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_unseal], [tpm2_unseal], [yes], [no])
- AS_IF([test "x$tpm2_unseal" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_unseal, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_encryptdecrypt], [tpm2_encryptdecrypt], [yes], [no])
- AS_IF([test "x$tpm2_encryptdecrypt" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_encryptdecrypt, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_sign], [tpm2_sign], [yes], [no])
- AS_IF([test "x$tpm2_sign" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_sign, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_getcap], [tpm2_getcap], [yes], [no])
- AS_IF([test "x$tpm2_getcap" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_getcap, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_import], [tpm2_import], [yes], [no])
- AS_IF([test "x$tpm2_import" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_import, but executable not found.])])
-
-AC_CHECK_PROG([tpm2_changeauth], [tpm2_changeauth], [yes], [no])
- AS_IF([test "x$tpm2_changeauth" != "xyes"],
- [AC_MSG_ERROR([tpm2_ptool requires tpm2_changeauth, but executable not found.])])
-
AC_DEFUN([integration_test_checks], [
PKG_CHECK_MODULES([OPENSC_PKCS11],[opensc-pkcs11],,
--
2.17.1
meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.3.0.bb → meta-tpm/recipes-tpm2/tpm2-pkcs11/tpm2-pkcs11_1.4.0.bb
+5 -2
View File
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0fc19f620a102768d6dbd1e7166e78ab"
DEPENDS = "autoconf-archive pkgconfig dstat sqlite3 openssl libtss2-dev tpm2-tools libyaml"
SRC_URI = "git://github.com/tpm2-software/tpm2-pkcs11.git;branch=1.X \
file://bootstrap_fixup.patch "
file://bootstrap_fixup.patch \
file://0001-remove-local-binary-checkes.patch"
SRCREV = "8d8f137f65f1d61d66cc191947b59c378f23e97d"
SRCREV = "78bbf6a0237351830d0c3923b25ba0b57ae0b7e9"
S = "${WORKDIR}/git"
@@ -18,3 +19,5 @@ inherit autotools-brokensep pkgconfig
do_configure_prepend () {
${S}/bootstrap
}
RDEPNDS_${PN} = "tpm2-tools"