/* keysize_descriptor.c */
/*
- This file is part of the This file is part of the AVR-Crypto-Lib.
+ This file is part of the AVR-Crypto-Lib.
Copyright (C) 2009 Daniel Otte (daniel.otte@rub.de)
This program is free software: you can redistribute it and/or modify
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;
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;
/* 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;
}