X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=streamcipher_descriptor.h;h=fc3b471deaa9c9cab15e22cda687dc8494646b8d;hp=56815cc9361f978ae61c15bf5065ee33a81452a4;hb=e9e07569721b9e005d6b602e26a03e930e796577;hpb=2ed518e50cb7fd58dba373f791843af2beb82cc3

diff --git a/streamcipher_descriptor.h b/streamcipher_descriptor.h
index 56815cc..fc3b471 100644
--- a/streamcipher_descriptor.h
+++ b/streamcipher_descriptor.h
@@ -1,7 +1,7 @@
 /* streamcipher_descriptor.h */
 /*
     This file is part of the AVR-Crypto-Lib.
-    Copyright (C) 2011  Daniel Otte (daniel.otte@rub.de)
+    Copyright (C) 2006-2015 Daniel Otte (bg@nerilex.org)
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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;
+	const scdesc_t *desc_ptr;
+	size_t          keysize;
+	size_t          ivsize;
 	uint16_t        index;
 	uint8_t*        buffer;
 	void*           ctx;