X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=khazad%2Fkhazad.c;h=c4fadb37b50c73bfbf1f0d138507a3ce6d4af318;hp=045de137229f5e02b1c6ed7d0be938d762c9da56;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56

diff --git a/khazad/khazad.c b/khazad/khazad.c
index 045de13..c4fadb3 100644
--- a/khazad/khazad.c
+++ b/khazad/khazad.c
@@ -1,7 +1,7 @@
 /* khazad.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2006-2011 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
@@ -92,7 +92,7 @@ uint8_t khazad_sbox(uint8_t a){
 	return b|c;
 }
 
-static void gamma(uint8_t* a){
+static void gamma_1(uint8_t *a){
 	uint8_t i;
 	for(i=0; i<8; ++i){
 		*a = khazad_sbox(*a);
@@ -126,7 +126,7 @@ static const uint8_t h[8][4] PROGMEM = {
 	{ 0x7B, 0x86, 0x54, 0x31 }
 };
 
-static void theta(uint8_t* a){
+static void theta(uint8_t *a){
 	uint8_t i,j,x,accu;
 	uint8_t c[8];
 	uint8_t *hp;
@@ -146,15 +146,15 @@ static void theta(uint8_t* a){
 
 /******************************************************************************/
 
-static void khazad_round(uint8_t* a, const uint8_t* k){
-	gamma(a);
+static void khazad_round(uint8_t *a, const uint8_t *k){
+	gamma_1(a);
 	theta(a);
 	memxor(a, k, 8);
 }
 
 /******************************************************************************/
 
-void khazad_init(const void* key, khazad_ctx_t* ctx){
+void khazad_init(const void *key, khazad_ctx_t *ctx){
 	uint8_t c[8];
 	uint8_t i,r=0;
 	for(i=0; i<8; ++i){
@@ -182,26 +182,26 @@ void khazad_init(const void* key, khazad_ctx_t* ctx){
 
 /******************************************************************************/
 
-void khazad_enc(void* buffer, const khazad_ctx_t* ctx){
+void khazad_enc(void *buffer, const khazad_ctx_t *ctx){
 	uint8_t r;
 	memxor(buffer, ctx->k[0], 8);
 	for(r=1; r<8; ++r){
 		khazad_round(buffer, ctx->k[r]);
 	}
-	gamma(buffer);
+	gamma_1(buffer);
 	memxor(buffer, ctx->k[8], 8);
 }
 
 /******************************************************************************/
 
-void khazad_dec(void* buffer, const khazad_ctx_t* ctx){
+void khazad_dec(void *buffer, const khazad_ctx_t *ctx){
 	uint8_t r=7;
 	memxor(buffer, ctx->k[8], 8);
-	gamma(buffer);
+	gamma_1(buffer);
 	do{
 		memxor(buffer, ctx->k[r--], 8);
 		theta(buffer);
-		gamma(buffer);
+		gamma_1(buffer);
 	}while(r);
 	memxor(buffer, ctx->k[0], 8);
 }