From 56d2717953a18ea1c2e602de0a73c83f63cd8d3c Mon Sep 17 00:00:00 2001 From: yutaka Date: Tue, 22 May 2007 04:25:24 +0000 Subject: [PATCH] undef AES_DOES_NOT_SUPPORT_MULTIPLE_KEYS and add comment to test git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/twl_wrapsdk/trunk@75 4ee2a332-4b2b-5046-8439-1ba90f034370 --- build/libraries/aes/ARM7/aes_instruction.c | 5 ----- build/tests/aes/aes-1/ARM7/src/main.c | 2 +- build/tests/aes/aes-1/ARM9/src/main.c | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build/libraries/aes/ARM7/aes_instruction.c b/build/libraries/aes/ARM7/aes_instruction.c index ccb11a2..5cb1520 100644 --- a/build/libraries/aes/ARM7/aes_instruction.c +++ b/build/libraries/aes/ARM7/aes_instruction.c @@ -17,11 +17,6 @@ #include #include -// for OLD AES registers -#ifndef AES_DOES_NOT_SUPPORT_MULTIPLE_KEYS -#define AES_DOES_NOT_SUPPORT_MULTIPLE_KEYS -#endif - #ifdef AES_DOES_NOT_SUPPORT_MULTIPLE_KEYS #define REG_AES_KEY_OFFSET 0x4410 #define REG_AES_KEY_ADDR (HW_REG_BASE + REG_AES_KEY_OFFSET) diff --git a/build/tests/aes/aes-1/ARM7/src/main.c b/build/tests/aes/aes-1/ARM7/src/main.c index 64aeda3..fa25ffd 100644 --- a/build/tests/aes/aes-1/ARM7/src/main.c +++ b/build/tests/aes/aes-1/ARM7/src/main.c @@ -196,7 +196,7 @@ static void test2(void) // 出力結果の表示 dump(__func__, dataB, sizeof(gs_data)); - OS_TPrintf("Result: %s\n", AES_IsValid() ? "Success" : "Failed"); + OS_TPrintf("Result: %s\n", AES_IsValid() ? "Success" : "Failed (OK!)"); } static u32 intrCounter[3]; diff --git a/build/tests/aes/aes-1/ARM9/src/main.c b/build/tests/aes/aes-1/ARM9/src/main.c index 9f47054..9edc8df 100644 --- a/build/tests/aes/aes-1/ARM9/src/main.c +++ b/build/tests/aes/aes-1/ARM9/src/main.c @@ -283,7 +283,7 @@ static void test2(void) } else { - OS_TPrintf("Result: %s\n", AES_RESULT_SUCCESS_TRUE == result ? "Success" : "Failed"); + OS_TPrintf("Result: %s\n", AES_RESULT_SUCCESS_TRUE == result ? "Success" : "Failed (OK!)"); } }