diff options
| author | Ian Pozella <Ian.Pozella@imgtec.com> | 2016-09-01 17:13:35 +0100 |
|---|---|---|
| committer | Ian Pozella <Ian.Pozella@imgtec.com> | 2016-09-15 15:29:49 +0100 |
| commit | e1b0adf5f21242f556cc7a3c3f980d5c2e90abe2 (patch) | |
| tree | 5a9e97402561513cf970f495736bf48c5104c1f2 /libs/gnutls | |
| parent | c25e6df2f57e99cfc16694e515862db8fb053673 (diff) | |
gnutls: optionally disable tpm support
Add option that allows you to explicitly disable use of the tpm
otherwise if a tss stack such as trousers is found by gnutls build
system then it will use it which will cause a build failure when
PKCS11 support is not enabled.
Signed-off-by: Ian Pozella <Ian.Pozella@imgtec.com>
Diffstat (limited to 'libs/gnutls')
| -rw-r--r-- | libs/gnutls/Config.in | 5 | ||||
| -rw-r--r-- | libs/gnutls/Makefile | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/libs/gnutls/Config.in b/libs/gnutls/Config.in index fc3b31758..562d67892 100644 --- a/libs/gnutls/Config.in +++ b/libs/gnutls/Config.in @@ -39,6 +39,11 @@ config GNUTLS_ANON bool "enable anonymous authentication support" default y +config GNUTLS_TPM + bool "enable tpm support" + select GNUTLS_PKCS11 + default n + config GNUTLS_PKCS11 bool "enable smart card (PKCS11) support" select GNUTLS_EXT_LIBTASN1 diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile index 240cce1f2..412f7a1a7 100644 --- a/libs/gnutls/Makefile +++ b/libs/gnutls/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gnutls PKG_VERSION:=3.5.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_USE_MIPS16:=0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz @@ -35,6 +35,7 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_GNUTLS_PKCS11 \ CONFIG_GNUTLS_PSK \ CONFIG_GNUTLS_SRP \ + CONFIG_GNUTLS_TPM \ CONFIG_LIBNETTLE_MINI \ include $(INCLUDE_DIR)/package.mk @@ -161,6 +162,10 @@ ifneq ($(CONFIG_GNUTLS_OCSP),y) CONFIGURE_ARGS += --disable-ocsp endif +ifneq ($(CONFIG_GNUTLS_TPM),y) +CONFIGURE_ARGS += --without-tpm +endif + ifeq ($(CONFIG_GNUTLS_CRYPTODEV),y) CONFIGURE_ARGS += --enable-cryptodev endif @@ -220,6 +225,11 @@ ifeq ($(CONFIG_GNUTLS_PKCS11),y) $(PKG_INSTALL_DIR)/usr/bin/p11tool \ $(1)/usr/bin/ endif +ifeq ($(CONFIG_GNUTLS_TPM),y) + $(CP) \ + $(PKG_INSTALL_DIR)/usr/bin/tpmtool \ + $(1)/usr/bin/ +endif endef |