Fix decoration for static builds

This commit is contained in:
Martchus 2016-08-29 15:42:07 +02:00
parent a628f0383a
commit 0b9a0fe326
12 changed files with 1127 additions and 1109 deletions

View File

@ -1,411 +1,411 @@
#include "./aes.h" #include "./aes.h"
#include <cstring> #include <cstring>
namespace Crypto { namespace Crypto {
Aes::byte Aes::sbox[16][16] = { 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 },
{ 0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75 }, { 0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75 },
{ 0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84 }, { 0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84 },
{ 0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF }, { 0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF },
{ 0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8 }, { 0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8 },
{ 0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2 }, { 0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2 },
{ 0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73 }, { 0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73 },
{ 0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB }, { 0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB },
{ 0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79 }, { 0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79 },
{ 0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08 }, { 0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08 },
{ 0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A }, { 0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A },
{ 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 },
{ 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25 }, { 0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25 },
{ 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92 }, { 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92 },
{ 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84 }, { 0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84 },
{ 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06 }, { 0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06 },
{ 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b }, { 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b },
{ 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73 }, { 0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73 },
{ 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e }, { 0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e },
{ 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b }, { 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b },
{ 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4 }, { 0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4 },
{ 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f }, { 0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f },
{ 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,
0xD4000000, 0xB3000000, 0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000, 0x39000000, 0xD4000000, 0xB3000000, 0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000, 0x39000000,
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
}; };
Aes::Aes() : Aes::Aes() :
key_length(0), key_length(0),
num_rounds(0), num_rounds(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 * ( num_rounds + 1 ) ];
for( byte iw = 0, ib = 0; iw < key_length; ++iw, ib += 4 ) for( byte iw = 0, ib = 0; iw < key_length; ++iw, ib += 4 )
w[ iw ] = ( key[ ib ] << 24 ) + ( key[ ib + 1 ] << 16 ) + ( key[ ib + 2 ] << 8 ) + key[ ib + 3 ]; w[ iw ] = ( 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 = key_length; i < ( 4 * ( num_rounds + 1 ) ); ++i ) {
tmp = w[ i - 1 ]; tmp = w[ i - 1 ];
if( ( i % key_length ) == 0 ) { if( ( i % key_length ) == 0 ) {
rotWord( &tmp ); rotWord( &tmp );
subWord( &tmp ); subWord( &tmp );
tmp ^= rcon[ i / key_length ]; tmp ^= rcon[ i / key_length ];
} else if( ( key_length > 6 ) && ( ( i % key_length ) == 4 ) ) { } else if( ( key_length > 6 ) && ( ( i % key_length ) == 4 ) ) {
subWord( &tmp ); subWord( &tmp );
} }
w[ i ] = w[ i - key_length ] ^ tmp; w[ i ] = w[ i - key_length ] ^ 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 ] ^= ( 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 ]; a[ row ] = state[ row ][ col ];
h = state[ row ][ col ] & 0x80; h = state[ row ][ col ] & 0x80;
b[ row ] = state[ row ][ col ] << 1; b[ row ] = state[ row ][ col ] << 1;
if( h == 0x80 ) if( h == 0x80 )
b[ row ] ^= 0x1b; b[ row ] ^= 0x1b;
} }
state[ 0 ][ col ] = b[ 0 ] ^ a[ 3 ] ^ a[ 2 ] ^ b[ 1 ] ^ a[ 1 ]; 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[ 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[ 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[ 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 ) for( byte row = 0; row < 4; ++ row )
a[ row ] = state[ row ][ col ]; 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[ 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[ 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[ 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 ); state[ 3 ][ col ] = gmul( a[ 3 ], 14 ) ^ gmul( a[ 2 ], 9 ) ^ gmul( a[ 1 ], 13 ) ^ gmul( a[ 0 ], 11 );
} }
} }
bool Aes::setKey( char *key ) bool Aes::setKey( char *key )
{ {
size_t key_len = strlen( key ); size_t key_len = strlen( key );
byte *w_key = 0; byte *w_key = 0;
byte des_key_len = 0; byte des_key_len = 0;
if( key_len <= 16 ) { if( key_len <= 16 ) {
key_length = 4; key_length = 4;
num_rounds = 10; num_rounds = 10;
des_key_len = 16; des_key_len = 16;
} else if( key_len <= 24 ) { } else if( key_len <= 24 ) {
key_length = 6; key_length = 6;
num_rounds = 12; num_rounds = 12;
des_key_len = 24; des_key_len = 24;
} else if( key_len <= 32 ) { } else if( key_len <= 32 ) {
key_length = 8; key_length = 8;
num_rounds = 14; num_rounds = 14;
des_key_len = 32; des_key_len = 32;
} }
w_key = new byte[ des_key_len ]; w_key = new byte[ des_key_len ];
for( byte i = 0, t = 0; t < des_key_len; ++i, ++t ) { for( byte i = 0, t = 0; t < des_key_len; ++i, ++t ) {
if( i == key_len ) if( i == key_len )
i = 0; i = 0;
*( w_key + t ) = *( key + i ); *( w_key + t ) = *( key + i );
} }
expandKey( w_key ); expandKey( w_key );
delete [] w_key; delete [] w_key;
return true; return true;
} }
void Aes::cipher( void ) void Aes::cipher( void )
{ {
addRoundKey( 0 ); addRoundKey( 0 );
for( byte round = 1; round < num_rounds; ++round ) { for( byte round = 1; round < num_rounds; ++round ) {
for( byte row = 0; row < 4; ++row ) for( byte row = 0; row < 4; ++row )
for( byte col = 0; col < 4; ++col ) for( byte col = 0; col < 4; ++col )
state[ row ][ col ] = sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ]; state[ row ][ col ] = sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ];
shiftRows( ); shiftRows( );
mixColumns( ); mixColumns( );
addRoundKey( round ); addRoundKey( round );
} }
for( byte row = 0; row < 4; ++row ) for( byte row = 0; row < 4; ++row )
for( byte col = 0; col < 4; ++col ) for( byte col = 0; col < 4; ++col )
state[ row ][ col ] = sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ]; state[ row ][ col ] = sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ];
shiftRows( ); shiftRows( );
addRoundKey( num_rounds ); addRoundKey( num_rounds );
} }
void Aes::invCipher( void ) void Aes::invCipher( void )
{ {
addRoundKey( num_rounds ); addRoundKey( num_rounds );
for( byte round = ( num_rounds - 1 ); round > 0; --round ) { for( byte round = ( num_rounds - 1 ); round > 0; --round ) {
invShiftRows( ); invShiftRows( );
for( byte row = 0; row < 4; ++row ) for( byte row = 0; row < 4; ++row )
for( byte col = 0; col < 4; ++col ) for( byte col = 0; col < 4; ++col )
state[ row ][ col ] = inv_sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ]; state[ row ][ col ] = inv_sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ];
addRoundKey( round ); addRoundKey( round );
invMixColumns( ); invMixColumns( );
} }
invShiftRows( ); invShiftRows( );
for( byte row = 0; row < 4; ++row ) for( byte row = 0; row < 4; ++row )
for( byte col = 0; col < 4; ++col ) for( byte col = 0; col < 4; ++col )
state[ row ][ col ] = inv_sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ]; state[ row ][ col ] = inv_sbox[ state[ row ][ col ] >> 4 ][ state[ row ][ col ] & 0x0f ];
addRoundKey( 0 ); addRoundKey( 0 );
} }
size_t Aes::encrypt( char **data, size_t length, char *key ) size_t Aes::encrypt( char **data, size_t length, char *key )
{ {
if( length == 0 ) if( length == 0 )
return 0; return 0;
if( !setKey( key ) ) if( !setKey( key ) )
return 0; return 0;
size_t old_length = length; size_t old_length = 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, old_length );
delete [] *data; delete [] *data;
*data = buffer; *data = buffer;
size_t cur_block = 0; size_t cur_block = 0;
do { do {
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 ] = static_cast< byte >( ( *data )[ cur_block * 16 + row + 4 * col ] ); state[ row ][ col ] = static_cast< byte >( ( *data )[ cur_block * 16 + row + 4 * col ] );
cipher( ); cipher( );
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 )
( *data )[ cur_block * 16 + row + 4 * col ] = static_cast< char >( state[ row ][ col ] ); ( *data )[ cur_block * 16 + row + 4 * col ] = static_cast< char >( state[ row ][ col ] );
++cur_block; ++cur_block;
} while( cur_block * 16 != length ); } while( cur_block * 16 != length );
return cur_block; return cur_block;
} }
size_t Aes::decrypt( char **data, size_t length, char *key ) size_t Aes::decrypt( char **data, size_t length, char *key )
{ {
if( length == 0 ) if( length == 0 )
return 0; return 0;
if( !setKey( key ) ) if( !setKey( key ) )
return 0; return 0;
size_t old_length = length; size_t old_length = 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, old_length );
delete [] *data; delete [] *data;
*data = buffer; *data = buffer;
size_t cur_block = 0; size_t cur_block = 0;
do { do {
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 ] = static_cast< byte >( ( *data )[ cur_block * 16 + row + 4 * col ] ); state[ row ][ col ] = static_cast< byte >( ( *data )[ cur_block * 16 + row + 4 * col ] );
invCipher( ); invCipher( );
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 )
( *data )[ cur_block * 16 + row + 4 * col ] = static_cast< char >( state[ row ][ col ] ); ( *data )[ cur_block * 16 + row + 4 * col ] = static_cast< char >( state[ row ][ col ] );
++cur_block; ++cur_block;
} while( cur_block * 16 != length ); } while( cur_block * 16 != length );
--length; --length;
while( ! ( ( *buffer ) + length ) ) while( ! ( ( *buffer ) + length ) )
--length; --length;
++length; ++length;
return length; return length;
} }
} }

