mirror of
https://github.com/flatcar/scripts.git
synced 2025-12-07 18:31:54 +01:00
app-crypt/tpm-tools: delete tpm-tools
Delete deprecated ebuild that was pulled in by coreos-devel/sdk-extras.
This commit is contained in:
parent
cbcef7b3fa
commit
178bcafd91
@ -1 +0,0 @@
|
|||||||
DIST tpm-tools-1.3.5.tar.gz 439922 RMD160 bce7bfa1b6df718b1e671c4926db80488294fdf0 SHA1 ee9000ec7e5ad7f8a8a931083aca293e11371d1c SHA256 60717336302bffff5044ed945a79f07594962fa3b989cf37f6eb042874d8fc45
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
--- a/lib/Makefile.am
|
|
||||||
+++ b/lib/Makefile.am
|
|
||||||
@@ -80,4 +80,4 @@ endif
|
|
||||||
# Unseal library - for addition to existing apps, counter part of seal cmd
|
|
||||||
libtpm_unseal_la_SOURCES = tpm_unseal.c
|
|
||||||
libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0
|
|
||||||
-libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la
|
|
||||||
+libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -lcrypto
|
|
||||||
--- a/src/cmds/Makefile.am
|
|
||||||
+++ b/src/cmds/Makefile.am
|
|
||||||
@@ -33,4 +33,5 @@ endif
|
|
||||||
LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal
|
|
||||||
|
|
||||||
tpm_sealdata_SOURCES = tpm_sealdata.c
|
|
||||||
+tpm_sealdata_LDADD = $(LDADD) -lcrypto
|
|
||||||
tpm_unsealdata_SOURCES = tpm_unsealdata.c
|
|
||||||
--- tpm-tools-1.3.1/src/data_mgmt/Makefile.am
|
|
||||||
+++ tpm-tools-1.3.1/src/data_mgmt/Makefile.am
|
|
||||||
@@ -31,7 +31,7 @@ bin_PROGRAMS = tpmtoken_init \
|
|
||||||
# Common build flags
|
|
||||||
AM_CPPFLAGS = -I$(top_builddir)/include -D_LINUX
|
|
||||||
|
|
||||||
-LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi
|
|
||||||
+LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl
|
|
||||||
|
|
||||||
|
|
||||||
#
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
diff --git a/src/tpm_mgmt/tpm_clear.c b/src/tpm_mgmt/tpm_clear.c
|
|
||||||
index c7b286f..6549a67 100644
|
|
||||||
--- a/src/tpm_mgmt/tpm_clear.c
|
|
||||||
+++ b/src/tpm_mgmt/tpm_clear.c
|
|
||||||
@@ -25,6 +25,7 @@
|
|
||||||
//Controled by input options
|
|
||||||
static BOOL bValue = FALSE; //If true FORCE CLEAR
|
|
||||||
static BOOL isWellKnown = FALSE;
|
|
||||||
+static char *szTpmPasswd = NULL;
|
|
||||||
TSS_HCONTEXT hContext = 0;
|
|
||||||
|
|
||||||
static inline TSS_RESULT tpmClearOwner(TSS_HTPM a_hTpm, BOOL a_bValue)
|
|
||||||
@@ -42,6 +43,7 @@ static void help(const char *aCmd)
|
|
||||||
logCmdHelp(aCmd);
|
|
||||||
logUnicodeCmdOption();
|
|
||||||
logCmdOption("-f, --force", _("Use physical presence authorization."));
|
|
||||||
+ logCmdOption("-p, --password", _("TPM authorization data."));
|
|
||||||
logCmdOption("-z, --well-known",
|
|
||||||
_("Use 20 bytes of zeros (TSS_WELL_KNOWN_SECRET) as the TPM secret authorization data"));
|
|
||||||
}
|
|
||||||
@@ -54,6 +56,10 @@ static int parse(const int aOpt, const char *aArg)
|
|
||||||
logDebug(_("Changing mode to use force authorization\n"));
|
|
||||||
bValue = TRUE;
|
|
||||||
break;
|
|
||||||
+ case 'p':
|
|
||||||
+ logDebug(_("Setting password\n"));
|
|
||||||
+ szTpmPasswd = strdup(aArg);
|
|
||||||
+ break;
|
|
||||||
case 'z':
|
|
||||||
logDebug(_("Using TSS_WELL_KNOWN_SECRET to authorize the TPM command\n"));
|
|
||||||
isWellKnown = TRUE;
|
|
||||||
@@ -68,13 +74,13 @@ static int parse(const int aOpt, const char *aArg)
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
|
|
||||||
- char *szTpmPasswd = NULL;
|
|
||||||
int pswd_len;
|
|
||||||
TSS_HTPM hTpm;
|
|
||||||
TSS_HPOLICY hTpmPolicy;
|
|
||||||
int iRc = -1;
|
|
||||||
struct option opts[] = {
|
|
||||||
{"force", no_argument, NULL, 'f'},
|
|
||||||
+ {"pass", required_argument, NULL, 'p'},
|
|
||||||
{"well-known", no_argument, NULL, 'z'},
|
|
||||||
};
|
|
||||||
BYTE well_known[] = TSS_WELL_KNOWN_SECRET;
|
|
||||||
@@ -82,7 +88,7 @@ int main(int argc, char **argv)
|
|
||||||
initIntlSys();
|
|
||||||
|
|
||||||
if (genericOptHandler
|
|
||||||
- (argc, argv, "fz", opts, sizeof(opts) / sizeof(struct option),
|
|
||||||
+ (argc, argv, "fpz", opts, sizeof(opts) / sizeof(struct option),
|
|
||||||
parse, help) != 0)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
@@ -99,12 +105,14 @@ int main(int argc, char **argv)
|
|
||||||
if (isWellKnown){
|
|
||||||
szTpmPasswd = (char *)well_known;
|
|
||||||
pswd_len = sizeof(well_known);
|
|
||||||
- }else{
|
|
||||||
+ }else if (!szTpmPasswd){
|
|
||||||
szTpmPasswd = GETPASSWD(_("Enter owner password: "), &pswd_len, FALSE);
|
|
||||||
if (!szTpmPasswd) {
|
|
||||||
logMsg(_("Failed to get password\n"));
|
|
||||||
goto out_close;
|
|
||||||
}
|
|
||||||
+ }else{
|
|
||||||
+ pswd_len = strlen(szTpmPasswd);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (policyGet(hTpm, &hTpmPolicy) != TSS_SUCCESS)
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
# Copyright 1999-2011 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild,v 1.1 2011/03/31 22:19:40 flameeyes Exp $
|
|
||||||
|
|
||||||
EAPI=4
|
|
||||||
inherit autotools eutils flag-o-matic
|
|
||||||
|
|
||||||
DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
|
|
||||||
HOMEPAGE="http://trousers.sourceforge.net"
|
|
||||||
SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
|
|
||||||
LICENSE="CPL-1.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="~amd64 ~x86"
|
|
||||||
IUSE="nls pkcs11 debug"
|
|
||||||
|
|
||||||
COMMON_DEPEND="
|
|
||||||
>=app-crypt/trousers-0.3.0
|
|
||||||
dev-libs/openssl
|
|
||||||
pkcs11? ( dev-libs/opencryptoki )
|
|
||||||
"
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
nls? ( virtual/libintl )"
|
|
||||||
DEPEND="${COMMON_DEPEND}
|
|
||||||
nls? ( sys-devel/gettext )"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
sed -i -e "s/-Werror //" configure.in || die "Sed failed"
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.3.1-gold.patch
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myconf="$(use_enable nls)"
|
|
||||||
|
|
||||||
# don't use --enable-pkcs11-support, configure is a mess.
|
|
||||||
use pkcs11 || myconf+=" --disable-pkcs11-support"
|
|
||||||
|
|
||||||
use debug && append-flags -DDEBUG || append-flags -DNDEBUG
|
|
||||||
|
|
||||||
econf ${myconf}
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${D}" install || die "emake install failed"
|
|
||||||
dodoc README
|
|
||||||
}
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
# Copyright 1999-2011 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/tpm-tools/tpm-tools-1.3.5-r1.ebuild,v 1.1 2011/03/31 22:19:40 flameeyes Exp $
|
|
||||||
|
|
||||||
EAPI=4
|
|
||||||
inherit autotools eutils flag-o-matic
|
|
||||||
|
|
||||||
DESCRIPTION="TrouSerS' support tools for the Trusted Platform Modules"
|
|
||||||
HOMEPAGE="http://trousers.sourceforge.net"
|
|
||||||
SRC_URI="mirror://sourceforge/trousers/${P}.tar.gz"
|
|
||||||
LICENSE="CPL-1.0"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 arm x86"
|
|
||||||
IUSE="nls pkcs11 debug"
|
|
||||||
|
|
||||||
COMMON_DEPEND="
|
|
||||||
>=app-crypt/trousers-0.3.0
|
|
||||||
dev-libs/openssl
|
|
||||||
pkcs11? ( dev-libs/opencryptoki )
|
|
||||||
"
|
|
||||||
RDEPEND="${COMMON_DEPEND}
|
|
||||||
nls? ( virtual/libintl )"
|
|
||||||
DEPEND="${COMMON_DEPEND}
|
|
||||||
nls? ( sys-devel/gettext )"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
sed -i -r \
|
|
||||||
-e '/CFLAGS/s/ -(Werror|m64)//' \
|
|
||||||
configure.in || die
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.3.1-gold.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-1.3.5-password.patch
|
|
||||||
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local myconf="$(use_enable nls)"
|
|
||||||
|
|
||||||
# don't use --enable-pkcs11-support, configure is a mess.
|
|
||||||
use pkcs11 || myconf+=" --disable-pkcs11-support"
|
|
||||||
|
|
||||||
use debug && append-flags -DDEBUG || append-flags -DNDEBUG
|
|
||||||
|
|
||||||
econf ${myconf}
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
emake DESTDIR="${D}" install || die "emake install failed"
|
|
||||||
dodoc README
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user