482 !ap_data.is_wpa_ie_present() ) |
482 !ap_data.is_wpa_ie_present() ) |
483 { |
483 { |
484 DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_802_1x" ); |
484 DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_802_1x" ); |
485 return wlan_eapol_if_eapol_key_authentication_type_802_1x; |
485 return wlan_eapol_if_eapol_key_authentication_type_802_1x; |
486 } |
486 } |
487 else if( mode == core_security_mode_802dot1x && |
487 else if( (mode == core_security_mode_802dot1x || core_security_mode_802dot1x_unencrypted) && |
488 ap_data.key_management_suites() & core_key_management_wpx_fast_roam ) |
488 (ap_data.key_management_suites() & core_key_management_wpx_fast_roam) ) |
489 { |
489 { |
490 DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_wpx_fast_roam" ); |
490 DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_wpx_fast_roam" ); |
491 return wlan_eapol_if_eapol_key_authentication_type_wpx_fast_roam; |
491 return wlan_eapol_if_eapol_key_authentication_type_wpx_fast_roam; |
492 } |
492 } |
493 if( mode == core_security_mode_protected_setup ) |
493 if( mode == core_security_mode_protected_setup ) |
494 { |
494 { |
495 DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_wfa_sc" ); |
495 DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_wfa_sc" ); |
496 return wlan_eapol_if_eapol_key_authentication_type_wfa_sc; |
496 return wlan_eapol_if_eapol_key_authentication_type_wfa_sc; |
|
497 } |
|
498 if( mode == core_security_mode_802dot1x_unencrypted && |
|
499 !ap_data.is_rsn_ie_present() && |
|
500 !ap_data.is_wpa_ie_present() ) |
|
501 { |
|
502 if( !ap_data.is_privacy_enabled() ) |
|
503 { |
|
504 DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_802_1x_unencrypted" ); |
|
505 return wlan_eapol_if_eapol_key_authentication_type_802_1x_unencrypted; |
|
506 } |
|
507 else |
|
508 { |
|
509 DEBUG( "core_tools_c::eap_authentication_type() - wlan_eapol_if_eapol_key_authentication_type_802_1x" ); |
|
510 return wlan_eapol_if_eapol_key_authentication_type_802_1x; |
|
511 } |
497 } |
512 } |
498 else if( iap_data.is_eap_used() ) |
513 else if( iap_data.is_eap_used() ) |
499 { |
514 { |
500 if( ap_data.is_rsn_ie_present() ) |
515 if( ap_data.is_rsn_ie_present() ) |
501 { |
516 { |