FCL/sf/mw/accesssec: comparison eapol/eapol_framework/eapol_common/am/common/eap_am

equal deleted inserted replaced

-:bad0cc58d154
+:c74b3d9f6b9e
 * Description:  EAP and WLAN authentication protocols.
 *
 */
 /*
-* %version: %
+* %version: 25.1.3 %
 */
 // This is enumeration of EAPOL source code.
 #if defined(USE_EAP_MINIMUM_RELEASE_TRACES)
 	#undef EAP_FILE_NUMBER_ENUM
 				cursor_ascii = m_tmp_ascii_buffer;
 				must_print = false;
 				data_start = ind;
 			}
-			*cursor_ascii++ = static_cast<u8_t>((*data >= 0x20 && *data < 0x7f) ? *data : '.');
+			*cursor_ascii++ = (*data >= 0x20 && *data < 0x7f) ? *data : '.';
 			*cursor++ = octet_to_ascii(((*data) & 0xf0) >> 4);
 			*cursor++ = octet_to_ascii(((*data) & 0x0f));
 			data++;
-			if ((ind > 0u
+			if (ind > 0u
-				 && ((ind+1) % byte_group_size) == 0)
+				&& ((ind+1) % byte_group_size) == 0
 				|| byte_group_size == 1ul)
 			{
 				*cursor++ = ' ';
 			}
 	#define EAP_TRACE_TIMER(object, flags, parameters)
 #endif //#if defined(USE_EAP_TIMER_QUEUE_TRACE)
 EAP_FUNC_EXPORT eap_status_e eap_am_tools_c::timer_thread_function()
 {
-	EAP_TRACE_TIMER(this, TRACE_FLAGS_TIMER, (EAPL("TIMER: Timer thread starts.\n")));
+	EAP_TRACE_TIMER(this, TRACE_FLAGS_DEFAULT, (EAPL("TIMER: Timer thread starts.\n")));
 	u32_t static_sleep_time = get_timer_resolution_ms();
 	u64_t start_time = get_clock_ticks();
 	u64_t current_time = start_time;
 	u64_t virtual_time = 0u;
 	u64_t end_time = 0u;
 	// Note 64-bit casted to 32-bit.
 	EAP_TRACE_TIMER(
 		this,
-		TRACE_FLAGS_TIMER, (EAPL("TIMER: get_clock_ticks_of_second() = %lu\n"),
+		TRACE_FLAGS_DEFAULT, (EAPL("TIMER: get_clock_ticks_of_second() = %lu\n"),
 		static_cast<u32_t>(get_clock_ticks_of_second())));
 	hw_ticks_of_millisecond = get_clock_ticks_of_second();
 	hw_ticks_of_millisecond /= 1000u;
 	u64_t delay_time = 0ul;
 	EAP_TRACE_TIMER(
 		this,
-		TRACE_FLAGS_TIMER,
+		TRACE_FLAGS_DEFAULT,
 		(EAPL("MUTEX: eap_am_tools_c::timer_thread_function(): mutex_enter(): begin\n")));
 	mutex->mutex_enter();
 	EAP_TRACE_TIMER(
 		this,
-		TRACE_FLAGS_TIMER,
+		TRACE_FLAGS_DEFAULT,
 		(EAPL("MUTEX: eap_am_tools_c::timer_thread_function(): mutex_enter(): end\n")));
 	while(get_is_timer_thread_active())
 	{
 		bool timer_queue_is_empty = get_timer_queue_is_empty();
 		current_sleep_time = next_sleep_time;
 		EAP_TRACE_TIMER(
 			this,
-			TRACE_FLAGS_TIMER,
+			TRACE_FLAGS_DEFAULT,
 			(EAPL("TIMER: timer_sleep(): current_sleep_time=%d\n"),
 			 static_cast<u32_t>(current_sleep_time)));
 		// - - - - - - - - - - - - - - - - - - - - - - - -
 		begin_time = get_clock_ticks();
 		EAP_TRACE_TIMER(
 			this,
-			TRACE_FLAGS_TIMER,
+			TRACE_FLAGS_DEFAULT,
 			(EAPL("MUTEX: eap_am_tools_c::timer_thread_function(): mutex_leave(): begin\n")));
 		mutex->mutex_leave(this);
 		EAP_TRACE_TIMER(
 			this,
-			TRACE_FLAGS_TIMER,
+			TRACE_FLAGS_DEFAULT,
 			(EAPL("MUTEX: eap_am_tools_c::timer_thread_function(): mutex_leave(): end\n")));
 		// Sleep happens outside of the mutex.
 		timer_sleep(current_sleep_time);
 		EAP_TRACE_TIMER(
 			this,
-			TRACE_FLAGS_TIMER,
+			TRACE_FLAGS_DEFAULT,
 			(EAPL("MUTEX: eap_am_tools_c::timer_thread_function(): mutex_enter(): begin\n")));
 		mutex->mutex_enter();
 		EAP_TRACE_TIMER(
 			this,
-			TRACE_FLAGS_TIMER,
+			TRACE_FLAGS_DEFAULT,
 			(EAPL("MUTEX: eap_am_tools_c::timer_thread_function(): mutex_enter(): end\n")));
 		end_time = get_clock_ticks();
 		// - - - - - - - - - - - - - - - - - - - - - - - -
 		{
 			real_sleep_time = 0ul;
 			delay_time = 0ul;
 			EAP_TRACE_TIMER(
 				this,
-				TRACE_FLAGS_TIMER,
+				TRACE_FLAGS_DEFAULT,
 				(EAPL("TIMER: empty timer queue\n")));
 		}
 		else
 		{
 			if (end_time < begin_time)
 		if (get_is_timer_thread_active() == true
 			&& get_use_eap_milli_second_timer() == true)
 		{
 			EAP_TRACE_TIMER(
 				this,
-				TRACE_FLAGS_TIMER,
+				TRACE_FLAGS_DEFAULT,
 				(EAPL("TIMER: real_sleep_time=%d, delay_time=%d\n"),
 				 static_cast<u32_t>(real_sleep_time),
 				 static_cast<u32_t>(delay_time)));
 			next_sleep_time = pulse_timer(static_cast<u32_t>(real_sleep_time+delay_time));
 		virtual_time += real_sleep_time;
 		EAP_TRACE_TIMER(
 			this,
-			TRACE_FLAGS_TIMER,
+			TRACE_FLAGS_DEFAULT,
 			(EAPL("TIMER: Timer thread pulse_timer, sleep time = %4d ms, real_sleep_time %4d ms, ")
 			 EAPL("virtual_time %6d, real_time %6d, next_sleep_time %4d, delay_time %4d.\n"),
 			 current_sleep_time,
 			 static_cast<u32_t>(real_sleep_time),
 			 static_cast<u32_t>(virtual_time),
 	} // while()
 	EAP_TRACE_TIMER(
 		this,
-		TRACE_FLAGS_TIMER,
+		TRACE_FLAGS_DEFAULT,
 		(EAPL("MUTEX: eap_am_tools_c::timer_thread_function(): mutex_leave(): begin\n")));
 	mutex->mutex_leave(this);
 	EAP_TRACE_TIMER(
 		this,
-		TRACE_FLAGS_TIMER,
+		TRACE_FLAGS_DEFAULT,
 		(EAPL("MUTEX: eap_am_tools_c::timer_thread_function(): mutex_leave(): end\n")));
 	delete mutex;
-	EAP_TRACE_TIMER(this, TRACE_FLAGS_TIMER, (EAPL("TIMER: Timer thread stops.\n")));
+	EAP_TRACE_TIMER(this, TRACE_FLAGS_DEFAULT, (EAPL("TIMER: Timer thread stops.\n")));
 	m_thread_stopped =true;
 	return eap_status_ok;
 }
 	u32_t ind;
 	for (ind = 0u; ind < source_bytes_length; ind++)
 	{
 		if (source_bytes[ind] >= 'a' && source_bytes[ind] <= 'z')
 		{
-			source_bytes[ind] = static_cast<u8_t>(source_bytes[ind] - 32);
+			source_bytes[ind] -= 32;
 		}
 	}
 	return eap_status_ok;
 }
 		// +-+-+-+-+-+-+-+-+-+-+
 		// : : | : : : : : : : |
 		// +-+-+-+-+-+-+-+-+-+-+
 		*/
 		value = octet_from_ascii_armor(source_byte);
-		target[*output_ind] = static_cast<u8_t>(target[*output_ind] | (value & 0x30) >> 4u);
+		target[*output_ind] |= (value & 0x30) >> 4u;
 		++(*output_ind);
 		if (last_input_byte == false)
 		{
 			target[*output_ind] = static_cast<u8_t>((value & 0x0f) << 4u);
 			*missing_bit_count = 4u;
 		// +-+-+-+-+-+-+-+-+-+-+-+-+
 		// : : : : | : : : : : : : |
 		// +-+-+-+-+-+-+-+-+-+-+-+-+
 		*/
 		value = octet_from_ascii_armor(source_byte);
-		target[*output_ind] = static_cast<u8_t>(target[*output_ind] | ((value >> 2u) & 0x0f));
+		target[*output_ind] |= (value >> 2u) & 0x0f;
 		++(*output_ind);
 		if (last_input_byte == false)
 		{
 			target[*output_ind] = static_cast<u8_t>((value & 0x03) << 6u);
 			*missing_bit_count = 6u;
 		// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 		// : : : : : : | : : : : : : : |
 		// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 		*/
 		value = octet_from_ascii_armor(source_byte);
-		target[*output_ind] = static_cast<u8_t>(target[*output_ind] | value);
+		target[*output_ind] |= value;
 		++(*output_ind);
 		*missing_bit_count = 0u;
 	}
 	else
 	{
 		 this));
 	if (m_shutdown_was_called == false)
 	{
 		m_shutdown_was_called = true;
-		// stop tracing as tools get deleted
-		set_trace_mask(eap_trace_mask_none);
 		#if !defined(NO_EAP_AM_MEMORY_STORE)
-		(void) am_cancel_all_timers();
 		if (m_memory_store != 0)
 		{
 			status = m_memory_store->shutdown();
 		}
 		delete m_memory_store;
 			{
 				return EAP_STATUS_RETURN(this, status);
 			}
 			previous_data = data[ind];
-			data[ind] = static_cast<u8_t>(data[ind] ^ rnd);
+			data[ind] ^= rnd;
 			if (previous_data != data[ind])
 			{
 				error_generated = true;
 				sent_packet->set_random_error_type(eap_random_error_type_manipulate_byte);
 					{
 						return EAP_STATUS_RETURN(this, status);
 					}
 					previous_data = data[index];
-					data[index] = static_cast<u8_t>(data[index] ^ rnd);
+					data[index] ^= rnd;
 				}
 				while(previous_data == data[index]);
 				EAP_TRACE_DEBUG(
 					this,
 					if (status != eap_status_ok)
 					{
 						return EAP_STATUS_RETURN(this, status);
 					}
-					delta_length = static_cast<u8_t>(delta_length % (static_cast<i32_t>(sent_packet->get_data_length())
+					delta_length %= (static_cast<i32_t>(sent_packet->get_data_length())
-													- static_cast<i32_t>(minimum_packet_length)));
+									 - static_cast<i32_t>(minimum_packet_length) /*eapol_ethernet_header_wr_c::get_header_length()*/ );
 					if (delta_length == 0)
 					{
 						continue;
 					}
 	// |                         node (2-5)                            |
 	// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 	// set the four most significant bits (bits 12 through 15) of the
 	// time_hi_and_version field to the appropriate 4-bit version number
-	hash[6] = static_cast<u8_t>(hash[6] & 0x0F);
+	hash[6] &= 0x0F;
-	hash[6] = static_cast<u8_t>(hash[6] | 0x50);
+	hash[6] |= 0x50;
 	// set the two most significant bits (bits 6 and 7) of the
 // clock_seq_hi_and_reserved to zero and one, respectively
-	hash[8] = static_cast<u8_t>(hash[8] & 0x3F);
+	hash[8] &= 0x3F;
-	hash[8] = static_cast<u8_t>(hash[8] | 0x80);
+	hash[8] |= 0x80;
 	return EAP_STATUS_RETURN(this, eap_status_ok);
 }
 //-----------------------------------------------------------------------------------------------

branch	RCL_3
changeset 46	c74b3d9f6b9e
parent 45	bad0cc58d154