--- a/eapol/eapol_framework/eapol_common/common/eap_crypto_api.cpp	Thu May 13 22:51:27 2010 +0300
+++ b/eapol/eapol_framework/eapol_common/common/eap_crypto_api.cpp	Mon May 24 20:32:47 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 /*
-* %version: 36 %
+* %version: %
 */
 
 // This is enumeration of EAPOL source code.
@@ -582,7 +582,7 @@
 
 		for (u32_t ind = 0u; ind < block_size/sizeof(u64_t); ind++)
 		{
-			pdata[ind] ^= pIV[ind];
+			pdata[ind] = static_cast<u64_t>(pdata[ind] ^ pIV[ind]);
 		}
 	}
 	else
@@ -595,7 +595,7 @@
 
 		for (u32_t ind = 0u; ind < block_size/sizeof(u32_t); ind++)
 		{
-			pdata[ind] ^= pIV[ind];
+			pdata[ind] = static_cast<u32_t>(pdata[ind] ^ pIV[ind]);
 		}
 	}
 	else if ((reinterpret_cast<u32_t>(cipher_IV) % sizeof(u16_t)) == 0
@@ -606,7 +606,7 @@
 
 		for (u32_t ind = 0u; ind < block_size/sizeof(u16_t); ind++)
 		{
-			pdata[ind] ^= pIV[ind];
+			pdata[ind] = static_cast<u16_t>(pdata[ind] ^ pIV[ind]);
 		}
 	}
 	else
@@ -616,7 +616,7 @@
 
 		for (u32_t ind = 0u; ind < block_size/sizeof(u8_t); ind++)
 		{
-			pdata[ind] ^= pIV[ind];
+			pdata[ind] = static_cast<u8_t>(pdata[ind] ^ pIV[ind]);
 		}
 	}
 }
@@ -5293,7 +5293,7 @@
 
 		for (j_ind = 0; j_ind < digest_length; j_ind++)
 		{
-			p_output[j_ind] ^= p_digest[j_ind];
+			p_output[j_ind] = static_cast<u8_t>(p_output[j_ind] ^ p_digest[j_ind]);
 		}
 	} // for()