Martchus
/
passwordfile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix compilation of AES implementation, document that is is not actually used

This commit is contained in:
Martchus 2021-08-22 00:17:04 +02:00
parent d1b7187085
commit 5ca417069a
3 changed files with 393 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -36,6 +36,12 @@ set(TEST_SRC_FILES tests/utils.h tests/passwordfiletests.cpp tests/entrytests.cp
set(DOC_FILES README.md) set(DOC_FILES README.md)
option(COMPILE_AES_SOURCES "compile AES sources" OFF)
if (COMPILE_AES_SOURCES)
list(APPEND HEADER_FILES aes/aes.h)
list(APPEND SRC_FILES aes/aes.cpp)
endif ()
# find c++utilities # find c++utilities
set(CONFIGURATION_PACKAGE_SUFFIX set(CONFIGURATION_PACKAGE_SUFFIX
"" ""

484
aes/aes.cpp
View File

@ -4,7 +4,16 @@
namespace Crypto { namespace Crypto {
Aes::byte Aes::sbox[16][16] = { /*!
* \class Aes
* \brief The Aes class implements AES encryption/decryption.
* \deprecated This class is not used by the rest of the library and not compiled by default.
* OpenSSL's crypto library is used instead. This class only serves educational
* purposes.
*/
// clang-format off
Aes::byte Aes::sbox[16][16] = {
{ 0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76 }, { 0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76 },
{ 0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0 }, { 0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0 },
{ 0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15 }, { 0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15 },
@ -21,9 +30,9 @@ namespace Crypto {
{ 0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E }, { 0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E },
{ 0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF }, { 0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF },
{ 0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16 } { 0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16 }
}; };
Aes::byte Aes::inv_sbox[16][16] = { Aes::byte Aes::inv_sbox[16][16] = {
{ 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb }, { 0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb },
{ 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb }, { 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb },
{ 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e }, { 0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e },
@ -40,9 +49,9 @@ namespace Crypto {
{ 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef }, { 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef },
{ 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61 }, { 0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61 },
{ 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d } { 0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d }
}; };
Aes::word Aes::rcon[52] = { Aes::word Aes::rcon[52] = {
0x00000000, 0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000, 0x40000000, 0x00000000, 0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000, 0x40000000,
0x80000000, 0x1B000000, 0x36000000, 0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000, 0x80000000, 0x1B000000, 0x36000000, 0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000, 0x97000000, 0x35000000, 0x6A000000, 0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000, 0x97000000, 0x35000000, 0x6A000000,
@ -50,362 +59,337 @@ namespace Crypto {
0x72000000, 0xE4000000, 0xD3000000, 0xBD000000, 0x61000000, 0xC2000000, 0x9F000000, 0x25000000, 0x72000000, 0xE4000000, 0xD3000000, 0xBD000000, 0x61000000, 0xC2000000, 0x9F000000, 0x25000000,
0x4A000000, 0x94000000, 0x33000000, 0x66000000, 0xCC000000, 0x83000000, 0x1D000000, 0x3A000000, 0x4A000000, 0x94000000, 0x33000000, 0x66000000, 0xCC000000, 0x83000000, 0x1D000000, 0x3A000000,
0x74000000, 0xE8000000, 0xCB000000, 0x8D000000 0x74000000, 0xE8000000, 0xCB000000, 0x8D000000
}; };
// clang-format on
Aes::Aes() : Aes::Aes()
key_length(0), : keyLength(0)
num_rounds(0), , numRounds(0)
w(0) , w(0)
{ {
memset(state, 0, 16); memset(state, 0, 16);
} }
Aes::~Aes() Aes::~Aes()
{ {
} }
Aes::byte Aes::gmul(byte a, byte b) Aes::byte Aes::gmul(byte a, byte b)
{ {
unsigned char p = 0; unsigned char p = 0;
unsigned char hi; unsigned char hi;
for(byte i = 0; i < 8; ++i) { for (byte i = 0; i < 8; ++i) {
if((b & 1) == 1) if ((b & 1) == 1)
p ^= a; p ^= a;
hi = (a & 0x80); hi = (a & 0x80);
a <<= 1; a <<= 1;
if(hi == 0x80) if (hi == 0x80)
a ^= 0x1b; a ^= 0x1b;
b >>= 1; b >>= 1;
} }
return p; return p;
} }
void Aes::rotWord(word *b) void Aes::rotWord(word *b)
{ {
byte tmp[4]; byte tmp[4];
memcpy(tmp, b, 4); memcpy(tmp, b, 4);
byte tmpb = tmp[3]; byte tmpb = tmp[3];
for(byte i = 3; i > 0; --i) for (byte i = 3; i > 0; --i)
tmp[i] = tmp[i - 1]; tmp[i] = tmp[i - 1];
tmp[0] = tmpb; tmp[0] = tmpb;
memcpy(b, tmp, 4); memcpy(b, tmp, 4);
} }
void Aes::subWord( word *b ) void Aes::subWord(word *b)
{ {
byte tmp[ 4 ]; byte tmp[4];
memcpy( tmp, b, 4 ); memcpy(tmp, b, 4);
for( byte i = 0; i < 4; ++i ) for (byte i = 0; i < 4; ++i)
tmp[ i ] = sbox[ tmp[ i ] >> 4 ][ tmp[ i ] & 0x0f ]; tmp[i] = sbox[tmp[i] >> 4][tmp[i] & 0x0f];
memcpy( b, tmp, 4 ); memcpy(b, tmp, 4);
} }
void Aes::expandKey( byte *key ) void Aes::expandKey(byte *key)
{ {
if( w ) if (w)
delete [] w; delete[] w;
w = new word[ 4 * ( num_rounds + 1 ) ]; w = new word[4 * (numRounds + 1)];
for( byte iw = 0, ib = 0; iw < key_length; ++iw, ib += 4 ) for (byte iw = 0, ib = 0; iw < keyLength; ++iw, ib += 4)
w[ iw ] = ( key[ ib ] << 24 ) + ( key[ ib + 1 ] << 16 ) + ( key[ ib + 2 ] << 8 ) + key[ ib + 3 ]; w[iw] = static_cast<word>((key[ib] << 24) + (key[ib + 1] << 16) + (key[ib + 2] << 8) + key[ib + 3]);
word tmp; word tmp;
for( byte i = key_length; i < ( 4 * ( num_rounds + 1 ) ); ++i ) { for (byte i = keyLength; i < (4 * (numRounds + 1)); ++i) {
tmp = w[ i - 1 ]; tmp = w[i - 1];
if( ( i % key_length ) == 0 ) { if ((i % keyLength) == 0) {
rotWord( &tmp ); rotWord(&tmp);
subWord( &tmp ); subWord(&tmp);
tmp ^= rcon[ i / key_length ]; tmp ^= rcon[i / keyLength];
} else if( ( key_length > 6 ) && ( ( i % key_length ) == 4 ) ) { } else if ((keyLength > 6) && ((i % keyLength) == 4)) {
subWord( &tmp ); subWord(&tmp);
} }
w[ i ] = w[ i - key_length ] ^ tmp; w[i] = w[i - keyLength] ^ tmp;
}
} }
}
void Aes::addRoundKey( byte round ) void Aes::addRoundKey(byte round)
{ {
for( byte col = 0; col < 4; ++col ) for (byte col = 0; col < 4; ++col)
for( byte row = 0; row < 4; ++row ) for (byte row = 0; row < 4; ++row)
state[ row ][ col ] ^= ( w[ round * 4 + col ] >> ( 24 - row * 8 ) ) & 0x000000ff; state[row][col] ^= static_cast<byte>((w[round * 4 + col] >> (24 - row * 8)) & 0x000000ff);
} }
void Aes::shiftRows( void ) void Aes::shiftRows(void)
{ {
byte tmp = 0; byte tmp = 0;
tmp = state[ 1 ][ 0 ]; tmp = state[1][0];
state[ 1 ][ 0 ] = state[ 1 ][ 1 ]; state[1][0] = state[1][1];
state[ 1 ][ 1 ] = state[ 1 ][ 2 ]; state[1][1] = state[1][2];
state[ 1 ][ 2 ] = state[ 1 ][ 3 ]; state[1][2] = state[1][3];
state[ 1 ][ 3 ] = tmp; state[1][3] = tmp;
tmp = state[ 2 ][ 0 ]; tmp = state[2][0];
state[ 2 ][ 0 ] = state[ 2 ][ 2 ]; state[2][0] = state[2][2];
state[ 2 ][ 2 ] = tmp; state[2][2] = tmp;
tmp = state[ 2 ][ 1 ]; tmp = state[2][1];
state[ 2 ][ 1 ] = state[ 2 ][ 3 ]; state[2][1] = state[2][3];
state[ 2 ][ 3 ] = tmp; state[2][3] = tmp;
tmp = state[ 3 ][ 3 ]; tmp = state[3][3];
state[ 3 ][ 3 ] = state[ 3 ][ 2 ]; state[3][3] = state[3][2];
state[ 3 ][ 2 ] = state[ 3 ][ 1 ]; state[3][2] = state[3][1];
state[ 3 ][ 1 ] = state[ 3 ][ 0 ]; state[3][1] = state[3][0];
state[ 3 ][ 0 ] = tmp; state[3][0] = tmp;
} }
void Aes::invShiftRows( void ) void Aes::invShiftRows(void)
{ {
byte tmp = 0; byte tmp = 0;
tmp = state[ 3 ][ 0 ]; tmp = state[3][0];
state[ 3 ][ 0 ] = state[ 3 ][ 1 ]; state[3][0] = state[3][1];
state[ 3 ][ 1 ] = state[ 3 ][ 2 ]; state[3][1] = state[3][2];
state[ 3 ][ 2 ] = state[ 3 ][ 3 ]; state[3][2] = state[3][3];
state[ 3 ][ 3 ] = tmp; state[3][3] = tmp;
tmp = state[ 2 ][ 0 ]; tmp = state[2][0];
state[ 2 ][ 0 ] = state[ 2 ][ 2 ]; state[2][0] = state[2][2];
state[ 2 ][ 2 ] = tmp; state[2][2] = tmp;
tmp = state[ 2 ][ 1 ]; tmp = state[2][1];
state[ 2 ][ 1 ] = state[ 2 ][ 3 ]; state[2][1] = state[2][3];
state[ 2 ][ 3 ] = tmp; state[2][3] = tmp;
tmp = state[ 1 ][ 3 ]; tmp = state[1][3];
state[ 1 ][ 3 ] = state[ 1 ][ 2 ]; state[1][3] = state[1][2];
state[ 1 ][ 2 ] = state[ 1 ][ 1 ]; state[1][2] = state[1][1];
state[ 1 ][ 1 ] = state[ 1 ][ 0 ]; state[1][1] = state[1][0];
state[ 1 ][ 0 ] = tmp; state[1][0] = tmp;
} }
void Aes::mixColumns( void ) void Aes::mixColumns(void)
{ {
unsigned char a[4]; unsigned char a[4];
unsigned char b[4]; unsigned char b[4];
unsigned char h = 0; unsigned char h = 0;
for( byte col = 0; col < 4; ++col ) { for (byte col = 0; col < 4; ++col) {
for (byte row = 0; row < 4; ++row) {
for( byte row = 0; row < 4; ++row ) { a[row] = state[row][col];
h = state[row][col] & 0x80;
a[ row ] = state[ row ][ col ]; b[row] = static_cast<byte>(state[row][col] << 1);
h = state[ row ][ col ] & 0x80; if (h == 0x80)
b[ row ] = state[ row ][ col ] << 1; b[row] ^= 0x1b;
if( h == 0x80 )
b[ row ] ^= 0x1b;
}
state[ 0 ][ col ] = b[ 0 ] ^ a[ 3 ] ^ a[ 2 ] ^ b[ 1 ] ^ a[ 1 ];
state[ 1 ][ col ] = b[ 1 ] ^ a[ 0 ] ^ a[ 3 ] ^ b[ 2 ] ^ a[ 2 ];
state[ 2 ][ col ] = b[ 2 ] ^ a[ 1 ] ^ a[ 0 ] ^ b[ 3 ] ^ a[ 3 ];
state[ 3 ][ col ] = b[ 3 ] ^ a[ 2 ] ^ a[ 1 ] ^ b[ 0 ] ^ a[ 0 ];
} }
state[0][col] = b[0] ^ a[3] ^ a[2] ^ b[1] ^ a[1];
state[1][col] = b[1] ^ a[0] ^ a[3] ^ b[2] ^ a[2];
state[2][col] = b[2] ^ a[1] ^ a[0] ^ b[3] ^ a[3];
state[3][col] = b[3] ^ a[2] ^ a[1] ^ b[0] ^ a[0];
} }
}
void Aes::invMixColumns( void ) void Aes::invMixColumns(void)
{ {
unsigned char a[4]; unsigned char a[4];
for( byte col = 0; col < 4; ++col ) { for (byte col = 0; col < 4; ++col) {
for (byte row = 0; row < 4; ++row)
a[row] = state[row][col];
state[0][col] = gmul(a[0], 14) ^ gmul(a[3], 9) ^ gmul(a[2], 13) ^ gmul(a[1], 11);
state[1][col] = gmul(a[1], 14) ^ gmul(a[0], 9) ^ gmul(a[3], 13) ^ gmul(a[2], 11);
state[2][col] = gmul(a[2], 14) ^ gmul(a[1], 9) ^ gmul(a[0], 13) ^ gmul(a[3], 11);
state[3][col] = gmul(a[3], 14) ^ gmul(a[2], 9) ^ gmul(a[1], 13) ^ gmul(a[0], 11);
}
}
for( byte row = 0; row < 4; ++ row ) bool Aes::setKey(char *key)
a[ row ] = state[ row ][ col ]; {
size_t keyLen = strlen(key);
state[ 0 ][ col ] = gmul( a[ 0 ], 14 ) ^ gmul( a[ 3 ], 9 ) ^ gmul( a[ 2 ], 13 ) ^ gmul( a[ 1 ], 11 ); byte *wKey = 0;
state[ 1 ][ col ] = gmul( a[ 1 ], 14 ) ^ gmul( a[ 0 ], 9 ) ^ gmul( a[ 3 ], 13 ) ^ gmul( a[ 2 ], 11 ); byte desKeyLen = 0;
state[ 2 ][ col ] = gmul( a[ 2 ], 14 ) ^ gmul( a[ 1 ], 9 ) ^ gmul( a[ 0 ], 13 ) ^ gmul( a[ 3 ], 11 );
state[ 3 ][ col ] = gmul( a[ 3 ], 14 ) ^ gmul( a[ 2 ], 9 ) ^ gmul( a[ 1 ], 13 ) ^ gmul( a[ 0 ], 11 ); if (keyLen <= 16) {
keyLength = 4;
numRounds = 10;
desKeyLen = 16;
} else if (keyLen <= 24) {
keyLength = 6;
numRounds = 12;
desKeyLen = 24;
} else if (keyLen <= 32) {
keyLength = 8;
numRounds = 14;
desKeyLen = 32;
} }
} wKey = new byte[desKeyLen];
for (byte i = 0, t = 0; t < desKeyLen; ++i, ++t) {
bool Aes::setKey( char *key ) if (i == keyLen)
{
size_t key_len = strlen( key );
byte *w_key = 0;
byte des_key_len = 0;
if( key_len <= 16 ) {
key_length = 4;
num_rounds = 10;
des_key_len = 16;
} else if( key_len <= 24 ) {
key_length = 6;
num_rounds = 12;
des_key_len = 24;
} else if( key_len <= 32 ) {
key_length = 8;
num_rounds = 14;
des_key_len = 32;
}
w_key = new byte[ des_key_len ];
for( byte i = 0, t = 0; t < des_key_len; ++i, ++t ) {
if( i == key_len )
i = 0; i = 0;
*( w_key + t ) = *( key + i ); *(wKey + t) = static_cast<byte>(*(key + i));
} }
expandKey( w_key ); expandKey(wKey);
delete[] wKey;
delete [] w_key;
return true; return true;
}
void Aes::cipher(void)
{
addRoundKey(0);
for (byte round = 1; round < numRounds; ++round) {
for (byte row = 0; row < 4; ++row)
for (byte col = 0; col < 4; ++col)
state[row][col] = sbox[state[row][col] >> 4][state[row][col] & 0x0f];
shiftRows();
mixColumns();
addRoundKey(round);
} }
void Aes::cipher( void ) for (byte row = 0; row < 4; ++row)
{ for (byte col = 0; col < 4; ++col)
addRoundKey( 0 ); state[row][col] = sbox[state[row][col] >> 4][state[row][col] & 0x0f];
for( byte round = 1; round < num_rounds; ++round ) { shiftRows();
addRoundKey(numRounds);
}
for( byte row = 0; row < 4; ++row ) void Aes::invCipher(void)
for( byte col = 0; col < 4; ++col ) {
state[ row ][ col ] = sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ]; addRoundKey(numRounds);
shiftRows( ); for (byte round = (numRounds - 1); round > 0; --round) {
mixColumns( ); invShiftRows();
addRoundKey( round ); for (byte row = 0; row < 4; ++row)
for (byte col = 0; col < 4; ++col)
state[row][col] = inv_sbox[state[row][col] >> 4][state[row][col] & 0x0f];
addRoundKey(round);
invMixColumns();
} }
for( byte row = 0; row < 4; ++row ) invShiftRows();
for( byte col = 0; col < 4; ++col )
state[ row ][ col ] = sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ];
shiftRows( ); for (byte row = 0; row < 4; ++row)
addRoundKey( num_rounds ); for (byte col = 0; col < 4; ++col)
} state[row][col] = inv_sbox[state[row][col] >> 4][state[row][col] & 0x0f];
void Aes::invCipher( void ) addRoundKey(0);
{ }
addRoundKey( num_rounds );
for( byte round = ( num_rounds - 1 ); round > 0; --round ) { size_t Aes::encrypt(char **data, std::size_t length, char *key)
{
invShiftRows( ); if (length == 0)
for( byte row = 0; row < 4; ++row )
for( byte col = 0; col < 4; ++col )
state[ row ][ col ] = inv_sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ];
addRoundKey( round );
invMixColumns( );
}
invShiftRows( );
for( byte row = 0; row < 4; ++row )
for( byte col = 0; col < 4; ++col )
state[ row ][ col ] = inv_sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ];
addRoundKey( 0 );
}
size_t Aes::encrypt( char **data, size_t length, char *key )
{
if( length == 0 )
return 0; return 0;
if( !setKey( key ) ) if (!setKey(key))
return 0; return 0;
size_t old_length = length; size_t oldLength = length;
while( length % 16 ) while (length % 16)
++length; ++length;
char *buffer = new char[ length ]; char *buffer = new char[length];
memset( buffer, 0, length ); memset(buffer, 0, length);
memcpy( buffer, *data, old_length ); memcpy(buffer, *data, oldLength);
delete [] *data; delete[] * data;
*data = buffer; *data = buffer;
size_t cur_block = 0; size_t curBlock = 0;
do { do {
for (byte col = 0; col < 4; ++col)
for (byte row = 0; row < 4; ++row)
state[row][col] = static_cast<byte>((*data)[curBlock * 16 + row + 4 * col]);
cipher();
for (byte col = 0; col < 4; ++col)
for (byte row = 0; row < 4; ++row)
(*data)[curBlock * 16 + row + 4 * col] = static_cast<char>(state[row][col]);
++curBlock;
} while (curBlock * 16 != length);
for( byte col = 0; col < 4; ++col ) return curBlock;
for( byte row = 0; row < 4; ++row ) }
state[ row ][ col ] = static_cast< byte >( ( *data )[ cur_block * 16 + row + 4 * col ] );
cipher( ); size_t Aes::decrypt(char **data, std::size_t length, char *key)
{
for( byte col = 0; col < 4; ++col ) if (length == 0)
for( byte row = 0; row < 4; ++row )
( *data )[ cur_block * 16 + row + 4 * col ] = static_cast< char >( state[ row ][ col ] );
++cur_block;
} while( cur_block * 16 != length );
return cur_block;
}
size_t Aes::decrypt( char **data, size_t length, char *key )
{
if( length == 0 )
return 0; return 0;
if( !setKey( key ) ) if (!setKey(key))
return 0; return 0;
size_t old_length = length; std::size_t oldLength = length;
while( length % 16 ) while (length % 16)
++length; ++length;
char *buffer = new char[ length ]; char *buffer = new char[length];
memset( buffer, 0, length ); memset(buffer, 0, length);
memcpy( buffer, *data, old_length ); memcpy(buffer, *data, oldLength);
delete [] *data; delete[] * data;
*data = buffer; *data = buffer;
size_t cur_block = 0; std::size_t curBlock = 0;
do { do {
for (byte col = 0; col < 4; ++col)
for (byte row = 0; row < 4; ++row)
state[row][col] = static_cast<byte>((*data)[curBlock * 16 + row + 4 * col]);
for( byte col = 0; col < 4; ++col ) invCipher();
for( byte row = 0; row < 4; ++row )
state[ row ][ col ] = static_cast< byte >( ( *data )[ cur_block * 16 + row + 4 * col ] );
invCipher( ); for (byte col = 0; col < 4; ++col)
for (byte row = 0; row < 4; ++row)
(*data)[curBlock * 16 + row + 4 * col] = static_cast<char>(state[row][col]);
for( byte col = 0; col < 4; ++col ) ++curBlock;
for( byte row = 0; row < 4; ++row )
( *data )[ cur_block * 16 + row + 4 * col ] = static_cast< char >( state[ row ][ col ] );
++cur_block; } while (curBlock * 16 != length);
} while( cur_block * 16 != length );
--length; --length;
while( ! ( ( *buffer ) + length ) ) while (!(static_cast<decltype(length)>(*buffer) + length))
--length; --length;
++length; ++length;
return length; return length;
}
} }
} // namespace Crypto

22
aes/aes.h
View File

@ -1,28 +1,28 @@
#ifndef AES_INCLUDED #ifndef AES_INCLUDED
#define AES_INCLUDED AES_INCLUDED #define AES_INCLUDED AES_INCLUDED
#include <c++utilities/application/global.h> #include "../global.h"
#include <cstring> #include <cstring>
namespace Crypto { namespace Crypto {
class LIB_EXPORT Aes { class PASSWORD_FILE_EXPORT Aes {
public: public:
typedef unsigned char byte; using byte = unsigned char;
typedef unsigned long word; using word = unsigned long;
Aes(); Aes();
~Aes(); ~Aes();
size_t encrypt(char **data, size_t length, char *key); std::size_t encrypt(char **data, std::size_t length, char *key);
size_t decrypt(char **data, size_t length, char *key); std::size_t decrypt(char **data, std::size_t length, char *key);
private: private:
static byte gmul(byte a, byte b); static byte gmul(byte a, byte b);
static void rotWord(word *b ); static void rotWord(word *b);
static void subWord(word *b ); static void subWord(word *b);
bool setKey(char *key); bool setKey(char *key);
void expandKey(byte *key); void expandKey(byte *key);
@ -42,13 +42,13 @@ private:
static byte inv_sbox[16][16]; static byte inv_sbox[16][16];
static word rcon[52]; static word rcon[52];
byte key_length; byte keyLength;
byte num_rounds; byte numRounds;
word *w; word *w;
byte state[4][4]; byte state[4][4];
}; };
} } // namespace Crypto
#endif /* AES_INCLUDED */ #endif /* AES_INCLUDED */