From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 30 Mar 2019 14:02:34 +0000 (+0100)
Subject: wireless-ap: Remove support for WPA
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=66fdbcaf15d3fb7ce4a1e0f7e6299818f4638c84;p=people%2Fstevee%2Fnetwork.git

wireless-ap: Remove support for WPA

This is a deprecated protocol and not secure.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/functions/functions.hostapd b/src/functions/functions.hostapd
index 79fb4dbb..d3eaa744 100644
--- a/src/functions/functions.hostapd
+++ b/src/functions/functions.hostapd
@@ -138,7 +138,7 @@ hostapd_config_write() {
 
 	# Check if key is set when encryption is used.
 	if isset encryption; then
-		assert isoneof encryption WPA WPA2 WPA/WPA2
+		assert isoneof encryption WPA2
 		assert isset key
 	fi
 
@@ -398,15 +398,9 @@ hostapd_config_write() {
 	if isset encryption; then
 		local encryption_mode=0
 		case "${encryption}" in
-			WPA)
-				encryption_mode=1
-				;;
 			WPA2)
 				encryption_mode=2
 				;;
-			WPA/WPA2)
-				encryption_mode=3
-				;;
 		esac
 
 		(
diff --git a/src/hooks/ports/wireless-ap b/src/hooks/ports/wireless-ap
index e393f5f7..a964fac8 100644
--- a/src/hooks/ports/wireless-ap
+++ b/src/hooks/ports/wireless-ap
@@ -65,7 +65,7 @@ hook_check_settings() {
 	assert isset SSID
 
 	if isset ENCRYPTION; then
-		assert isoneof ENCRYPTION WPA WPA2 WPA/WPA2
+		assert isoneof ENCRYPTION WPA2
 
 		assert isset KEY
 		assert [ ${#KEY} -ge 8 ]