a lot of fixes

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

diff --git a/scal/scal-basic.c b/scal/scal-basic.c
index b53e9fb47a3c246c4fca86c05130536c5c114ce1..4e750d3cc57d22bb6cb62a07fcb98884db9ef8a1 100644 (file)
--- a/scal/scal-basic.c
+++ b/scal/scal-basic.c
@@ -24,8 +24,6 @@
 #include "streamcipher_descriptor.h"
 #include "keysize_descriptor.h"
 
-#include "cli.h"
-
 uint8_t scal_cipher_init(const scdesc_t* cipher_descriptor,
                          const void* key, uint16_t keysize_b,
                          const void* iv,  uint16_t ivsize_b, scgen_ctx_t* ctx){
@@ -114,8 +112,6 @@ uint8_t scal_cipher_gen_byte(scgen_ctx_t* ctx){
                        r |= ((((sc_gen1_fpt)gen_fpt)(ctx->ctx))&(0xff<<(8-blocksize_b)))>>fill;
                        fill += blocksize_b;
                }while(fill<8);
-//             cli_putstr_P(PSTR("\r\nDBG: "));
-//             cli_hexdump_byte(r);
                return r;
        }else{
                uint8_t r;
@@ -131,10 +127,8 @@ uint8_t scal_cipher_gen_byte(scgen_ctx_t* ctx){
 
 void scal_cipher_gen_block(void* block, scgen_ctx_t* ctx){
        uint8_t flags;
-       uint16_t blocksize_b;
        void_fpt gen_fpt;
        flags = pgm_read_byte(&(ctx->desc_ptr->flags));
-       blocksize_b = pgm_read_word(&(ctx->desc_ptr->gensize_b));
        gen_fpt = (void_fpt)pgm_read_word(&(ctx->desc_ptr->gen));
        if((flags&SC_GEN_TYPE)==SC_GEN_TYPE_1){
                *((uint8_t*)block) = ((sc_gen1_fpt)gen_fpt)(ctx->ctx);