diff -r 66f897dce0dc -r aa67149e0134 eapol/eapol_framework/eapol_common/core/eapol_key_state_string.cpp --- a/eapol/eapol_framework/eapol_common/core/eapol_key_state_string.cpp Mon Mar 15 12:40:54 2010 +0200 +++ b/eapol/eapol_framework/eapol_common/core/eapol_key_state_string.cpp Wed Mar 31 21:36:41 2010 +0300 @@ -16,7 +16,7 @@ */ /* -* %version: 9 % +* %version: 9.1.2 % */ // This is enumeration of EAPOL source code. @@ -45,7 +45,7 @@ //-------------------------------------------------- EAP_FUNC_EXPORT eap_const_string eapol_key_state_string_c::get_eapol_key_state_string( - const eapol_key_state_e state) const + const eapol_key_state_e state) { #if defined(USE_EAP_TRACE_STRINGS) EAP_IF_RETURN_STRING(state, eapol_key_state_none) @@ -87,7 +87,7 @@ //-------------------------------------------------- EAP_FUNC_EXPORT eap_const_string eapol_key_state_string_c::get_eapol_key_handshake_type_string( - const eapol_key_handshake_type_e handshake_type) const + const eapol_key_handshake_type_e handshake_type) { #if defined(USE_EAP_TRACE_STRINGS) @@ -115,7 +115,7 @@ //-------------------------------------------------- EAP_FUNC_EXPORT eap_const_string eapol_key_state_string_c::get_eapol_key_authentication_type_string( - const eapol_key_authentication_type_e authentication_type) const + const eapol_key_authentication_type_e authentication_type) { #if defined(USE_EAP_TRACE_STRINGS) @@ -124,7 +124,7 @@ else EAP_IF_RETURN_STRING(authentication_type, eapol_key_authentication_type_RSNA_PSK) else EAP_IF_RETURN_STRING(authentication_type, eapol_key_authentication_type_WPA_EAP) else EAP_IF_RETURN_STRING(authentication_type, eapol_key_authentication_type_WPA_PSK) - else EAP_IF_RETURN_STRING(authentication_type, eapol_key_authentication_type_802_1X) + else EAP_IF_RETURN_STRING(authentication_type, eapol_key_authentication_type_dynamic_WEP) #if defined(EAP_USE_WPXM) else EAP_IF_RETURN_STRING(authentication_type, eapol_key_authentication_type_WPXM) #endif //#if defined(EAP_USE_WPXM) @@ -133,6 +133,8 @@ else EAP_IF_RETURN_STRING(authentication_type, eapol_key_authentication_type_WAI_PSK) else EAP_IF_RETURN_STRING(authentication_type, eapol_key_authentication_type_WAI_certificate) #endif //#if defined(USE_WAPI_CORE) + else EAP_IF_RETURN_STRING(authentication_type, eapol_key_authentication_type_EAP_authentication_no_encryption) + else #endif // #if defined(USE_EAP_TRACE_STRINGS) { @@ -145,7 +147,7 @@ //-------------------------------------------------- eap_const_string eapol_key_state_string_c::get_eapol_key_descriptor_type_string( - const eapol_key_descriptor_type_e key_descriptor_type) const + const eapol_key_descriptor_type_e key_descriptor_type) { #if defined(USE_EAP_TRACE_STRINGS)