This commit is contained in:
Matteo Brichese 2017-06-23 14:24:05 -07:00
parent 212b4d795f
commit 020721359a

View File

@ -178,27 +178,24 @@ void QAESEncryption::shiftRows()
void QAESEncryption::mixColumns() void QAESEncryption::mixColumns()
{ {
QByteArray::iterator it = m_state->begin(); QByteArray::iterator it = m_state->begin();
quint8 Tmp,Tm,t; quint8 tmp,t;
for(int i = 0; i < 16; i+=4)
for(int i = 0; i < 16; i += 4)
{ {
t = (quint8) it[i]; t = it[i];
Tmp = (quint8) it[i] ^ (quint8) it[i+1] ^ (quint8) it[i+2] ^ (quint8) it[i+3] ; tmp = it[i] ^ it[i+1] ^ it[i+2] ^ it[i+3] ;
Tm = (quint8) it[i] ^ (quint8) it[i+1]; Tm = xTime( it[i] ^ it[i+1] );
Tm = xTime(Tm); it[i] ^= Tm ^ tmp;
it[i] = (quint8) it[i] ^ Tm ^ Tmp;
Tm = (quint8) it[i+1] ^ (quint8) it[i+2]; Tm = xTime( it[i+1] ^ it[i+2]);
Tm = xTime(Tm); it[i+1] ^= Tm ^ tmp;
it[i+1] = (quint8) it[i+1] ^ Tm ^ Tmp;
Tm = (quint8) it[i+2] ^ (quint8) it[i+3]; Tm = xTime( it[i+2] ^ it[i+3]);
Tm = xTime(Tm); it[i+2] ^= Tm ^ tmp;
it[i+2] = (quint8) it[i+2] ^ Tm ^ Tmp;
Tm = (quint8) it[i+3] ^ t; Tm = xTime(it[i+3] ^ t);
Tm = xTime(Tm); it[i+3] ^= Tm ^ tmp;
it[i+3] = (quint8) it[i+3] ^ Tm ^ Tmp;
} }
} }