X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=mickey128%2Fmickey128.c;h=0cff66d9a2fcd6249ca674e8d6ce47451a2428b2;hp=d33571e209bd19069c4d1722f1811812442e6807;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=d32eba56ce10ea6b9eff123b50d9842673b38f2b

diff --git a/mickey128/mickey128.c b/mickey128/mickey128.c
index d33571e..0cff66d 100644
--- a/mickey128/mickey128.c
+++ b/mickey128/mickey128.c
@@ -1,7 +1,7 @@
 /**
  * 
  * author: Daniel Otte
- * email:  daniel.otte@rub.de
+ * email:  bg@nerilex.org
  * license: GPLv3
  * 
  * */
@@ -36,7 +36,7 @@ RTAPS = { 0,4,5,  8,10,11,14  ,16,20,  25,30,  32,35,36,38,
          0100.1010 1110.11
 */
 
-uint8_t rtaps[] PROGMEM = {
+const uint8_t rtaps[] PROGMEM = {
 	0x31, 0x4D, 0x11, 0x42,
 	0x59, 0x4C, 0xEC, 0xF3,
 	0x26, 0x96, 0x67, 0x9C,
@@ -45,7 +45,7 @@ uint8_t rtaps[] PROGMEM = {
 };
 	
 static 
-void memxor_P(void* d, PGM_VOID_P s, uint8_t length_B){
+void memxor_P(void *d, PGM_VOID_P s, uint8_t length_B){
 	while(length_B--){
 		*((uint8_t*)d) ^= pgm_read_byte(s);
 		d = (uint8_t*)d +1;
@@ -60,7 +60,7 @@ void memxor_P(void* d, PGM_VOID_P s, uint8_t length_B){
 #define SHLX1(a) c0=((a)>>7); (a)^=(((a)<<1)|c1)
 
 static
-void clock_r(uint8_t* r, uint8_t ibit, uint8_t cbit){
+void clock_r(uint8_t *r, uint8_t ibit, uint8_t cbit){
 	uint8_t i,c0=0,c1=0; /* carry */
 	ibit ^= ((r[159/8])>>(159%8))&1; /* ibit is now the same as feedback_bit */
 	if(cbit){
@@ -92,7 +92,7 @@ void clock_r(uint8_t* r, uint8_t ibit, uint8_t cbit){
  * 31 D9 AF 37
  * BE 06 BE 0F
  */ 
-uint8_t comp0[] PROGMEM = {
+const uint8_t comp0[] PROGMEM = {
 	0x5E, 0xF2, 0xD6, 0x5D,
 	0x55, 0x09, 0x26, 0x79,
 	0x62, 0x70, 0x00, 0x79, 
@@ -115,7 +115,7 @@ uint8_t comp0[] PROGMEM = {
  * 6A B7 E8 FF
 */
 /*
-uint8_t comp1[] PROGMEM = {
+const uint8_t comp1[] PROGMEM = {
 	0x60, 0x3E, 0x32, 0xFA, 0x30, 0x79, 0x6C, 0xFD, 0xC1, 0x87, 
 	0x01, 0xF8, 0x8A, 0xC6, 0xC1, 0xCC, 0x6A, 0xB7, 0xE8, 0xFF
 };
@@ -134,7 +134,7 @@ uint8_t comp1[] PROGMEM = {
  * AD DA 2F FE
 */
 /*
-uint8_t comp1[] PROGMEM = {
+const uint8_t comp1[] PROGMEM = {
 	0x0C, 0xF8, 0x98, 0xBE, 0x19, 0x3C, 0x6D, 0x7F, 0x07, 0xC3,
 	0x00, 0x3E, 0xA2, 0xC7, 0x06, 0x66, 0xAD, 0xDA, 0x2F, 0xFE
 };
@@ -153,7 +153,7 @@ uint8_t comp1[] PROGMEM = {
  * B5 5B F4 7F
 */
 
-uint8_t comp1[] PROGMEM = {
+const uint8_t comp1[] PROGMEM = {
 	0x30, 0x1F, 0x19, 0x7D,
 	0x98, 0x3C, 0xB6, 0xFE, 
 	0xE0, 0xC3, 0x00, 0x7C, 
@@ -174,7 +174,7 @@ uint8_t comp1[] PROGMEM = {
  * 91 4B 54 D4
  * C1 0B 63 83
  */ 
-uint8_t fb0[] PROGMEM = {	
+const uint8_t fb0[] PROGMEM = {	
 	0xAF, 0x1F, 0x3C, 0xC4, 
 	0x22, 0xA3, 0x2F, 0x0E, 
 	0x81, 0x4D, 0xE5, 0x66, 
@@ -195,7 +195,7 @@ uint8_t fb0[] PROGMEM = {
  * E7 7E 4B 6C
  * EF 80 A7 11
  */ 
-uint8_t fb1[] PROGMEM = {
+const uint8_t fb1[] PROGMEM = {
 	0xAB, 0x77, 0xF4, 0x9B, 
 	0x90, 0x8C, 0x79, 0x70, 
 	0xB6, 0x18, 0x9A, 0x6F, 
@@ -204,7 +204,7 @@ uint8_t fb1[] PROGMEM = {
 };
 
 static
-void clock_s(uint8_t* s, uint8_t ibit, uint8_t cbit){
+void clock_s(uint8_t *s, uint8_t ibit, uint8_t cbit){
 	uint8_t s0[20], s1[20];
 	uint8_t i,c=0, c2=0;
 	ibit ^= (s[19])>>7;
@@ -228,7 +228,7 @@ void clock_s(uint8_t* s, uint8_t ibit, uint8_t cbit){
 }
 
 static
-void clock_kg(uint8_t* r, uint8_t* s, uint8_t mixing, uint8_t input){
+void clock_kg(uint8_t *r, uint8_t *s, uint8_t mixing, uint8_t input){
 	uint8_t rb, sb;
 	rb = ((s[ 54/8])>>(( 54%8))) ^ ((r[106/8])>>(((106%8))));
 	sb = ((s[106/8])>>((106%8))) ^ ((r[ 53/8])>>((( 53%8))));
@@ -239,9 +239,9 @@ void clock_kg(uint8_t* r, uint8_t* s, uint8_t mixing, uint8_t input){
 	clock_s(s, input, sb);
 }
 
-void mickey128_init(void* key, uint16_t keysize_b, 
-                    void* iv,  uint16_t ivsize_b, 
-                    mickey128_ctx_t* ctx){
+void mickey128_init(void *key, uint16_t keysize_b, 
+                    void *iv,  uint16_t ivsize_b, 
+                    mickey128_ctx_t *ctx){
 	uint16_t i;
 	memset(ctx->r, 0, 20);
 	memset(ctx->s, 0, 20);
@@ -256,14 +256,14 @@ void mickey128_init(void* key, uint16_t keysize_b,
 	}                  
 } 
 
-uint8_t mickey128_getbit(mickey128_ctx_t* ctx){
+uint8_t mickey128_getbit(mickey128_ctx_t *ctx){
 	uint8_t ret;
 	ret = 1&(*(ctx->r) ^ *(ctx->s));
 	clock_kg(ctx->r, ctx->s, 0, 0);
 	return ret;
 }
 
-uint8_t mickey128_getbyte(mickey128_ctx_t* ctx){
+uint8_t mickey128_getbyte(mickey128_ctx_t *ctx){
 	uint8_t i,ret=0;
 	for(i=0; i<8; ++i){
 		ret<<=1;