fixing bug in padding for Keccak

[avr-crypto-lib.git] / keccak / keccak.c

diff --git a/keccak/keccak.c b/keccak/keccak.c
index e2df514aee3d51b936df847eb485b13a3238b7a5..7983b0111cf46d2c0d21bfa20edbb400507fd59b 100644 (file)
--- a/keccak/keccak.c
+++ b/keccak/keccak.c
@@ -30,7 +30,6 @@
 
 #define DEBUG 0
 
-
 #if DEBUG
 #include "cli.h"
 
@@ -177,16 +176,16 @@ void keccak_lastBlock(keccak_ctx_t* ctx, const void* block, uint16_t length_b){
        pad[0] = ctx->d;
        pad[1] = ctx->bs;
        pad[2] = 0x01;
-       if(length_b/8+1+3<ctx->bs){
+       if(length_b/8+1+3<=ctx->bs){
                memcpy(tmp+length_b/8+1, pad, 3);
        }else{
-               if(length_b/8+1+2<ctx->bs){
+               if(length_b/8+1+2<=ctx->bs){
                        memcpy(tmp+length_b/8+1, pad, 2);
                        keccak_nextBlock(ctx, tmp);
                        memset(tmp, 0x00, ctx->bs);
                        tmp[0]=0x01;
                }else{
-                       if(length_b/8+1+1<ctx->bs){
+                       if(length_b/8+1+1<=ctx->bs){
                                memcpy(tmp+length_b/8+1, pad, 1);
                                keccak_nextBlock(ctx, tmp);
                                memset(tmp, 0x00, ctx->bs);