108
aes/aes.h
View File

@ -1,54 +1,54 @@
#ifndef AES_INCLUDED #ifndef AES_INCLUDED
#define AES_INCLUDED AES_INCLUDED #define AES_INCLUDED AES_INCLUDED
#include <c++utilities/application/global.h> #include <c++utilities/application/global.h>
#include <cstring> #include <cstring>
namespace Crypto { namespace Crypto {
class LIB_EXPORT Aes { class LIB_EXPORT Aes {
public: public:
typedef unsigned char byte; typedef unsigned char byte;
typedef unsigned long word; typedef unsigned long word;
Aes(); Aes();
~Aes(); ~Aes();
size_t encrypt(char **data, size_t length, char *key); size_t encrypt(char **data, size_t length, char *key);
size_t decrypt(char **data, size_t length, char *key); size_t decrypt(char **data, 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);
void addRoundKey(byte round); void addRoundKey(byte round);
void shiftRows(void); void shiftRows(void);
void invShiftRows(void); void invShiftRows(void);
void mixColumns(void); void mixColumns(void);
void invMixColumns(void); void invMixColumns(void);
void cipher(void); void cipher(void);
void invCipher(void); void invCipher(void);
static byte sbox[16][16]; static byte sbox[16][16];
static byte inv_sbox[16][16]; static byte inv_sbox[16][16];
static word rcon[52]; static word rcon[52];
byte key_length; byte key_length;
byte num_rounds; byte num_rounds;
word *w; word *w;
byte state[4][4]; byte state[4][4];
}; };
} }
#endif /* AES_INCLUDED */ #endif /* AES_INCLUDED */

