Patchwork [2/7] hostapd: remove gnutls support

login
register
mail settings
Submitter Gustavo Zacarias
Date Dec. 28, 2012, 7:47 p.m.
Message ID <1356724043-8879-2-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/208553/
State Accepted
Commit 788fcd99e0578e361f192aae4b89b15f1a60faac
Headers show

Comments

Gustavo Zacarias - Dec. 28, 2012, 7:47 p.m.
hostapd isn't API compatible with gnutls3 so remove support.
It's probably hardly used since openssl is far more common, and hostapd
can use its internal routines if it's not available.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/hostapd/hostapd.mk |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)
Peter Korsgaard - Dec. 28, 2012, 8:54 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

 Gustavo> hostapd isn't API compatible with gnutls3 so remove support.
 Gustavo> It's probably hardly used since openssl is far more common,
 Gustavo> and hostapd can use its internal routines if it's not
 Gustavo> available.

I've resuffled this to come before the gnutls one and committed, thanks.

Patch

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 45a93fc..b18881a 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -27,7 +27,7 @@  define HOSTAPD_LIBTOMMATH_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_INTERNAL_LIBTOMMATH.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 
-# Try to use openssl or gnutls if it's already available
+# Try to use openssl if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 	HOSTAPD_DEPENDENCIES += openssl
 define HOSTAPD_TLS_CONFIG
@@ -35,17 +35,10 @@  define HOSTAPD_TLS_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_EAP_PWD.*\)/\2/' $(HOSTAPD_CONFIG)
 endef
 else
-ifeq ($(BR2_PACKAGE_GNUTLS),y)
-	HOSTAPD_DEPENDENCIES += gnutls
-define HOSTAPD_TLS_CONFIG
-	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2gnutls/' $(HOSTAPD_CONFIG)
-endef
-else
 define HOSTAPD_TLS_CONFIG
 	$(SED) 's/\(#\)\(CONFIG_TLS=\).*/\2internal/' $(HOSTAPD_CONFIG)
 endef
 endif
-endif
 
 ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y)
 define HOSTAPD_EAP_CONFIG