improving present

[arm-crypto-lib.git] / test_src / main-aes-test.c

diff --git a/test_src/main-aes-test.c b/test_src/main-aes-test.c
index 83ec490bce3644d3812bdb347bd0a6a9c58a9602..107d30e5ee68b64c664af42c6b07331c85e818a7 100644 (file)
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -30,23 +30,23 @@
 #include "sysclock.h"
 #include "hw_gptm.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 
 #include "nessie_bc_test.h"
 #include "performance_test.h"
 
-#include "bcal/bcal_aes128.h"
-#include "bcal/bcal_aes192.h"
-#include "bcal/bcal_aes256.h"
-#include "bcal/bcal-cbc.h"
-#include "bcal/bcal-cfb_byte.h"
-#include "bcal/bcal-cfb_bit.h"
-#include "bcal/bcal-ofb.h"
-#include "bcal/bcal-ctr.h"
-#include "bcal/bcal-cmac.h"
-#include "bcal/bcal-eax.h"
+#include "bcal_aes128.h"
+#include "bcal_aes192.h"
+#include "bcal_aes256.h"
+#include "bcal-cbc.h"
+#include "bcal-cfb_byte.h"
+#include "bcal-cfb_bit.h"
+#include "bcal-ofb.h"
+#include "bcal-ctr.h"
+#include "bcal-cmac.h"
+#include "bcal-eax.h"
 #include "cmacvs.h"
-#include "bcal/bcal-performance.h"
+#include "bcal-performance.h"
 
 
 char* algo_name = "AES";
@@ -196,6 +196,18 @@ void testrun_testkey_aes256(void){
        }
 }
 
+void crypto_test(void){
+       uint8_t test_data[16], test_key[32];
+       aes256_ctx_t ctx;
+       memset(test_key, 0xA5, 32);
+       memset(test_data, 0, 16);
+       aes256_init(test_key, &ctx);
+       aes256_enc(test_data, &ctx);
+       cli_putstr("\r\ncrypto test data:\r\n");
+       cli_hexdump_block(test_data, 16, 4, 8);
+}
+
+
 void testrun_testkey_aes(void){
        testrun_testkey_aes128();
        testrun_testkey_aes192();
@@ -698,6 +710,7 @@ const cmdlist_entry_t cmdlist[] = {
        { "testcmac72",      NULL, testrun_aes128_cmac72           },
        { "testcmac0",       NULL, testrun_aes192_cmac0            },
        { "testeax",         NULL, testrun_aes128_eax              },
+       { "quick-test",      NULL, crypto_test                     },
        { "cmacvs_list",     NULL, cmacvs_listalgos                },
        { "cmacvs_set",  (void*)1, (void_fpt)cmacvs_setalgo        },
        { "cmacvs_test1",    NULL, cmacvs_test1                    },