changing some types from uint16_t to size_t

This commit is contained in:
bg 2013-09-20 02:11:05 +02:00
parent 6e767be64b
commit 25b45eaba6
2 changed files with 16 additions and 16 deletions

View File

@ -28,7 +28,7 @@ typedef struct {
/** name, flash pointer to the name string */ /** name, flash pointer to the name string */
PGM_P name; PGM_P name;
/** ctxsize_B, size of the hash context in bytes */ /** ctxsize_B, size of the hash context in bytes */
uint16_t ctxsize_B; size_t ctxsize_B;
/** blocksize_b, size of an input block in bits */ /** blocksize_b, size of an input block in bits */
uint16_t blocksize_b; uint16_t blocksize_b;
/** hashsize_b, size of the output hash value in bits */ /** hashsize_b, size of the output hash value in bits */

View File

@ -61,13 +61,13 @@ typedef union{
} sc_init_fpt; } sc_init_fpt;
typedef union{ typedef union{
void_fpt genvoid; void_fpt genvoid;
sc_gen1_fpt gen1; sc_gen1_fpt gen1;
sc_gen2_fpt gen2; sc_gen2_fpt gen2;
} sc_gen_fpt; } sc_gen_fpt;
typedef union{ typedef union{
void_fpt genravoid; void_fpt genravoid;
sc_genra1_fpt genra1; sc_genra1_fpt genra1;
sc_genra2_fpt genra2; sc_genra2_fpt genra2;
} sc_genra_fpt; } sc_genra_fpt;
@ -86,23 +86,23 @@ typedef union{
#define SCDESC_TYPE_STREAMCIPHER 0x03 #define SCDESC_TYPE_STREAMCIPHER 0x03
typedef struct { typedef struct {
uint8_t type; /* 3==streamcipher */ uint8_t type; /* 3 == streamcipher */
uint8_t flags; uint8_t flags;
PGM_P name; PGM_P name;
uint16_t ctxsize_B; size_t ctxsize_B;
uint16_t gensize_b; uint16_t gensize_b;
sc_init_fpt init; sc_init_fpt init;
sc_gen_fpt gen; sc_gen_fpt gen;
sc_genra_fpt genra; sc_genra_fpt genra;
sc_free_fpt free; sc_free_fpt free;
PGM_VOID_P valid_keysize_desc; PGM_VOID_P valid_keysize_desc;
PGM_VOID_P valid_ivsize_desc; PGM_VOID_P valid_ivsize_desc;
} scdesc_t; /* streamcipher descriptor type */ } scdesc_t; /* streamcipher descriptor type */
typedef struct{ typedef struct{
const scdesc_t *desc_ptr; const scdesc_t *desc_ptr;
uint16_t keysize; size_t keysize;
uint16_t ivsize; size_t ivsize;
uint16_t index; uint16_t index;
uint8_t* buffer; uint8_t* buffer;
void* ctx; void* ctx;