X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=keysize_descriptor.c;h=40465c561b9ee05d02c819fbb23aa33107e67de4;hp=17f4d473ef27a7c778357c676956e4f4dd13a31b;hb=b8aa8d06134ce687993cb3148d66ebd86dbf1d6f;hpb=17332291e15183d71d88ed868275e3cb53917180

diff --git a/keysize_descriptor.c b/keysize_descriptor.c
index 17f4d47..40465c5 100644
--- a/keysize_descriptor.c
+++ b/keysize_descriptor.c
@@ -1,7 +1,7 @@
 /* keysize_descriptor.c */
 /*
-    This file is part of the This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2009  Daniel Otte (daniel.otte@rub.de)
+    This file is part of the AVR-Crypto-Lib.
+    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,57 +19,147 @@
 /**
  * \file    keysize_descriptor.c 
  * \author  Daniel Otte
- * \email   daniel.otte@rub.de
+ * \email   bg@nerilex.org
  * \date    2009-01-07
  * \license GPLv3 or later
  */
 
 #include <stdint.h>
+#include <stdlib.h>
 #include <avr/pgmspace.h>
 #include "keysize_descriptor.h"
 
 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+=2;
-			if(item==keysize)
+			ks_desc = (uint8_t*)ks_desc + 2;
+			if (item == keysize) {
 				return 1;
+			}
 		}
-		ks_desc -= 2;
+		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+=2;
+		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+=2;
+		ks_desc = (uint8_t*)ks_desc + 2;
 		max = pgm_read_word(ks_desc);
-		ks_desc+=2;
+		ks_desc = (uint8_t*)ks_desc + 2;
 		dist = pgm_read_word(ks_desc);
-		ks_desc+=2;
+		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(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){
+	uint8_t type;
+	uint16_t keysize;
+	type = pgm_read_byte(ks_desc);
+	if(type==KS_TYPE_LIST){
+		ks_desc = (uint8_t*)ks_desc + 1;
+	}
+	ks_desc = (uint8_t*)ks_desc + 1;
+	keysize = pgm_read_word(ks_desc);
+	return keysize;
+}
 
+uint16_t get_keysizes(PGM_VOID_P ks_desc, uint16_t** list){
+	uint8_t type;
+	uint16_t items;
+	uint8_t i;
+	type = pgm_read_byte(ks_desc);
+	ks_desc = (uint8_t*)ks_desc + 1;
+	if(type==KS_TYPE_LIST){
+		items = pgm_read_byte(ks_desc);
+		ks_desc = (uint8_t*)ks_desc + 1;
+		if(!*list){
+			*list = malloc(items*2);
+			if(!*list){
+				return 0;
+			}
+		}
+		for(i=0; i<items; ++i){
+			((uint16_t*)(*list))[i] = pgm_read_word(ks_desc);
+			ks_desc = (uint8_t*)ks_desc + 2;
+		}
+		return items;
+	}
+	if(type==KS_TYPE_ARG_RANGE){
+		uint16_t min, max, distance, offset;
+		min = pgm_read_word(ks_desc);
+		ks_desc = (uint8_t*)ks_desc + 2;
+		max = pgm_read_word(ks_desc);
+		ks_desc = (uint8_t*)ks_desc + 2;
+		distance = pgm_read_word(ks_desc);
+		ks_desc = (uint8_t*)ks_desc + 2;
+		offset = pgm_read_word(ks_desc);
+		ks_desc = (uint8_t*)ks_desc + 2;
+		items = (max-min)/distance+1;
+		if(min%distance!=offset){
+			--items;
+			min += (distance-(min%distance-offset))%distance;
+		}
+		if(!*list){
+			*list = malloc(items*2);
+			if(!*list){
+				return 0;
+			}
+		}
+		i=0;
+		while(min<=max){
+			((uint16_t*)*list)[i++] = min;
+			min += distance;
+		}
+		return i;
+	}
+	if(type==KS_TYPE_RANGE){
+		uint16_t min, max, distance=8, offset=0;
+		min = pgm_read_word(ks_desc);
+		ks_desc = (uint8_t*)ks_desc + 2;
+		max = pgm_read_word(ks_desc);
+		items = (max-min)/distance+1;
+		if(min%distance!=offset){
+			--items;
+			min += (distance-(min%distance-offset))%distance;
+		}
+		if(!*list){
+			*list = malloc(items*2);
+			if(!*list){
+				return 0;
+			}
+		}
+		i=0;
+		while(min<=max){
+			((uint16_t*)*list)[i++] = min;
+			min += distance;
+		}
+		return i;
+	}
+	return 0;
+}