X-Git-Url: https://git.cryptolib.org/?a=blobdiff_plain;f=test_src%2Fnessie_stream_test.c;h=f9128a2949605d9966e6ea9293227335001afa80;hb=22985930c9c2c610ae18e2d8df0f3ea78a082134;hp=3866b218ed3b11508756d7b38231242be3dbd234;hpb=2159c273c9d3361571a6ff1ab63d9bc76582fbab;p=avr-crypto-lib.git

diff --git a/test_src/nessie_stream_test.c b/test_src/nessie_stream_test.c
index 3866b21..f9128a2 100644
--- a/test_src/nessie_stream_test.c
+++ b/test_src/nessie_stream_test.c
@@ -1,6 +1,6 @@
 /* nessie_stream_test.c */
 /*
-    This file is part of the Crypto-avr-lib/microcrypt-lib.
+    This file is part of the AVR-Crypto-Lib.
     Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
 
     This program is free software: you can redistribute it and/or modify
@@ -29,25 +29,16 @@
 #include <string.h>
 #include "nessie_stream_test.h"
 #include "nessie_common.h"
-#include "uart.h"
+#include "memxor.h"
 
 nessie_stream_ctx_t nessie_stream_ctx;
 
 
 #define BLOCKSIZE_B 64
 
-static
-void memxor(void* dest, void* src, uint8_t length){
-	while(length--){
-		*((uint8_t*)dest) ^= *((uint8_t*)src);
-		dest = (uint8_t*)dest +1;
-		src  = (uint8_t*)src +1;
-	}
-}
-
 
 static 
-void nessie_gen_block(void* ctx, uint8_t* block){
+void nessie_gen_block(void *ctx, uint8_t *block){
 	uint16_t i;
 	for(i=0; i<BLOCKSIZE_B; ++i){
 		block[i] = nessie_stream_ctx.cipher_enc(ctx);
@@ -55,7 +46,7 @@ void nessie_gen_block(void* ctx, uint8_t* block){
 }
 
 static
-void nessie_stream_enc(uint8_t* key){
+void nessie_stream_enc(uint8_t *key){
 	uint8_t ctx[nessie_stream_ctx.ctx_size_B];
 	uint8_t buffer[BLOCKSIZE_B];
 	uint8_t xorbuffer[BLOCKSIZE_B];
@@ -99,7 +90,7 @@ void nessie_stream_enc(uint8_t* key){
 
 
 static
-void nessie_stream_enc_large(uint8_t* key){
+void nessie_stream_enc_large(uint8_t *key){
 	uint8_t ctx[nessie_stream_ctx.ctx_size_B];
 	uint8_t buffer[BLOCKSIZE_B];
 	uint8_t xorbuffer[BLOCKSIZE_B];
@@ -118,6 +109,7 @@ void nessie_stream_enc_large(uint8_t* key){
 	for(i=0; i<((65472-0)/BLOCKSIZE_B-1); ++i){
 		nessie_gen_block(ctx, buffer);
 		memxor(xorbuffer, buffer, BLOCKSIZE_B);
+		NESSIE_SEND_ALIVE_A(i);
 	}
 	
 	nessie_gen_block(ctx, buffer);
@@ -131,6 +123,7 @@ void nessie_stream_enc_large(uint8_t* key){
 	for(i=0; i<((131008-65536)/BLOCKSIZE_B-1); ++i){
 		nessie_gen_block(ctx, buffer);
 		memxor(xorbuffer, buffer, BLOCKSIZE_B);
+		NESSIE_SEND_ALIVE_A(i);
 	}
 	
 	nessie_gen_block(ctx, buffer);