hostapd: convert ssl provider build options to variants

Instead of selecting the SSL provider at compile time, build package variants for each option so users can select the binary package without having to build it themselves. Most likely not all variants have actually ever been user by anyone. We should reduce the selection to the reasonable and most used combinations at some point in future. For now, build them all. Signed-off-by: Daniel Golle <[email protected]>
James-TR · May 25, 2018 · c8fdd0e · c8fdd0e
1 parent a3f2451
commit c8fdd0e
Show file tree

Hide file tree

Showing 2 changed files with 285 additions and 85 deletions.
diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in
@@ -1,48 +1,50 @@
 # wpa_supplicant config
 config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
 	bool "Disable timestamp check"
-	depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mesh || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini || PACKAGE_wpad-mesh
+	depends on PACKAGE_wpa-supplicant || \
+		   PACKAGE_wpa-supplicant-openssl || \
+		   PACKAGE_wpa-supplicant-wolfssl || \
+		   PACKAGE_wpa-supplicant-mesh || \
+		   PACKAGE_wpa-supplicant-mini || \
+		   PACKAGE_wpad || \
+		   PACKAGE_wpad-openssl || \
+		   PACKAGE_wpad-wolfssl || \
+		   PACKAGE_wpad-mini || \
+		   PACKAGE_wpad-mesh-openssl || \
+		   PACKAGE_wpad-mesh-wolfssl
 	default n
 	help
 	  This disables the timestamp check for certificates in wpa_supplicant
 	  Useful for devices without RTC that cannot reliably get the real date/time
 
-choice
-	prompt "Choose TLS provider"
-	default WPA_SUPPLICANT_INTERNAL
-	depends on PACKAGE_wpa-supplicant || PACKAGE_wpad || PACKAGE_wpad-mesh
-
-config WPA_SUPPLICANT_INTERNAL
-	bool "internal"
-	depends on PACKAGE_wpa-supplicant || PACKAGE_wpad
-
-config WPA_SUPPLICANT_OPENSSL
-	bool "openssl"
-	select PACKAGE_libopenssl
-
-config WPA_SUPPLICANT_WOLFSSL
-	bool "wolfssl"
-	select PACKAGE_libwolfssl
-	select WOLFSSL_HAS_AES_CCM
-	select WOLFSSL_HAS_AES_GCM
-	select WOLFSSL_HAS_ARC4
-	select WOLFSSL_HAS_DES3
-	select WOLFSSL_HAS_DH
-	select WOLFSSL_HAS_ECC
-	select WOLFSSL_HAS_OCSP
-	select WOLFSSL_HAS_PSK
-	select WOLFSSL_HAS_SESSION_TICKET
-	select WOLFSSL_HAS_WPAS
-
-endchoice
-
 config WPA_RFKILL_SUPPORT
 	bool "Add rfkill support"
-	depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mesh || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini || PACKAGE_wpad-mesh
+	depends on PACKAGE_wpa-supplicant || \
+		   PACKAGE_wpa-supplicant-openssl || \
+		   PACKAGE_wpa-supplicant-wolfssl || \
+		   PACKAGE_wpa-supplicant-mesh || \
+		   PACKAGE_wpa-supplicant-mini || \
+		   PACKAGE_wpad || \
+		   PACKAGE_wpad-openssl || \
+		   PACKAGE_wpad-wolfssl || \
+		   PACKAGE_wpad-mini || \
+		   PACKAGE_wpad-mesh-openssl || \
+		   PACKAGE_wpad-mesh-wolfssl
 	default n
 
 config WPA_MSG_MIN_PRIORITY
 	int "Minimum debug message priority"
+	depends on PACKAGE_wpa-supplicant || \
+		   PACKAGE_wpa-supplicant-openssl || \
+		   PACKAGE_wpa-supplicant-wolfssl || \
+		   PACKAGE_wpa-supplicant-mesh || \
+		   PACKAGE_wpa-supplicant-mini || \
+		   PACKAGE_wpad || \
+		   PACKAGE_wpad-openssl || \
+		   PACKAGE_wpad-wolfssl || \
+		   PACKAGE_wpad-mini || \
+		   PACKAGE_wpad-mesh-openssl || \
+		   PACKAGE_wpad-mesh-wolfssl
 	default 3
 	help
 	  Useful values are:
@@ -53,6 +55,24 @@ config WPA_MSG_MIN_PRIORITY
 		4 = warnings
 		5 = errors
 
+config WPA_WOLFSSL
+	bool
+	default PACKAGE_wpa-supplicant-wolfssl ||\
+	        PACKAGE_wpad-wolfssl ||\
+	        PACKAGE_wpad-mesh-wolfssl ||\
+	        PACKAGE_eapol-test-wolfssl
+	select PACKAGE_libwolfssl
+	select WOLFSSL_HAS_AES_CCM
+	select WOLFSSL_HAS_AES_GCM
+	select WOLFSSL_HAS_ARC4
+	select WOLFSSL_HAS_DES3
+	select WOLFSSL_HAS_DH
+	select WOLFSSL_HAS_ECC
+	select WOLFSSL_HAS_OCSP
+	select WOLFSSL_HAS_PSK
+	select WOLFSSL_HAS_SESSION_TICKET
+	select WOLFSSL_HAS_WPAS
+
 config DRIVER_WEXT_SUPPORT
 	bool
 	default n