--- a/eapol/eapol_framework/eapol_common/include/eap_expanded_type.h Tue Aug 31 15:16:37 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/include/eap_expanded_type.h Wed Sep 01 12:23:57 2010 +0100
@@ -16,7 +16,7 @@
*/
/*
-* %version: 18 %
+* %version: 10.1.2 %
*/
#if !defined(_EAP_EXPANDED_TYPE_H_)
@@ -43,8 +43,13 @@
};
+#if defined(USE_EAP_EXPANDED_TYPES)
/// Enumeration of the IETF defined EAP-Type values.
enum eap_type_ietf_values_e
+#else
+/// This is the original enumeration of the EAP-Type values.
+enum eap_type_value_e
+#endif //#if defined(USE_EAP_EXPANDED_TYPES)
{
eap_type_none = 0, ///< This is internal value for no type case.
eap_type_identity = 1, ///< This is Identity.
@@ -66,6 +71,12 @@
eap_type_fast = 43, ///< This is EAP-FAST type.
#endif //#if defined(USE_FAST_EAP_TYPE)
+ eap_type_ttls_plain_pap = 98, // This is for TTLS/PAP.
+
+#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
+ eap_type_plain_mschapv2 = 99, ///< This is used to indicate plain MSChapv2 inside TTLS tunnel.
+#endif //#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
+
eap_type_saesim = 252, ///< This is just a test EAP-type.
eap_type_dummy_sim = 253, ///< This is just a test EAP-type.
@@ -73,6 +84,13 @@
eap_type_experimental_type = 255, ///< This is Experimental Type.
};
+
+#if !defined(USE_EAP_EXPANDED_TYPES)
+ typedef eap_type_value_e eap_type_ietf_values_e;
+#endif //#if !defined(USE_EAP_EXPANDED_TYPES)
+
+
+
enum eap_type_vendor_id_e
{
eap_type_vendor_id_ietf = 0,
@@ -85,9 +103,9 @@
{
eap_type_vendor_type_secure_easy_setup = 10,
eap_type_vendor_type_WFA_simple_config = 1,
- eap_type_vendor_type_ttls_plain_pap_hack = 98, // This is for TTLS/PAP.
+ eap_type_vendor_type_ttls_plain_pap_hack = eap_type_ttls_plain_pap, // This is for TTLS/PAP.
#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
- eap_type_vendor_type_plain_MSCHAPv2_hack = 99, // This is for plain MCHAPv2 and TTLS
+ eap_type_vendor_type_plain_MSCHAPv2_hack = eap_type_plain_mschapv2, // This is for plain MCHAPv2 and TTLS
#endif //#if defined(EAP_USE_TTLS_PLAIN_MS_CHAP_V2_HACK)
};
@@ -108,7 +126,6 @@
m_eap_expanded_type_size = m_ietf_type_size+m_vendor_id_size+m_vendor_type_size,
};
- // This must not be virtual destructor.
EAP_FUNC_IMPORT ~eap_expanded_type_c();
EAP_FUNC_IMPORT eap_expanded_type_c();
@@ -120,37 +137,30 @@
EAP_FUNC_IMPORT eap_expanded_type_c(
const eap_type_ietf_values_e type);
- EAP_FUNC_IMPORT bool get_is_valid() const;
-
- EAP_FUNC_IMPORT bool get_is_valid_data() const;
-
- EAP_FUNC_IMPORT eap_expanded_type_c * copy() const;
-
EAP_FUNC_IMPORT static bool is_expanded_type(const eap_type_ietf_values_e eap_type);
+#if defined(USE_EAP_EXPANDED_TYPES)
EAP_FUNC_IMPORT static bool is_ietf_type(const eap_expanded_type_c eap_type);
+#else
+ EAP_FUNC_IMPORT static bool is_ietf_type(const eap_type_ietf_values_e eap_type);
+#endif //#if defined(USE_EAP_EXPANDED_TYPES)
EAP_FUNC_IMPORT eap_status_e get_type_data(
abs_eap_am_tools_c * const am_tools,
- eap_type_ietf_values_e * const type) const;
+ eap_type_ietf_values_e * const type);
EAP_FUNC_IMPORT eap_status_e get_type_data(
abs_eap_am_tools_c * const am_tools,
- eap_expanded_type_c * const type) const;
+ eap_expanded_type_c * const type);
EAP_FUNC_IMPORT eap_status_e get_expanded_type_data(
abs_eap_am_tools_c * const am_tools,
- eap_variable_data_c * const data) const;
+ eap_variable_data_c * const data);
EAP_FUNC_IMPORT eap_status_e set_expanded_type_data(
abs_eap_am_tools_c * const am_tools,
const eap_variable_data_c * const data);
- EAP_FUNC_IMPORT eap_status_e set_expanded_type_data(
- abs_eap_am_tools_c * const am_tools,
- const void * const data,
- const u32_t data_length);
-
EAP_FUNC_IMPORT void set_eap_type_values(
const eap_type_vendor_id_e vendor_id,
const u32_t vendor_type);
@@ -183,7 +193,11 @@
const u32_t index,
const void * const buffer,
const u32_t buffer_length,
+#if defined(USE_EAP_EXPANDED_TYPES)
eap_expanded_type_c * const type
+#else
+ eap_type_ietf_values_e * const type
+#endif //#if defined(USE_EAP_EXPANDED_TYPES)
);
/// This function writes EAP-type to offset.
@@ -193,10 +207,16 @@
void * const buffer,
const u32_t buffer_length,
const bool write_extented_type_when_true, ///< True value writes always Extented Type.
+#if defined(USE_EAP_EXPANDED_TYPES)
const eap_expanded_type_c p_type ///< The EAP type to be written.
+#else
+ const eap_type_ietf_values_e p_type ///< The EAP type to be written.
+#endif //#if defined(USE_EAP_EXPANDED_TYPES)
);
+#if defined(USE_EAP_EXPANDED_TYPES)
EAP_FUNC_IMPORT i32_t compare(const eap_expanded_type_c * const data) const;
+#endif //#if defined(USE_EAP_EXPANDED_TYPES)
private:
@@ -257,12 +277,21 @@
//-----------------------------------------------------------------------------------------
-typedef eap_expanded_type_c eap_type_value_e;
+#if defined(USE_EAP_EXPANDED_TYPES)
+
+ typedef eap_expanded_type_c eap_type_value_e;
+ EAP_C_FUNC_IMPORT u32_t convert_eap_type_to_u32_t(eap_type_value_e type);
+
+ EAP_C_FUNC_IMPORT u64_t convert_eap_type_to_u64_t(eap_type_value_e type);
-EAP_C_FUNC_IMPORT u32_t convert_eap_type_to_u32_t(eap_type_value_e type);
+#else
+
+ EAP_C_FUNC_IMPORT u32_t convert_eap_type_to_u32_t(eap_type_value_e type);
-EAP_C_FUNC_IMPORT u64_t convert_eap_type_to_u64_t(eap_type_value_e type);
+ EAP_C_FUNC_IMPORT u64_t convert_eap_type_to_u64_t(eap_type_value_e type);
+
+#endif //#if defined(USE_EAP_EXPANDED_TYPES)
//-----------------------------------------------------------------------------------------