diff options
Diffstat (limited to 'modules')
-rw-r--r-- | modules/alg_ia32/aes.cpp | 165 | ||||
-rw-r--r-- | modules/alg_ia32/aes_core.S | 25 | ||||
-rw-r--r-- | modules/alg_ia32/modinfo.txt | 2 |
3 files changed, 0 insertions, 192 deletions
diff --git a/modules/alg_ia32/aes.cpp b/modules/alg_ia32/aes.cpp deleted file mode 100644 index 7f8037fca..000000000 --- a/modules/alg_ia32/aes.cpp +++ /dev/null @@ -1,165 +0,0 @@ -/************************************************* -* AES Source File * -* (C) 1999-2006 The Botan Project * -*************************************************/ - -#include <botan/aes.h> -#include <botan/bit_ops.h> - -namespace Botan { - -extern "C" void aes_encrypt(const byte[16], byte[16], u32bit, - const u32bit[52], const byte[32], - const u32bit[1024], const byte[256]); - -/************************************************* -* AES Encryption * -*************************************************/ -void AES::enc(const byte in[], byte out[]) const - { - aes_encrypt(in, out, ROUNDS, EK, ME, TE, SE); - } - -/************************************************* -* AES Decryption * -*************************************************/ -void AES::dec(const byte in[], byte out[]) const - { - const u32bit* TD0 = TD; - const u32bit* TD1 = TD + 256; - const u32bit* TD2 = TD + 512; - const u32bit* TD3 = TD + 768; - - u32bit T0, T1, T2, T3, B0, B1, B2, B3; - B0 = TD0[in[ 0] ^ MD[ 0]] ^ TD1[in[13] ^ MD[13]] ^ - TD2[in[10] ^ MD[10]] ^ TD3[in[ 7] ^ MD[ 7]] ^ DK[0]; - B1 = TD0[in[ 4] ^ MD[ 4]] ^ TD1[in[ 1] ^ MD[ 1]] ^ - TD2[in[14] ^ MD[14]] ^ TD3[in[11] ^ MD[11]] ^ DK[1]; - B2 = TD0[in[ 8] ^ MD[ 8]] ^ TD1[in[ 5] ^ MD[ 5]] ^ - TD2[in[ 2] ^ MD[ 2]] ^ TD3[in[15] ^ MD[15]] ^ DK[2]; - B3 = TD0[in[12] ^ MD[12]] ^ TD1[in[ 9] ^ MD[ 9]] ^ - TD2[in[ 6] ^ MD[ 6]] ^ TD3[in[ 3] ^ MD[ 3]] ^ DK[3]; - for(u32bit j = 1; j != ROUNDS - 1; j += 2) - { - T0 = TD0[get_byte(0, B0)] ^ TD1[get_byte(1, B3)] ^ - TD2[get_byte(2, B2)] ^ TD3[get_byte(3, B1)] ^ DK[4*j+0]; - T1 = TD0[get_byte(0, B1)] ^ TD1[get_byte(1, B0)] ^ - TD2[get_byte(2, B3)] ^ TD3[get_byte(3, B2)] ^ DK[4*j+1]; - T2 = TD0[get_byte(0, B2)] ^ TD1[get_byte(1, B1)] ^ - TD2[get_byte(2, B0)] ^ TD3[get_byte(3, B3)] ^ DK[4*j+2]; - T3 = TD0[get_byte(0, B3)] ^ TD1[get_byte(1, B2)] ^ - TD2[get_byte(2, B1)] ^ TD3[get_byte(3, B0)] ^ DK[4*j+3]; - B0 = TD0[get_byte(0, T0)] ^ TD1[get_byte(1, T3)] ^ - TD2[get_byte(2, T2)] ^ TD3[get_byte(3, T1)] ^ DK[4*j+4]; - B1 = TD0[get_byte(0, T1)] ^ TD1[get_byte(1, T0)] ^ - TD2[get_byte(2, T3)] ^ TD3[get_byte(3, T2)] ^ DK[4*j+5]; - B2 = TD0[get_byte(0, T2)] ^ TD1[get_byte(1, T1)] ^ - TD2[get_byte(2, T0)] ^ TD3[get_byte(3, T3)] ^ DK[4*j+6]; - B3 = TD0[get_byte(0, T3)] ^ TD1[get_byte(1, T2)] ^ - TD2[get_byte(2, T1)] ^ TD3[get_byte(3, T0)] ^ DK[4*j+7]; - } - out[ 0] = SD[get_byte(0, B0)] ^ MD[16]; - out[ 1] = SD[get_byte(1, B3)] ^ MD[17]; - out[ 2] = SD[get_byte(2, B2)] ^ MD[18]; - out[ 3] = SD[get_byte(3, B1)] ^ MD[19]; - out[ 4] = SD[get_byte(0, B1)] ^ MD[20]; - out[ 5] = SD[get_byte(1, B0)] ^ MD[21]; - out[ 6] = SD[get_byte(2, B3)] ^ MD[22]; - out[ 7] = SD[get_byte(3, B2)] ^ MD[23]; - out[ 8] = SD[get_byte(0, B2)] ^ MD[24]; - out[ 9] = SD[get_byte(1, B1)] ^ MD[25]; - out[10] = SD[get_byte(2, B0)] ^ MD[26]; - out[11] = SD[get_byte(3, B3)] ^ MD[27]; - out[12] = SD[get_byte(0, B3)] ^ MD[28]; - out[13] = SD[get_byte(1, B2)] ^ MD[29]; - out[14] = SD[get_byte(2, B1)] ^ MD[30]; - out[15] = SD[get_byte(3, B0)] ^ MD[31]; - } - -/************************************************* -* AES Key Schedule * -*************************************************/ -void AES::key(const byte key[], u32bit length) - { - static const u32bit RC[10] = { - 0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000, - 0x40000000, 0x80000000, 0x1B000000, 0x36000000 }; - ROUNDS = (length / 4) + 6; - - SecureBuffer<u32bit, 64> XEK, XDK; - - const u32bit X = length / 4; - for(u32bit j = 0; j != X; ++j) - XEK[j] = make_u32bit(key[4*j], key[4*j+1], key[4*j+2], key[4*j+3]); - for(u32bit j = X; j < 4*(ROUNDS+1); j += X) - { - XEK[j] = XEK[j-X] ^ S(rotate_left(XEK[j-1], 8)) ^ RC[(j-X)/X]; - for(u32bit k = 1; k != X; ++k) - { - if(X == 8 && k == 4) - XEK[j+k] = XEK[j+k-X] ^ S(XEK[j+k-1]); - else - XEK[j+k] = XEK[j+k-X] ^ XEK[j+k-1]; - } - } - - for(u32bit j = 0; j != 4*(ROUNDS+1); j += 4) - { - XDK[j ] = XEK[4*ROUNDS-j ]; - XDK[j+1] = XEK[4*ROUNDS-j+1]; - XDK[j+2] = XEK[4*ROUNDS-j+2]; - XDK[j+3] = XEK[4*ROUNDS-j+3]; - } - - const u32bit* TD0 = TD; - const u32bit* TD1 = TD + 256; - const u32bit* TD2 = TD + 512; - const u32bit* TD3 = TD + 768; - for(u32bit j = 4; j != length + 24; ++j) - XDK[j] = TD0[SE[get_byte(0, XDK[j])]] ^ TD1[SE[get_byte(1, XDK[j])]] ^ - TD2[SE[get_byte(2, XDK[j])]] ^ TD3[SE[get_byte(3, XDK[j])]]; - - for(u32bit j = 0; j != 4; ++j) - for(u32bit k = 0; k != 4; ++k) - { - ME[4*j+k ] = get_byte(k, XEK[j]); - ME[4*j+k+16] = get_byte(k, XEK[j+4*ROUNDS]); - MD[4*j+k ] = get_byte(k, XDK[j]); - MD[4*j+k+16] = get_byte(k, XEK[j]); - } - - EK.copy(XEK + 4, length + 20); - DK.copy(XDK + 4, length + 20); - } - -/************************************************* -* AES Byte Substitution * -*************************************************/ -u32bit AES::S(u32bit input) - { - return make_u32bit(SE[get_byte(0, input)], SE[get_byte(1, input)], - SE[get_byte(2, input)], SE[get_byte(3, input)]); - } - -/************************************************* -* AES Constructor * -*************************************************/ -AES::AES(u32bit key_size) : BlockCipher(16, key_size) - { - if(key_size != 16 && key_size != 24 && key_size != 32) - throw Invalid_Key_Length(name(), key_size); - ROUNDS = (key_size / 4) + 6; - } - -/************************************************* -* Clear memory of sensitive data * -*************************************************/ -void AES::clear() throw() - { - EK.clear(); - DK.clear(); - ME.clear(); - MD.clear(); - } - -} diff --git a/modules/alg_ia32/aes_core.S b/modules/alg_ia32/aes_core.S deleted file mode 100644 index 2efc8145d..000000000 --- a/modules/alg_ia32/aes_core.S +++ /dev/null @@ -1,25 +0,0 @@ -/************************************************* -* AES Source File * -* (C) 1999-2006 The Botan Project * -*************************************************/ - -#include <botan/asm_macr.h> - -START_LISTING(aes_core.S) - -FUNCTION(aes_encrypt) - PUSH(EBP) - PUSH(EDI) - PUSH(ESI) - PUSH(EBX) - -#define PUSHED 4 - - - - - POP(EBX) - POP(ESI) - POP(EDI) - POP(EBP) - ret diff --git a/modules/alg_ia32/modinfo.txt b/modules/alg_ia32/modinfo.txt index db5f1cf62..b36d3c618 100644 --- a/modules/alg_ia32/modinfo.txt +++ b/modules/alg_ia32/modinfo.txt @@ -1,11 +1,9 @@ realname "Algorithm x86 Assembler" replace_file sha160.cpp -replace_file aes.cpp add_file asm_macr.h add_file sha1core.S -add_file aes_core.S <arch> ia32 |