X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=keysize_descriptor.c;fp=keysize_descriptor.c;h=5dcdcc05008088c0c109debd5a6d806e1348eba3;hp=193c07ae217b0f860a9518b1ca8f4be226609362;hb=9e69044519495dad3e2f76fc7795e72390b79a45;hpb=f02dfa3ab0f34d6b9ef4afc5aa336255fd21882c diff --git a/keysize_descriptor.c b/keysize_descriptor.c index 193c07a..5dcdcc0 100644 --- 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,7 @@ 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 */ }