fixing E-Mail-Address & Copyright

[avr-crypto-lib.git] / grain / grain.c

diff --git a/grain/grain.c b/grain/grain.c
index 81117ed99524e7c000580fb0d5eef964a002abe8..fc86ebfc8d17bb73cdbe460abb9dff3ab2992f03 100644 (file)
--- a/grain/grain.c
+++ b/grain/grain.c
@@ -1,7 +1,7 @@
 /* grain.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 or later
  * 
  */
@@ -40,10 +40,10 @@
 #define _B(i) (((ctx->nfsr[9-((i)/8)])>>(7-((i)%8)))&1)
 
 
-uint8_t h_lut[4] PROGMEM = {0x4C, 0xB6, 0xD3, 0x26};
+const uint8_t h_lut[4] PROGMEM = {0x4C, 0xB6, 0xD3, 0x26};
 
 #ifdef GRAIN_BADOPTIMISATION
-uint8_t g_lut[128] PROGMEM = {
+const uint8_t g_lut[128] PROGMEM = {
         0xF0, 0xA5, 0x0F, 0x5A, 0x0F, 0x5A, 0xF0, 0xA5, 0x0F, 0x5A, 0xF0, 0xA5, 0xF0, 0x5A, 0x0F, 0x0F, 
         0xC3, 0x96, 0x3C, 0x69, 0x3C, 0x69, 0xC3, 0x96, 0x9C, 0xC9, 0x63, 0x36, 0x63, 0xC9, 0x9C, 0x9C, 
         0x0F, 0x5A, 0x0F, 0x5A, 0xF0, 0xA5, 0xF0, 0x5A, 0xF0, 0xA5, 0xF0, 0xA5, 0x0F, 0xA5, 0x0F, 0xF0, 
@@ -54,7 +54,7 @@ uint8_t g_lut[128] PROGMEM = {
         0xF3, 0x2E, 0xF3, 0x2E, 0x0C, 0xD1, 0x0C, 0x2E, 0xAC, 0x71, 0xAC, 0x71, 0x53, 0x71, 0xA3, 0xD4  };
 #endif
 
-uint8_t grain_enc(grain_ctx_t* ctx){
+uint8_t grain_enc(grain_ctx_t *ctx){
        uint8_t s80, s0, c1, c2;
        uint8_t i;
        /* clock the LFSR */
@@ -137,7 +137,7 @@ uint8_t grain_enc(grain_ctx_t* ctx){
        return (h&1);
 }
 
-uint8_t grain_getbyte(grain_ctx_t* ctx){
+uint8_t grain_getbyte(grain_ctx_t *ctx){
        uint8_t i=0;
        uint8_t r=0;
        do{
@@ -166,7 +166,7 @@ uint8_t reverse_bits(uint8_t a){
 
 #endif
 
-void grain_init(const void* key, const void* iv, grain_ctx_t* ctx){
+void grain_init(const void *key, const void *iv, grain_ctx_t *ctx){
        uint8_t i,t;
        
        /* load the 80bit key */