--- a/eapol/eapol_framework/eapol_common/include/eapol_key_state.h	Thu May 13 22:51:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eapol_key_state.h	Mon May 24 20:32:47 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 14.1.4 %
+* %version: %
 */
 
 #if !defined(_EAPOL_KEY_STATE_H_)
@@ -289,9 +289,7 @@
 	/// The configuration option is EAPOL_key_state_TEST_group_key_update.
 	bool m_server_TEST_group_key_update;
 
-#if defined(USE_EAPOL_KEY_STATE_OPTIMIZED_4_WAY_HANDSHAKE)
 	bool m_is_associated;
-#endif //#if defined(USE_EAPOL_KEY_STATE_OPTIMIZED_4_WAY_HANDSHAKE)
 
 	// - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -440,14 +438,18 @@
 EAP_KEY_TEST_PRIVATE_FUNCTION
 
 
-	EAP_FUNC_IMPORT eap_status_e derive_WPXM_WPXK1_WPXK2();
+	eap_status_e derive_WPXM_WPXK1_WPXK2();
 
-	EAP_FUNC_IMPORT eap_status_e derive_WPXM_PTK(const u32_t WPXM_WPXC);
+	eap_status_e derive_WPXM_PTK(const u32_t WPXM_WPXC);
 
 	EAP_FUNC_IMPORT eap_status_e verify_field_is_zero(
 		const u8_t * const field,
 		const u32_t field_length);
 
+	EAP_FUNC_IMPORT eap_status_e check_padding(
+		const u8_t * const field,
+		const u32_t field_length);
+
 	EAP_FUNC_IMPORT eap_status_e encrypt_key_data(
 		eapol_RSNA_key_header_c * const eapol_key_message);
 
@@ -815,27 +817,16 @@
 		const eapol_RSNA_key_header_c::eapol_RSNA_cipher_e eapol_group_cipher,
 		const eap_variable_data_c * const pre_shared_key);
 
-#if defined(USE_EAPOL_KEY_STATE) && defined(USE_EAPOL_KEY_STATE_OPTIMIZED_4_WAY_HANDSHAKE)
-
 	EAP_FUNC_IMPORT eap_status_e initialize(
 		const eap_am_network_id_c * const receive_network_id,
 		const eapol_key_authentication_type_e authentication_type);
 
-#endif //#if defined(USE_EAPOL_KEY_STATE) && defined(USE_EAPOL_KEY_STATE_OPTIMIZED_4_WAY_HANDSHAKE)
-
 	EAP_FUNC_IMPORT eapol_key_state_c *copy(const eap_am_network_id_c * const receive_network_id);
 
 	EAP_FUNC_IMPORT bool get_is_encryption_on();
 
-
-#if defined(USE_EAPOL_KEY_STATE_OPTIMIZED_4_WAY_HANDSHAKE)
-
 	EAP_FUNC_IMPORT bool get_is_associated();
 
-#endif //#if defined(USE_EAPOL_KEY_STATE_OPTIMIZED_4_WAY_HANDSHAKE)
-
-
-	//
 	EAP_FUNC_IMPORT eap_status_e started_eap_authentication();
 
 	/**