changing some types from uint16_t to size_t

diff --git a/hashfunction_descriptor.h b/hashfunction_descriptor.h
index 753286226f8b576499370532491233c16cae1907..de3c8074b5ce06b7271b45019c23d61a8d4b026e 100644 (file)
--- a/hashfunction_descriptor.h
+++ b/hashfunction_descriptor.h
@@ -28,7 +28,7 @@ typedef struct {
        /** name, flash pointer to the name string */
        PGM_P    name;
        /** 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 */
        uint16_t blocksize_b;
        /** hashsize_b, size of the output hash value in bits */

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