changing performance measurment of blockciphers to bcal

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

diff --git a/keysize_descriptor.c b/keysize_descriptor.c
index 193c07ae217b0f860a9518b1ca8f4be226609362..045ff65f4c24c2c5188fad812ebbf24886f94095 100644 (file)
--- a/keysize_descriptor.c
+++ b/keysize_descriptor.c
@@ -39,16 +39,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 +56,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 +69,18 @@ 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;
 }