+serpent bitslice; modifyed cast5 testings

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

diff --git a/main-serpent-test.c b/main-serpent-test.c
index 2f0f22250313ee121d3d2106a586f42f801a4ed7..7f3d9ac2d89d0aad2cc25bd9570fc2b467434d4d 100644 (file)
--- a/main-serpent-test.c
+++ b/main-serpent-test.c
@@ -24,22 +24,21 @@ void serpent_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 }
 
 void testrun_nessie_serpent(void){
-       nessie_ctx.blocksize_B =  16;
-       nessie_ctx.keysize     = 128;
-       nessie_ctx.name        = cipher_name;
-       nessie_ctx.ctx_size_B  = sizeof(serpent_ctx_t);
-       nessie_ctx.cipher_enc  = (nessie_enc_fpt)serpent_enc;
-       nessie_ctx.cipher_dec  = (nessie_dec_fpt)serpent_dec;
-       nessie_ctx.cipher_genctx  = (nessie_gen_fpt)serpent_genctx_dummy;
+       nessie_bc_ctx.blocksize_B =  16;
+       nessie_bc_ctx.keysize_b   = 128;
+       nessie_bc_ctx.name        = cipher_name;
+       nessie_bc_ctx.ctx_size_B  = sizeof(serpent_ctx_t);
+       nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)serpent_enc;
+       nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)serpent_dec;
+       nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)serpent_genctx_dummy;
        
-       nessie_run();
+       nessie_bc_run();
        
-       nessie_ctx.keysize     = 192;
-       nessie_run();
-       
-       nessie_ctx.keysize     = 256;
-       nessie_run();
+       nessie_bc_ctx.keysize_b   = 192;
+       nessie_bc_run();
        
+       nessie_bc_ctx.keysize_b   = 256;
+       nessie_bc_run();
 }