eapol/eapol_framework/eapol_common/common/asn1_der_type.cpp
branchRCL_3
changeset 18 bad0cc58d154
parent 2 1c7bc153c08e
child 19 c74b3d9f6b9e
--- a/eapol/eapol_framework/eapol_common/common/asn1_der_type.cpp	Thu Aug 19 09:58:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/common/asn1_der_type.cpp	Tue Aug 31 15:16:37 2010 +0300
@@ -16,9 +16,17 @@
 */
 
 /*
-* %version: 34 %
+* %version: %
 */
 
+// This is enumeration of EAPOL source code.
+#if defined(USE_EAP_MINIMUM_RELEASE_TRACES)
+	#undef EAP_FILE_NUMBER_ENUM
+	#define EAP_FILE_NUMBER_ENUM 761 
+	#undef EAP_FILE_NUMBER_DATE 
+	#define EAP_FILE_NUMBER_DATE 1127594498 
+#endif //#if defined(USE_EAP_MINIMUM_RELEASE_TRACES)
+
 #include "asn1_der_type.h"
 #include "eap_automatic_variable.h"
 
@@ -674,7 +682,7 @@
 				"%02x \0",
 				oid_octet);
 
-			u8_t oid = oid_octet & (~OID_HIGH_BIT);
+			u8_t oid = static_cast<u8_t>(oid_octet & (~OID_HIGH_BIT));
 
 			if (ind > offset)
 			{
@@ -926,7 +934,7 @@
 		{
 			if ((extented_tag[0] & static_cast<u8_t>(asn1_high_bit_mask_tag)) == 0)
 			{
-				return (extented_tag - m_input_data);
+				return static_cast<u16_t>(extented_tag - m_input_data);
 			}
 
 			++extented_tag;
@@ -957,7 +965,7 @@
 	if ((length_octet1 & static_cast<u8_t>(asn1_high_bit_mask_tag)) == 0)
 	{
 		// Short Length field.
-		return m_offset_of_length_field + asn1_identifier_const_short_length_size;
+		return static_cast<u16_t>(m_offset_of_length_field + asn1_identifier_const_short_length_size);
 	}
 	else if (m_input_data_length > static_cast<u32_t>(m_offset_of_length_field + asn1_identifier_const_short_length_size))
 	{
@@ -1636,7 +1644,7 @@
 			status = sub_type->initialize(
 				current_type->get_unused_data_length(),
 				current_type->get_unused_data(),
-				current_type->get_recursion() + 1u,
+				static_cast<u16_t>(current_type->get_recursion() + 1u),
 				current_type->get_count_of_sub_types(),
 				debug_buffer);
 			if (status != eap_status_ok)