X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=test_src%2Fnessie_stream_test.c;h=16001ae19a9735e916aacff620b07ec87d929d1e;hp=751669b6a4ac5451865b495e969c03f94171de4a;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=52ec168ece9d61bd9cb652235dfe8faee6232a11

diff --git a/test_src/nessie_stream_test.c b/test_src/nessie_stream_test.c
index 751669b..16001ae 100644
--- a/test_src/nessie_stream_test.c
+++ b/test_src/nessie_stream_test.c
@@ -1,7 +1,7 @@
 /* nessie_stream_test.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2008  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 /**
  * 
  * author: Daniel Otte
- * email:  daniel.otte@rub.de
+ * email:  bg@nerilex.org
  * license: GPLv3
  * 
  * a suit for running the nessie-tests for streamciphers
@@ -29,24 +29,16 @@
 #include <string.h>
 #include "nessie_stream_test.h"
 #include "nessie_common.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);
@@ -54,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];
@@ -98,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];