projects
/
aes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add PDF target to Makefile
[aes.git]
/
aes.cpp
diff --git
a/aes.cpp
b/aes.cpp
index
e4aef0b
..
dff959e
100644
(file)
--- a/
aes.cpp
+++ b/
aes.cpp
@@
-9,8
+9,7
@@
static byte xtimes (const byte bx);
static void printState (byteArray &bytes, std::string name);
AES::AES (const byteArray& key)
static void printState (byteArray &bytes, std::string name);
AES::AES (const byteArray& key)
- : Nb(4) // This is constant in AES
- , Nk(key.size() / 4) // This can be either 4, 6, or 8 (128, 192, or 256 bit)
+ : Nk(key.size() / 4) // This can be either 4, 6, or 8 (128, 192, or 256 bit)
, Nr(Nk + Nb + 2)
, keySchedule(Nb * (Nr+1), 0x00000000)
{
, Nr(Nk + Nb + 2)
, keySchedule(Nb * (Nr+1), 0x00000000)
{
@@
-422,10
+421,7
@@
void AES::AddRoundKey (byteArray& state, const wordArray& w) const
byteArray wBytes = word2bytes (w[i]);
for (j=0; j<Nb; ++j)
byteArray wBytes = word2bytes (w[i]);
for (j=0; j<Nb; ++j)
- {
- //std::printf ("state.at(%d) ^= wBytes.at(%d) -- %.2x ^ %.2x = %.2x\n", i*Nb+j, j, state.at (i*Nb+j), wBytes.at(j), state.at(i*Nb+j) ^ wBytes.at(j));
state.at(j*Nb+i) ^= wBytes.at(j);
state.at(j*Nb+i) ^= wBytes.at(j);
- }
}
}
}
}