Changeset a8f2692 for tools/traceanon/rijndael.c
 Timestamp:
 10/15/09 18:25:10 (12 years ago)
 Branches:
 4.0.1hotfixes, cachetimestamps, develop, dpdkndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc4.0.1, rc4.0.2, rc4.0.3, rc4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
 Children:
 189f5c6
 Parents:
 7f1b9d4
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

tools/traceanon/rijndael.c
ra7282fb ra8f2692 966 966 967 967 void keySched(UINT8 key[_MAX_KEY_COLUMNS][4]); 968 void keyEncToDec();968 static void keyEncToDec(void); 969 969 void r_encrypt(const UINT8 a[16], UINT8 b[16]); 970 970 void r_decrypt(const UINT8 a[16], UINT8 b[16]); … … 1383 1383 1384 1384 /* copy values into round key array */ 1385 for(j = 0;(j < uKeyColumns) && (r <= m_uRounds); )1385 for(j = 0;(j < uKeyColumns) && (r <= (int)m_uRounds); ) 1386 1386 { 1387 1387 for(;(j < uKeyColumns) && (t < 4); j++, t++) … … 1398 1398 } 1399 1399 1400 while(r <= m_uRounds)1400 while(r <= (int)m_uRounds) 1401 1401 { 1402 1402 tempKey[0][0] ^= S[tempKey[uKeyColumns1][1]]; … … 1426 1426 } 1427 1427 } 1428 for(j = 0; (j < uKeyColumns) && (r <= m_uRounds); )1428 for(j = 0; (j < uKeyColumns) && (r <= (int)m_uRounds); ) 1429 1429 { 1430 1430 for(; (j < uKeyColumns) && (t < 4); j++, t++) … … 1441 1441 } 1442 1442 1443 void keyEncToDec( )1443 void keyEncToDec(void) 1444 1444 { 1445 1445 int r; 1446 1446 UINT8 *w; 1447 1447 1448 for(r = 1; r < m_uRounds; r++)1448 for(r = 1; r < (int)m_uRounds; r++) 1449 1449 { 1450 1450 w = m_expandedKey[r][0]; … … 1484 1484 ^ *((UINT32*)T3[temp[1][2]]) 1485 1485 ^ *((UINT32*)T4[temp[2][3]]); 1486 for(r = 1; r < m_uRounds1; r++)1486 for(r = 1; r < (int)m_uRounds1; r++) 1487 1487 { 1488 1488 *((UINT32*)temp[0]) = *((UINT32*)(b )) ^ *((UINT32*)m_expandedKey[r][0]);
Note: See TracChangeset
for help on using the changeset viewer.