final :)
This commit is contained in:
parent
1fabd6f02a
commit
3f2c3a6ab6
|
|
@ -208,184 +208,3 @@ void aes128_4(uint8_t *in, uint8_t *out, uint32_t * expKey) {
|
|||
out[15] = wbyte(state[3], 3);
|
||||
|
||||
}
|
||||
|
||||
//****************************
|
||||
// MAIN function: AES testing
|
||||
//****************************
|
||||
// int main(int argc, char* argv[])
|
||||
// {
|
||||
// int test_failed = 0;
|
||||
// // test subBytes
|
||||
// printf("Testing subBytes\n");
|
||||
// {
|
||||
// t_state state = { 0x01234567,
|
||||
// 0x89abcdef,
|
||||
// 0xdeadbeef,
|
||||
// 0x00112233 };
|
||||
|
||||
// t_state res_state = { 0x7c266e85,
|
||||
// 0xa762bddf,
|
||||
// 0x1d95aedf,
|
||||
// 0x638293c3 };
|
||||
// subBytes(state);
|
||||
// // printf("0x%08x, 0x%08x, 0x%08x, 0x%08x\n", state[0], state[1], state[2], state[3]);
|
||||
// for (int i = 0; i < 4; i++) {
|
||||
// if (state[i] != res_state[i]) { printf("Mismatch at state[%d]!\n", i); test_failed = 1; }
|
||||
// }
|
||||
// }
|
||||
// // test shiftRows
|
||||
// printf("Testing shiftRows\n");
|
||||
|
||||
// {
|
||||
// t_state state = { 0x01234567,
|
||||
// 0x89abcdef,
|
||||
// 0xdeadbeef,
|
||||
// 0x00112233 };
|
||||
|
||||
// t_state res_state = { 0x00adcd67,
|
||||
// 0x0111beef,
|
||||
// 0x892322ef,
|
||||
// 0xdeab4533 };
|
||||
// shiftRows(state);
|
||||
// // printf("0x%08x, 0x%08x, 0x%08x, 0x%08x\n", state[0], state[1], state[2], state[3]);
|
||||
// for (int i = 0; i < 4; i++) {
|
||||
// if (state[i] != res_state[i]) { printf("Mismatch at state[%d]! 0x%08x 0x%08x\n", i, res_state[i], state[i]); test_failed = 1; }
|
||||
// }
|
||||
// }
|
||||
// // test xtime
|
||||
// printf("Testing xtime\n");
|
||||
// {
|
||||
// uint8_t res[256] = { 0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x12,
|
||||
// 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e, 0x20, 0x22, 0x24, 0x26,
|
||||
// 0x28, 0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a,
|
||||
// 0x3c, 0x3e, 0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e,
|
||||
// 0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x62,
|
||||
// 0x64, 0x66, 0x68, 0x6a, 0x6c, 0x6e, 0x70, 0x72, 0x74, 0x76,
|
||||
// 0x78, 0x7a, 0x7c, 0x7e, 0x80, 0x82, 0x84, 0x86, 0x88, 0x8a,
|
||||
// 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 0x9c, 0x9e,
|
||||
// 0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae, 0xb0, 0xb2,
|
||||
// 0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe, 0xc0, 0xc2, 0xc4, 0xc6,
|
||||
// 0xc8, 0xca, 0xcc, 0xce, 0xd0, 0xd2, 0xd4, 0xd6, 0xd8, 0xda,
|
||||
// 0xdc, 0xde, 0xe0, 0xe2, 0xe4, 0xe6, 0xe8, 0xea, 0xec, 0xee,
|
||||
// 0xf0, 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0xfe, 0x1b, 0x19,
|
||||
// 0x1f, 0x1d, 0x13, 0x11, 0x17, 0x15, 0x0b, 0x09, 0x0f, 0x0d,
|
||||
// 0x03, 0x01, 0x07, 0x05, 0x3b, 0x39, 0x3f, 0x3d, 0x33, 0x31,
|
||||
// 0x37, 0x35, 0x2b, 0x29, 0x2f, 0x2d, 0x23, 0x21, 0x27, 0x25,
|
||||
// 0x5b, 0x59, 0x5f, 0x5d, 0x53, 0x51, 0x57, 0x55, 0x4b, 0x49,
|
||||
// 0x4f, 0x4d, 0x43, 0x41, 0x47, 0x45, 0x7b, 0x79, 0x7f, 0x7d,
|
||||
// 0x73, 0x71, 0x77, 0x75, 0x6b, 0x69, 0x6f, 0x6d, 0x63, 0x61,
|
||||
// 0x67, 0x65, 0x9b, 0x99, 0x9f, 0x9d, 0x93, 0x91, 0x97, 0x95,
|
||||
// 0x8b, 0x89, 0x8f, 0x8d, 0x83, 0x81, 0x87, 0x85, 0xbb, 0xb9,
|
||||
// 0xbf, 0xbd, 0xb3, 0xb1, 0xb7, 0xb5, 0xab, 0xa9, 0xaf, 0xad,
|
||||
// 0xa3, 0xa1, 0xa7, 0xa5, 0xdb, 0xd9, 0xdf, 0xdd, 0xd3, 0xd1,
|
||||
// 0xd7, 0xd5, 0xcb, 0xc9, 0xcf, 0xcd, 0xc3, 0xc1, 0xc7, 0xc5,
|
||||
// 0xfb, 0xf9, 0xff, 0xfd, 0xf3, 0xf1, 0xf7, 0xf5, 0xeb, 0xe9,
|
||||
// 0xef, 0xed, 0xe3, 0xe1, 0xe7, 0xe5 };
|
||||
// for (uint16_t i = 0; i < 256; i++) {
|
||||
// //printf("0x%02hhx, ", xtime((uint8_t)i));
|
||||
// if (xtime((uint8_t)i)!=res[i]) {
|
||||
// printf("\nMismatch at xtime(0x%02x)! Comparison interrupted.\n", i); test_failed = 1;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// // puts("");
|
||||
// }
|
||||
// // test mixColumns
|
||||
// printf("Testing mixColumns\n");
|
||||
// {
|
||||
// t_state state = { 0x01234567,
|
||||
// 0x89abcdef,
|
||||
// 0xdeadbeef,
|
||||
// 0x00112233 };
|
||||
|
||||
// t_state res_state = { 0xcd678923,
|
||||
// 0x45ef01ab,
|
||||
// 0x9e69ba6f,
|
||||
// 0x66334411 };
|
||||
// mixColumns(state);
|
||||
// // printf("0x%08x, 0x%08x, 0x%08x, 0x%08x\n", state[0], state[1], state[2], state[3]);
|
||||
// // printf("0x%08x, 0x%08x, 0x%08x, 0x%08x\n", res_state[0], res_state[1], res_state[2], res_state[3]);
|
||||
// for (int i = 0; i < 4; i++) {
|
||||
// if (state[i] != res_state[i]) { printf("Mismatch at state[%d]! 0x%08x\n", i, state[i]); test_failed = 1; }
|
||||
// }
|
||||
// }
|
||||
|
||||
// // test key expansion
|
||||
// printf("Testing expandKey\n");
|
||||
// {
|
||||
// uint8_t key_b[16] = { 0xef, 0xbe, 0xad, 0xde, 0xbe, 0xba, 0xfe, 0xca, 0x0D, 0xF0, 0xAD, 0xBA, 0x00, 0x11, 0x22, 0x33 };
|
||||
// uint32_t key_w[44] = { 0 /*, ...*/ };
|
||||
// uint32_t res_key_w[44] = {
|
||||
// 0xdeadbeef, 0xcafebabe, 0xbaadf00d, 0x33221100,
|
||||
// 0xbd6e2d6c, 0x779097d2, 0xcd3d67df, 0xfe1f76df,
|
||||
// 0x23d5ed56, 0x54457a84, 0x99781d5b, 0x67676b84,
|
||||
// 0x7c50682d, 0x281512a9, 0xb16d0ff2, 0xd60a6476,
|
||||
// 0x44a60f66, 0x6cb31dcf, 0xddde123d, 0x0bd4764b,
|
||||
// 0xf78d474e, 0x9b3e5a81, 0x46e048bc, 0x4d343ef7,
|
||||
// 0x9f6e5fdc, 0x0450055d, 0x42b04de1, 0x0f847316,
|
||||
// 0xd8180013, 0xdc48054e, 0x9ef848af, 0x917c3bb9,
|
||||
// 0x8e991071, 0x52d1153f, 0xcc295d90, 0x5d556629,
|
||||
// 0x2bd5ec59, 0x7904f966, 0xb52da4f6, 0xe878c2df,
|
||||
// 0xb54e504a, 0xcc4aa92c, 0x79670dda, 0x911fcf05,
|
||||
// };
|
||||
// expandKey(key_b, key_w);
|
||||
// for (int i = 0; i < 44; i++) {
|
||||
// // printf("0x%08x, ", key_w[i]);
|
||||
// // if (i % 4 == 3) printf("\n");
|
||||
// }
|
||||
|
||||
// for (int i = 0; i < 44; i++) {
|
||||
// if (key_w[i] != res_key_w[i]) {
|
||||
// printf("Mismatch at key_w[%d]! Comparison interrupted.\n", i); test_failed = 1;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// printf("Testing addRoundKey\n");
|
||||
// // test AddRoundKey (last round)
|
||||
// t_state state = { 0x01234567, 0x89abcdef, 0xdeadbeef, 0x00112233 };
|
||||
// t_state res_state = { 0xb46d152d, 0x45e164c3, 0xa7cab335, 0x910eed36 };
|
||||
// addRoundKey(state, key_w, 40);
|
||||
// printf("0x%08x, 0x%08x, 0x%08x, 0x%08x\n", state[0], state[1], state[2], state[3]);
|
||||
// for (int i = 0; i < 4; i++) {
|
||||
// if (state[i] != res_state[i]) { printf("Mismatch at state[%d]!\n", i); }
|
||||
// }
|
||||
|
||||
// }
|
||||
|
||||
// // test aes encryption
|
||||
// printf("Testing aes\n");
|
||||
// {
|
||||
// uint8_t key[16] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff };
|
||||
// uint8_t in[16] = { 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef, 0x01, 0x23, 0x45, 0x67, 0x89 };
|
||||
// uint8_t out[16] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
|
||||
// uint8_t res[16] = { 0xa3, 0x3a, 0xca, 0x68, 0x72, 0xa2, 0x27, 0x74, 0xbf, 0x99, 0xf3, 0x71, 0xaa, 0x99, 0xd2, 0x5a };
|
||||
|
||||
// // printf("Key: ");
|
||||
// // hexprint16(key);
|
||||
// // puts("");
|
||||
// // printf("In: ");
|
||||
// // hexprint16(in);
|
||||
// // puts("");
|
||||
|
||||
// uint32_t expKey[11 * 4];
|
||||
// expandKey(key, expKey);
|
||||
|
||||
// aes128(in, out, expKey);
|
||||
|
||||
// // printf("Out: ");
|
||||
// // hexprint16(out);
|
||||
// // puts("");
|
||||
|
||||
// for (int i = 0; i < 16; i++) {
|
||||
// if (out[i] != res[i]) { printf("Mismatch at out[%02d]! 0x%02x 0x%02x\n", i, out[i], res[i]); test_failed = 1; }
|
||||
// }
|
||||
// }
|
||||
// if (test_failed) {
|
||||
// printf("|*********** SOME TEST(S) FAILED ***********|\n");
|
||||
// printf("Please fix me!\n");
|
||||
// }
|
||||
// else {
|
||||
// printf("============== All tests OK! ===============\n");
|
||||
// }
|
||||
// return test_failed;
|
||||
// }
|
||||
|
|
|
|||
|
|
@ -36,10 +36,6 @@ const uint8_t SBOX[256] = {
|
|||
/* AES state type */
|
||||
typedef uint32_t t_state[4];
|
||||
|
||||
void print(t_state t) {
|
||||
std::cout << t[0] << ' ' << t[1] << ' ' << t[2] << ' ' << t[3] << '\n';
|
||||
}
|
||||
|
||||
#define word(a0, a1, a2, a3) ((uint32_t)(a0) | ((uint32_t)(a1) << 8) | ((uint32_t)(a2) << 16) | ((uint32_t)(a3) << 24))
|
||||
|
||||
uint8_t wbyte(uint32_t w, int pos) {
|
||||
|
|
|
|||
|
|
@ -37,10 +37,6 @@ constexpr std::array<uint8_t, 256> SBOX = {
|
|||
/* AES state type */
|
||||
typedef uint32_t t_state[4];
|
||||
|
||||
void print(t_state t) {
|
||||
std::cout << t[0] << ' ' << t[1] << ' ' << t[2] << ' ' << t[3] << '\n';
|
||||
}
|
||||
|
||||
#define word(a0, a1, a2, a3) ((uint32_t)(a0) | ((uint32_t)(a1) << 8) | ((uint32_t)(a2) << 16) | ((uint32_t)(a3) << 24))
|
||||
|
||||
uint8_t wbyte(uint32_t w, int pos) {
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@
|
|||
#include "aes_4.cpp"
|
||||
#include "aes_5a.cpp"
|
||||
#include "aes_5b.cpp"
|
||||
#include "aes_6.cpp"
|
||||
|
||||
// AES constants
|
||||
constexpr size_t blockSize = 16;
|
||||
|
|
@ -77,7 +78,6 @@ void test(void (*aes)(uint8_t *in, uint8_t *out, uint32_t *expKey), uint8_t *in,
|
|||
std::free(outBuf);
|
||||
}
|
||||
|
||||
|
||||
int main() {
|
||||
uint8_t key[keySize];
|
||||
uint8_t iv[blockSize];
|
||||
|
|
@ -120,6 +120,10 @@ int main() {
|
|||
test(aes128_5a::aes128_5, input, opensslOutput, expandedKey, iv, "With macro (5a)");
|
||||
test(aes128_5b::aes128_5, input, opensslOutput, expandedKey, iv, "With T-Box (5b)");
|
||||
|
||||
__m128i expandedKey_128[10];
|
||||
aes128_6::expandKey(key, expandedKey_128);
|
||||
test(aes128_6::aes128_6, input, opensslOutput, (uint32_t *)expandedKey_128, iv, "asm (6)");
|
||||
|
||||
std::free(input);
|
||||
std::free(opensslOutput);
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Reference in New Issue