From: Nikos Mavrogiannopoulos <redacted>
Date: Fri, 20 Jun 2014 15:56:15 +0000 (+0200)
Subject: gnutls: Allow enabling smart card support as option.
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f87135adb385634479287f6cc2b84ccd54d13fea;p=openwrt-packages.git

gnutls: Allow enabling smart card support as option.

Signed-off-by: Nikos Mavrogiannopoulos <redacted>
---

diff --git a/libs/gnutls/Config.in b/libs/gnutls/Config.in
index b2f25746c..0c68b5bce 100644
--- a/libs/gnutls/Config.in
+++ b/libs/gnutls/Config.in
@@ -31,6 +31,11 @@ config GNUTLS_PSK
 config GNUTLS_ANON
 	bool "enable anonymous authentication support"
 
+config GNUTLS_PKCS11
+	bool "enable smart card (PKCS11) support"
+	select GNUTLS_EXT_LIBTASN1
+	default n
+
 config GNUTLS_EXT_LIBTASN1
 	bool "use external libtasn1"
 	default n
diff --git a/libs/gnutls/Makefile b/libs/gnutls/Makefile
index 46e018776..ef06a05d8 100644
--- a/libs/gnutls/Makefile
+++ b/libs/gnutls/Makefile
@@ -75,7 +75,7 @@ endef
 define Package/libgnutls
 $(call Package/gnutls/Default)
   TITLE+= (library)
-  DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp +GNUTLS_EXT_LIBTASN1:libtasn1
+  DEPENDS+= +libnettle +!LIBNETTLE_MINI:libgmp +GNUTLS_EXT_LIBTASN1:libtasn1 +GNUTLS_PKCS11:p11-kit
 endef
 
 define Package/libgnutls/description
@@ -106,13 +106,16 @@ CONFIGURE_ARGS+= \
 	--disable-doc \
 	--disable-tests \
 	--disable-rsa-export \
-	--disable-crywrap \
-	--without-p11-kit
+	--disable-crywrap
 
 ifneq ($(CONFIG_GNUTLS_EXT_LIBTASN1),y)
 CONFIGURE_ARGS += --with-included-libtasn1
 endif
 
+ifneq ($(CONFIG_GNUTLS_PKCS11),y)
+CONFIGURE_ARGS += --without-p11-kit
+endif
+
 ifeq ($(CONFIG_LIBNETTLE_MINI),y)
 CONFIGURE_ARGS += --with-nettle-mini
 endif
@@ -209,6 +212,11 @@ ifeq ($(CONFIG_GNUTLS_PSK),y)
 		$(PKG_INSTALL_DIR)/usr/bin/psktool \
 		$(1)/usr/bin/
 endif
+ifeq ($(CONFIG_GNUTLS_PKCS11),y)
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/bin/p11tool \
+		$(1)/usr/bin/
+endif
 endef