Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnutls: optionally disable tpm support

Browse source 
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>
This commit is contained in:
Ian Pozella 2016-09-01 17:13:35 +01:00
parent c25e6df2f5
commit e1b0adf5f2
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libs/gnutls/Config.in
View file

@ -39,6 +39,11 @@ config GNUTLS_ANON
bool "enable anonymous authentication support" bool "enable anonymous authentication support"
default y default y
config GNUTLS_TPM
bool "enable tpm support"
select GNUTLS_PKCS11
default n
config GNUTLS_PKCS11 config GNUTLS_PKCS11
bool "enable smart card (PKCS11) support" bool "enable smart card (PKCS11) support"
select GNUTLS_EXT_LIBTASN1 select GNUTLS_EXT_LIBTASN1

12
libs/gnutls/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gnutls PKG_NAME:=gnutls
PKG_VERSION:=3.5.4 PKG_VERSION:=3.5.4
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -35,6 +35,7 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_GNUTLS_PKCS11 \ CONFIG_GNUTLS_PKCS11 \
CONFIG_GNUTLS_PSK \ CONFIG_GNUTLS_PSK \
CONFIG_GNUTLS_SRP \ CONFIG_GNUTLS_SRP \
CONFIG_GNUTLS_TPM \
CONFIG_LIBNETTLE_MINI \ CONFIG_LIBNETTLE_MINI \
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -161,6 +162,10 @@ ifneq ($(CONFIG_GNUTLS_OCSP),y)
CONFIGURE_ARGS += --disable-ocsp CONFIGURE_ARGS += --disable-ocsp
endif endif
ifneq ($(CONFIG_GNUTLS_TPM),y)
CONFIGURE_ARGS += --without-tpm
endif
ifeq ($(CONFIG_GNUTLS_CRYPTODEV),y) ifeq ($(CONFIG_GNUTLS_CRYPTODEV),y)
CONFIGURE_ARGS += --enable-cryptodev CONFIGURE_ARGS += --enable-cryptodev
endif endif
@ -220,6 +225,11 @@ ifeq ($(CONFIG_GNUTLS_PKCS11),y)
$(PKG_INSTALL_DIR)/usr/bin/p11tool \ $(PKG_INSTALL_DIR)/usr/bin/p11tool \
$(1)/usr/bin/ $(1)/usr/bin/
endif endif
ifeq ($(CONFIG_GNUTLS_TPM),y)
$(CP) \
$(PKG_INSTALL_DIR)/usr/bin/tpmtool \
$(1)/usr/bin/
endif
endef endef