X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=serpent.c;h=8056eb41d03e1b9623d026e30d2b48db8548e1a7;hp=8c33bbe59c19d63a7f1568f49632a47930094c8b;hb=2159c273c9d3361571a6ff1ab63d9bc76582fbab;hpb=4d76909e4282baf1420ee309e270384246b241b8

diff --git a/serpent.c b/serpent.c
index 8c33bbe..8056eb4 100644
--- a/serpent.c
+++ b/serpent.c
@@ -26,21 +26,12 @@
 #include <stdint.h>
 #include <string.h> /* memset() */
 #include <avr/pgmspace.h>
+#include "memxor.h"
 #include "serpent.h"
 #include "serpent-sboxes.h"
 
 /******************************************************************************/
 
-void memxor(void * dest, void * src, uint8_t size){
-	while(size--){
-		*((uint8_t*)dest) ^= *((uint8_t*)src);
-		dest = (uint8_t*)dest +1;
-		src  = (uint8_t*)src  +1;
-	}
-}
-
-/******************************************************************************/
-
 uint32_t rotl32(uint32_t a, uint8_t n){
 	return ((a<<n) | (a>>(32-n)));
 }
@@ -92,10 +83,10 @@ static uint32_t gen_w(uint32_t * b, uint8_t i){
 } 
 
 /* key must be 256bit (32 byte) large! */
-void serpent_init(void * key, uint8_t keysize, serpent_ctx_t * ctx){
+void serpent_init(const void* key, uint16_t keysize, serpent_ctx_t* ctx){
 	uint32_t buffer[8];
 	uint8_t i,j;
-	if(keysize){
+	if(keysize<256){
 		/* keysize is less than 256 bit, padding needed */
 		memset(buffer, 0, 32);
 		memcpy(buffer, key, (keysize+7)/8);
@@ -117,7 +108,7 @@ void serpent_init(void * key, uint8_t keysize, serpent_ctx_t * ctx){
 }
 
 
-void serpent_enc(void* buffer, serpent_ctx_t * ctx){
+void serpent_enc(void* buffer, const serpent_ctx_t* ctx){
 	uint8_t i;
 	for(i=0; i<31; ++i){
 		memxor((uint8_t*)buffer, ctx->k[i], 16);
@@ -130,7 +121,7 @@ void serpent_enc(void* buffer, serpent_ctx_t * ctx){
 	memxor((uint8_t*)buffer, ctx->k[i], 16);
 }
 
-void serpent_dec(void* buffer, serpent_ctx_t * ctx){
+void serpent_dec(void* buffer, const serpent_ctx_t* ctx){
 	int8_t i=32;
 	
 	memxor((uint8_t*)buffer, ctx->k[i], 16);