17
global.h Normal file
View File

@ -0,0 +1,17 @@
// Created via CMake from template global.h.in
// WARNING! Any changes to this file will be overwritten by the next CMake run!
#ifndef PASSWORD_FILE_GLOBAL
#define PASSWORD_FILE_GLOBAL
#include <c++utilities/application/global.h>
#ifdef PASSWORD_FILE_STATIC
# define PASSWORD_FILE_EXPORT
# define PASSWORD_FILE_IMPORT
#else
# define PASSWORD_FILE_EXPORT LIB_EXPORT
# define PASSWORD_FILE_IMPORT LIB_IMPORT
#endif
#endif // PASSWORD_FILE_GLOBAL

View File

@ -1,14 +1,14 @@
#ifndef CRYPTOFAILUREEXCEPTION_H #ifndef CRYPTOFAILUREEXCEPTION_H
#define CRYPTOFAILUREEXCEPTION_H #define CRYPTOFAILUREEXCEPTION_H
#include <c++utilities/application/global.h> #include "../global.h"
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
namespace Io { namespace Io {
class LIB_EXPORT CryptoException : public std::runtime_error class PASSWORD_FILE_EXPORT CryptoException : public std::runtime_error
{ {
public: public:
CryptoException(const std::string &openSslErrorQueue) USE_NOTHROW; CryptoException(const std::string &openSslErrorQueue) USE_NOTHROW;

View File

@ -4,7 +4,6 @@
#include "./field.h" #include "./field.h"
#include <c++utilities/conversion/types.h> #include <c++utilities/conversion/types.h>
#include <c++utilities/application/global.h>
#include <iostream> #include <iostream>
#include <string> #include <string>
@ -24,7 +23,7 @@ enum class EntryType : int
class NodeEntry; class NodeEntry;
class LIB_EXPORT Entry class PASSWORD_FILE_EXPORT Entry
{ {
friend class NodeEntry; friend class NodeEntry;
public: public:
@ -95,7 +94,7 @@ inline int Entry::index() const
return m_index; return m_index;
} }
class LIB_EXPORT NodeEntry : public Entry class PASSWORD_FILE_EXPORT NodeEntry : public Entry
{ {
friend class Entry; friend class Entry;
public: public:
@ -145,7 +144,7 @@ inline bool Entry::denotesNodeEntry(byte version)
return (version & 0x80) == 0; return (version & 0x80) == 0;
} }
class LIB_EXPORT AccountEntry : public Entry class PASSWORD_FILE_EXPORT AccountEntry : public Entry
{ {
public: public:
AccountEntry(); AccountEntry();

View File

@ -1,7 +1,7 @@
#ifndef FIELD_H #ifndef FIELD_H
#define FIELD_H #define FIELD_H
#include <c++utilities/application/global.h> #include "../global.h"
#include <iostream> #include <iostream>
#include <string> #include <string>
@ -16,7 +16,7 @@ enum class FieldType : int
class AccountEntry; class AccountEntry;
class LIB_EXPORT Field class PASSWORD_FILE_EXPORT Field
{ {
public: public:
Field(AccountEntry *tiedAccount, const std::string &name = std::string(), const std::string &value = std::string()); Field(AccountEntry *tiedAccount, const std::string &name = std::string(), const std::string &value = std::string());

View File

@ -1,14 +1,14 @@
#ifndef PARSINGEXCEPTION_H #ifndef PARSINGEXCEPTION_H
#define PARSINGEXCEPTION_H #define PARSINGEXCEPTION_H
#include <c++utilities/application/global.h> #include "../global.h"
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
namespace Io { namespace Io {
class LIB_EXPORT ParsingException : public std::runtime_error class PASSWORD_FILE_EXPORT ParsingException : public std::runtime_error
{ {
public: public:
ParsingException(const std::string &message = std::string()) USE_NOTHROW; ParsingException(const std::string &message = std::string()) USE_NOTHROW;

File diff suppressed because it is too large Load Diff

View File

@ -1,58 +1,60 @@
#ifndef PASSWORDFILE_H #ifndef PASSWORDFILE_H
#define PASSWORDFILE_H #define PASSWORDFILE_H
#include <c++utilities/io/binaryreader.h> #include "../global.h"
#include <c++utilities/io/binarywriter.h>
#include <c++utilities/io/binaryreader.h>
#include <string> #include <c++utilities/io/binarywriter.h>
#include <iostream>
#include <fstream> #include <string>
#include <memory> #include <iostream>
#include <fstream>
namespace Io { #include <memory>
class NodeEntry; namespace Io {
class LIB_EXPORT PasswordFile class NodeEntry;
{
public: class PASSWORD_FILE_EXPORT PasswordFile
explicit PasswordFile(); {
explicit PasswordFile(const std::string &path, const std::string &password); public:
PasswordFile(const PasswordFile &other); explicit PasswordFile();
~PasswordFile(); explicit PasswordFile(const std::string &path, const std::string &password);
void open(bool readOnly = false); PasswordFile(const PasswordFile &other);
void generateRootEntry(); ~PasswordFile();
void create(); void open(bool readOnly = false);
void close(); void generateRootEntry();
void load(); void create();
void save(bool useEncryption = true, bool useCompression = true); void close();
void clearEntries(); void load();
void clear(); void save(bool useEncryption = true, bool useCompression = true);
void exportToTextfile(const std::string &targetPath) const; void clearEntries();
void doBackup(); void clear();
bool hasRootEntry() const; void exportToTextfile(const std::string &targetPath) const;
const NodeEntry *rootEntry() const; void doBackup();
NodeEntry *rootEntry(); bool hasRootEntry() const;
const std::string &path() const; const NodeEntry *rootEntry() const;
const char *password() const; NodeEntry *rootEntry();
void setPath(const std::string &value); const std::string &path() const;
void clearPath(); const char *password() const;
void setPassword(const std::string &value); void setPath(const std::string &value);
void clearPassword(); void clearPath();
bool isEncryptionUsed(); void setPassword(const std::string &value);
bool isOpen() const; void clearPassword();
size_t size(); bool isEncryptionUsed();
private: bool isOpen() const;
std::string m_path; size_t size();
char m_password[32]; private:
std::unique_ptr<NodeEntry> m_rootEntry; std::string m_path;
std::string m_extendedHeader; char m_password[32];
std::string m_encryptedExtendedHeader; std::unique_ptr<NodeEntry> m_rootEntry;
std::fstream m_file; std::string m_extendedHeader;
IoUtilities::BinaryReader m_freader; std::string m_encryptedExtendedHeader;
IoUtilities::BinaryWriter m_fwriter; std::fstream m_file;
}; IoUtilities::BinaryReader m_freader;
IoUtilities::BinaryWriter m_fwriter;
} };
#endif // PASSWORDFILE_H }
#endif // PASSWORDFILE_H

View File

@ -3,7 +3,6 @@
#include "../io/entry.h" #include "../io/entry.h"
#include <c++utilities/tests/testutils.h> #include <c++utilities/tests/testutils.h>
#include <c++utilities/application/global.h>
#include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/HelperMacros.h>
#include <cppunit/TestFixture.h> #include <cppunit/TestFixture.h>

View File

@ -1,14 +1,14 @@
#ifndef OPENSSL_H #ifndef OPENSSL_H
#define OPENSSL_H #define OPENSSL_H
#include <c++utilities/application/global.h> #include "../global.h"
namespace Util { namespace Util {
namespace OpenSsl { namespace OpenSsl {
void LIB_EXPORT init(); void PASSWORD_FILE_EXPORT init();
void LIB_EXPORT clean(); void PASSWORD_FILE_EXPORT clean();
} }

View File

@ -1,12 +1,13 @@
#ifndef OPENSSLRANDOMDEVICE_H #ifndef OPENSSLRANDOMDEVICE_H
#define OPENSSLRANDOMDEVICE_H #define OPENSSLRANDOMDEVICE_H
#include "../global.h"
#include <c++utilities/conversion/types.h> #include <c++utilities/conversion/types.h>
#include <c++utilities/application/global.h>
namespace Util { namespace Util {
class LIB_EXPORT OpenSslRandomDevice class PASSWORD_FILE_EXPORT OpenSslRandomDevice
{ {
public: public:
OpenSslRandomDevice(); OpenSslRandomDevice();