+gcm128

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

diff --git a/keysize_descriptor.c b/keysize_descriptor.c
index 193c07ae217b0f860a9518b1ca8f4be226609362..253100ff63f4e82b35e749d99ddc383f12271ed5 100644 (file)
--- a/keysize_descriptor.c
+++ b/keysize_descriptor.c
@@ -25,6 +25,7 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h>
 #include <avr/pgmspace.h>
 #include "keysize_descriptor.h"
 
@@ -39,16 +40,16 @@ uint8_t is_valid_keysize_P(PGM_VOID_P ks_desc, uint16_t keysize){
                items = pgm_read_byte(ks_desc++);
                while(items--){
                        item = pgm_read_word(ks_desc);
-                       ks_desc+=2;
+                       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){
                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)
                        return 1;
@@ -56,11 +57,11 @@ uint8_t is_valid_keysize_P(PGM_VOID_P ks_desc, uint16_t keysize){
        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))
                        return 1;
@@ -69,7 +70,92 @@ uint8_t is_valid_keysize_P(PGM_VOID_P ks_desc, uint16_t keysize){
                /* 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;
+}