--- a/eapol/eapol_framework/eapol_common/type/aka/core/eap_type_aka_server.cpp	Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/type/aka/core/eap_type_aka_server.cpp	Wed Sep 01 12:23:57 2010 +0100
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 20.1.4 %
+* %version: 23 %
 */
 
 // This is enumeration of EAPOL source code.
@@ -2583,7 +2583,7 @@
 
 
 	if (m_authentication_type == AKA_AUTHENTICATION_TYPE_FULL_AUTH
-		&& ((m_identity_type == AKA_IDENTITY_TYPE_IMSI_ID
+		&& (m_identity_type == AKA_IDENTITY_TYPE_IMSI_ID
 			&& (get_saved_previous_state() == eap_type_aka_state_waiting_for_identity_response
 				|| get_saved_previous_state() == eap_type_aka_state_waiting_for_aka_identity_response_with_at_permanent_identity
 				|| get_saved_previous_state() == eap_type_aka_state_waiting_for_aka_identity_response_with_at_full_auth_identity
@@ -2593,7 +2593,7 @@
 			&& (get_saved_previous_state() == eap_type_aka_state_waiting_for_identity_response
 				|| get_saved_previous_state() == eap_type_aka_state_waiting_for_aka_identity_response_with_at_permanent_identity
 				|| get_saved_previous_state() == eap_type_aka_state_waiting_for_aka_identity_response_with_at_any_identity
-				|| get_saved_previous_state() == eap_type_aka_state_waiting_for_aka_identity_response)))
+				|| get_saved_previous_state() == eap_type_aka_state_waiting_for_aka_identity_response))
 		)
 	{
 		eap_type_aka_identity_type local_identity_type = m_identity_type;
@@ -4734,7 +4734,7 @@
 						return EAP_STATUS_RETURN(m_am_tools, status);
 					}
 
-					if (l_aka_payloads->get_counter_too_small()->get_payload_included() == true)
+					if (l_aka_payloads->get_COUNTER_TOO_SMALL()->get_payload_included() == true)
 					{
 						// When the client detects that the
 						// counter value is not fresh, it includes the AT_COUNTER_TOO_SMALL