X-Git-Url: https://git.cryptolib.org/?p=avr-crypto-lib.git;a=blobdiff_plain;f=scal%2Fscal_trivium.c;h=7fddae643c05e788f0a46b80ee240c2b65ccd677;hp=a8a2789f79ceab0319975e21fcd79e52d77db0db;hb=4b5da1dc27a791b5c448274a3db09cd035b33493;hpb=12b222bf434f472559a8791acdb57c0f154111fb

diff --git a/scal/scal_trivium.c b/scal/scal_trivium.c
index a8a2789..7fddae6 100644
--- a/scal/scal_trivium.c
+++ b/scal/scal_trivium.c
@@ -1,7 +1,7 @@
 /* scal_trivium.c */
 /*
     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
@@ -32,7 +32,7 @@ const uint8_t trivium_keysize_desc[] PROGMEM = {
 	    KS_TYPE_TERMINATOR   };
 
 const uint8_t trivium_ivsize_desc[] PROGMEM = {
-		KS_TYPE_LIST, 2, KS_INT(32), KS_INT(80),
+		KS_TYPE_LIST, 3, KS_INT(32), KS_INT(64), KS_INT(80),
         KS_TYPE_TERMINATOR   };
 
 const scdesc_t trivium_desc PROGMEM = {
@@ -40,9 +40,9 @@ const scdesc_t trivium_desc PROGMEM = {
 		SC_INIT_TYPE_5|SC_GEN_TYPE_1, /* flags*/
 		trivium_str,                  /* name string pointer */
 		sizeof(trivium_ctx_t),        /* size of context */
-		1,                            /* blocksize */
+		8,                            /* blocksize */
 		{(void_fpt)trivium_init},     /* init function pointer */
-		{(void_fpt)trivium_enc},      /* key stream generator function pointer */
+		{(void_fpt)trivium_getbyte},  /* key stream generator function pointer */
 		{(void_fpt)NULL},             /* key stream generator for random access function pointer */
 		(sc_free_fpt)NULL,	          /* free function pointer */
 		trivium_keysize_desc,         /* key size descriptor pointer */