X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;ds=sidebyside;f=main-serpent-test.c;h=7f3d9ac2d89d0aad2cc25bd9570fc2b467434d4d;hb=158bb85c89631984291c93a9217ca84345349a46;hp=ed8cf7080e58080cce5b4d4fc5ce9167671bfa53;hpb=bfac0f0eef1c956bf6fbc023708f17ecfda9b39d;p=avr-crypto-lib.git

diff --git a/main-serpent-test.c b/main-serpent-test.c
index ed8cf70..7f3d9ac 100644
--- a/main-serpent-test.c
+++ b/main-serpent-test.c
@@ -23,23 +23,22 @@ void serpent_genctx_dummy(uint8_t* key, uint16_t keysize, void* ctx){
 	serpent_genctx(key, keysize&0xff, ctx);
 }
 
-void testrun_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;
+void testrun_nessie_serpent(void){
+	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();
 }
 
 
@@ -60,14 +59,13 @@ int main (void){
 restart:
 	while(1){ 
 		if (!getnextwordn(str,20))  {DEBUG_S("DBG: W1\r\n"); goto error;}
-		if (strcmp(str, "test")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
-			testrun_serpent();
+		if (strcmp(str, "nessie")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
+			testrun_nessie_serpent();
 		goto restart;		
 		continue;
 	error:
 		uart_putstr("ERROR\r\n");
 	}
 	
-	
 }