X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=main-cast5-test.c;h=6f3b18a71228afd9061c4d1f75e72448226f21cf;hb=d4b9cfc34ce9f08df95df2933627e4e04337d36d;hp=9b3795a39d2608769a9603a1b8431b8524bfcc3a;hpb=bfac0f0eef1c956bf6fbc023708f17ecfda9b39d;p=avr-crypto-lib.git

diff --git a/main-cast5-test.c b/main-cast5-test.c
index 9b3795a..6f3b18a 100644
--- a/main-cast5-test.c
+++ b/main-cast5-test.c
@@ -9,14 +9,45 @@
 #include "debug.h"
 
 #include "cast5.h"
+#include "nessie_bc_test.h"
 
 #include <stdint.h>
 #include <string.h>
 
+char* cipher_name = "cast-128 (cast5)";
 
 /*****************************************************************************
  *  additional validation-functions											 *
  *****************************************************************************/
+/*
+	void cast5_init(cast5_ctx_t* s, uint8_t* key, uint8_t keylength);
+	void cast5_enc(cast5_ctx_t *s, void* block);
+	void cast5_dec(cast5_ctx_t *s, void* block);
+*/ 
+
+void cast5_init_dummy(uint8_t* key, uint8_t keylength_b, cast5_ctx_t* ctx){
+	cast5_init(ctx, key, keylength_b);
+}
+
+void cast5_enc_dummy(void* buffer, cast5_ctx_t* ctx){
+	cast5_enc(ctx, buffer);
+}
+
+void cast5_dec_dummy(void* buffer, cast5_ctx_t* ctx){
+	cast5_dec(ctx, buffer);
+}
+
+void test_nessie_cast5(void){
+	nessie_bc_ctx.blocksize_B =   8;
+	nessie_bc_ctx.keysize_b   = 128;
+	nessie_bc_ctx.name        = cipher_name;
+	nessie_bc_ctx.ctx_size_B  = sizeof(cast5_ctx_t);
+	nessie_bc_ctx.cipher_enc  = (nessie_bc_enc_fpt)cast5_enc_dummy;
+	nessie_bc_ctx.cipher_dec  = (nessie_bc_dec_fpt)cast5_dec_dummy;
+	nessie_bc_ctx.cipher_genctx  = (nessie_bc_gen_fpt)cast5_init_dummy;
+	
+	nessie_bc_run();
+}
 
 /*****************************************************************************
  *  self tests																 *
@@ -135,8 +166,9 @@ 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_cast5();
+		if (strcmp(str, "nessie")) {DEBUG_S("DBG: 1b\r\n"); goto error;}
+		//	testrun_cast5();
+			test_nessie_cast5();
 		goto restart;		
 		continue;
 	error: