X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=keysize_descriptor.c;h=40465c561b9ee05d02c819fbb23aa33107e67de4;hp=253100ff63f4e82b35e749d99ddc383f12271ed5;hb=b8aa8d06134ce687993cb3148d66ebd86dbf1d6f;hpb=701cee0d98aab48dd3192c8cc7c77eb42581bc56

diff --git a/keysize_descriptor.c b/keysize_descriptor.c
index 253100f..40465c5 100644
--- a/keysize_descriptor.c
+++ b/keysize_descriptor.c
@@ -1,7 +1,7 @@
 /* keysize_descriptor.c */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2009  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 @@
 /**
  * \file    keysize_descriptor.c 
  * \author  Daniel Otte
- * \email   daniel.otte@rub.de
+ * \email   bg@nerilex.org
  * \date    2009-01-07
  * \license GPLv3 or later
  */
@@ -32,29 +32,32 @@
 uint8_t is_valid_keysize_P(PGM_VOID_P ks_desc, uint16_t keysize){
 	uint8_t type;
 	type = pgm_read_byte(ks_desc++);
-	if(type==KS_TYPE_TERMINATOR)
+	if (type == KS_TYPE_TERMINATOR) {
 		return 0;
-	if(type==KS_TYPE_LIST){
+	}
+	if (type == KS_TYPE_LIST) {
 		uint8_t items;
 		uint16_t item;
 		items = pgm_read_byte(ks_desc++);
-		while(items--){
+		while (items--) {
 			item = pgm_read_word(ks_desc);
 			ks_desc = (uint8_t*)ks_desc + 2;
-			if(item==keysize)
+			if (item == keysize) {
 				return 1;
+			}
 		}
 		ks_desc = (uint8_t*)ks_desc - 2;
 	}
-	if(type==KS_TYPE_RANGE){
+	if (type == KS_TYPE_RANGE) {
 		uint16_t max, min;
 		min = pgm_read_word(ks_desc);
 		ks_desc = (uint8_t*)ks_desc + 2;
 		max = pgm_read_word(ks_desc);
-		if(min<=keysize && keysize<=max)
+		if (min <= keysize && keysize <= max) {
 			return 1;
+		}
 	}
-	if(type==KS_TYPE_ARG_RANGE){
+	if (type == KS_TYPE_ARG_RANGE) {
 		uint16_t max, min, dist, offset;
 		min = pgm_read_word(ks_desc);
 		ks_desc = (uint8_t*)ks_desc + 2;
@@ -63,14 +66,15 @@ uint8_t is_valid_keysize_P(PGM_VOID_P ks_desc, uint16_t keysize){
 		dist = pgm_read_word(ks_desc);
 		ks_desc = (uint8_t*)ks_desc + 2;
 		offset = pgm_read_word(ks_desc);
-		if(min<=keysize && keysize<=max && (keysize%dist==offset))
+		if (min <= keysize && keysize <= max && (keysize % dist == offset)) {
 			return 1;
+		}
 	}
-	if(type>KS_TYPE_ARG_RANGE){
+	if (type > KS_TYPE_ARG_RANGE) {
 		/* bad error, you may insert a big warning message here */
 		return 0;
 	}
-	return is_valid_keysize_P((uint8_t*)ks_desc+1, keysize); /* search the next record */
+	return is_valid_keysize_P((uint8_t*)ks_desc + 1, keysize); /* search the next record */
 }
 
 uint16_t get_keysize(PGM_VOID_P ks_desc){