Author: nbd Date: 2016-01-19 11:06:29 +0100 (Tue, 19 Jan 2016) New Revision: 48345
Modified: trunk/package/network/services/hostapd/files/netifd.sh Log: wpa_supplicant: add support for EAP-TLS phase2 Introduce config options client_cert2, priv_key2 and priv_key2_pwd used for EAP-TLS phase2 authentication in WPA-EAP client mode. Signed-off-by: Daniel Golle <[email protected]> Modified: trunk/package/network/services/hostapd/files/netifd.sh =================================================================== --- trunk/package/network/services/hostapd/files/netifd.sh 2016-01-19 10:06:23 UTC (rev 48344) +++ trunk/package/network/services/hostapd/files/netifd.sh 2016-01-19 10:06:29 UTC (rev 48345) @@ -634,8 +634,19 @@ append network_data "private_key_passwd=\"$priv_key_pwd\"" "$N$T" ;; fast|peap|ttls) - json_get_vars auth password + json_get_vars auth password ca_cert2 client_cert2 priv_key2 priv_key2_pwd set_default auth MSCHAPV2 + + if [ "$auth" = "EAP-TLS" ]; then + [ -n "$ca_cert2" ] && + append network_data "ca_cert2=\"$ca_cert2\"" "$N$T" + append network_data "client_cert2=\"$client_cert2\"" "$N$T" + append network_data "private_key2=\"$priv_key2\"" "$N$T" + append network_data "private_key2_passwd=\"$priv_key2_pwd\"" "$N$T" + else + append network_data "password=\"$password\"" "$N$T" + fi + phase2proto="auth=" case "$auth" in "auth"*) @@ -648,7 +659,6 @@ ;; esac append network_data "phase2=\"$phase2proto$auth\"" "$N$T" - append network_data "password=\"$password\"" "$N$T" ;; esac append network_data "eap=$(echo $eap_type | tr 'a-z' 'A-Z')" "$N$T" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
