trivium fixed; further migrating to SCAL

[avr-crypto-lib.git] / scal / scal_trivium.c

diff --git a/scal/scal_trivium.c b/scal/scal_trivium.c
index a8a2789f79ceab0319975e21fcd79e52d77db0db..bebf391024575e5a08103df286c3741b75947151 100644 (file)
--- a/scal/scal_trivium.c
+++ b/scal/scal_trivium.c
@@ -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 */