fixed bug in shabea

[avr-crypto-lib.git] / main-serpent-test.c

diff --git a/main-serpent-test.c b/main-serpent-test.c
index af3b6305e1df55112cf24d52545084038df824d3..5c450b64df58282e38797b46216f5d4a8a279fdc 100644 (file)
--- a/main-serpent-test.c
+++ b/main-serpent-test.c
@@ -41,7 +41,7 @@ char* cipher_name = "Serpent";
  *  additional validation-functions                                                                                     *
  *****************************************************************************/
 void serpent_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
-       serpent_genctx(key, keysize&0xff, ctx);
+       serpent_init(key, keysize&0xff, ctx);
 }
 
 void testrun_nessie_serpent(void){
@@ -64,27 +64,19 @@ void testrun_nessie_serpent(void){
 
 
 void testrun_performance_serpent(void){
-       uint16_t i,c;
        uint64_t t;
        char str[16];
        uint8_t key[32], data[16];
        serpent_ctx_t ctx;
        
        calibrateTimer();
-       getOverhead(&c, &i);
-       uart_putstr_P(PSTR("\r\n\r\n=== benchmark ==="));
-       utoa(c, str, 10);
-       uart_putstr_P(PSTR("\r\n\tconst overhead:     "));
-       uart_putstr(str);
-       utoa(i, str, 10);
-       uart_putstr_P(PSTR("\r\n\tinterrupt overhead: "));
-       uart_putstr(str);
+       print_overhead();
        
        memset(key,  0, 32);
        memset(data, 0, 16);
        
        startTimer(1);
-       serpent_genctx(key, 0, &ctx);
+       serpent_init(key, 0, &ctx);
        t = stopTimer();
        uart_putstr_P(PSTR("\r\n\tctx-gen time: "));
        ultoa((unsigned long)t, str, 10);