@ -212,6 +212,7 @@ hostapd_common_add_bss_config() {
config_add_string radius_client_addr
config_add_string radius_client_addr
config_add_string iapp_interface
config_add_string iapp_interface
config_add_string eap_type ca_cert client_cert identity anonymous_identity auth priv_key priv_key_pwd
config_add_string eap_type ca_cert client_cert identity anonymous_identity auth priv_key priv_key_pwd
config_add_boolean ca_cert_usesystem ca_cert2_usesystem
config_add_string subject_match subject_match2
config_add_string subject_match subject_match2
config_add_array altsubject_match altsubject_match2
config_add_array altsubject_match altsubject_match2
config_add_array domain_match domain_match2 domain_suffix_match domain_suffix_match2
config_add_array domain_match domain_match2 domain_suffix_match domain_suffix_match2
@ -872,8 +873,13 @@ wpa_supplicant_add_network() {
hostapd_append_wpa_key_mgmt
hostapd_append_wpa_key_mgmt
key_mgmt = " $wpa_key_mgmt "
key_mgmt = " $wpa_key_mgmt "
json_get_vars eap_type identity anonymous_identity ca_cert
json_get_vars eap_type identity anonymous_identity ca_cert ca_cert_usesystem
[ -n " $ca_cert " ] && append network_data " ca_cert=\" $ca_cert \" " " $N $T "
if [ " $ca_cert_usesystem " -eq "1" -a -f "/etc/ssl/certs/ca-certificates.crt" ] ; then
append network_data "ca_cert=\"/etc/ssl/certs/ca-certificates.crt\"" " $N $T "
else
[ -n " $ca_cert " ] && append network_data " ca_cert=\" $ca_cert \" " " $N $T "
fi
[ -n " $identity " ] && append network_data " identity=\" $identity \" " " $N $T "
[ -n " $identity " ] && append network_data " identity=\" $identity \" " " $N $T "
[ -n " $anonymous_identity " ] && append network_data " anonymous_identity=\" $anonymous_identity \" " " $N $T "
[ -n " $anonymous_identity " ] && append network_data " anonymous_identity=\" $anonymous_identity \" " " $N $T "
case " $eap_type " in
case " $eap_type " in
@ -914,12 +920,15 @@ wpa_supplicant_add_network() {
fi
fi
; ;
; ;
fast| peap| ttls)
fast| peap| ttls)
json_get_vars auth password ca_cert2 client_cert2 priv_key2 priv_key2_pwd
json_get_vars auth password ca_cert2 ca_cert2_usesystem c lient_cert2 priv_key2 priv_key2_pwd
set_default auth MSCHAPV2
set_default auth MSCHAPV2
if [ " $auth " = "EAP-TLS" ] ; then
if [ " $auth " = "EAP-TLS" ] ; then
[ -n " $ca_cert2 " ] &&
if [ " $ca_cert2_usesystem " -eq "1" -a -f "/etc/ssl/certs/ca-certificates.crt" ] ; then
append network_data " ca_cert2=\" $ca_cert2 \" " " $N $T "
append network_data "ca_cert2=\"/etc/ssl/certs/ca-certificates.crt\"" " $N $T "
else
[ -n " $ca_cert2 " ] && append network_data " ca_cert2=\" $ca_cert2 \" " " $N $T "
fi
append network_data " client_cert2=\" $client_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=\" $priv_key2 \" " " $N $T "
append network_data " private_key2_passwd=\" $priv_key2_pwd \" " " $N $T "
append network_data " private_key2_passwd=\" $priv_key2_pwd \" " " $N $T "