From 67912790de218f949609e6cdd8e04654dd1b891f Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Mon, 7 Feb 2022 16:39:56 +0100 Subject: [PATCH] Fixed Chacha in C keytools --- tools/keytools/sign.c | 2 +- tools/keytools/user_settings.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/keytools/sign.c b/tools/keytools/sign.c index 45d42307..b1d6a143 100755 --- a/tools/keytools/sign.c +++ b/tools/keytools/sign.c @@ -771,13 +771,13 @@ static int make_header_ex(int is_diff, uint8_t *pubkey, uint32_t pubkey_sz, cons exit(100); #endif wc_Chacha_SetKey(&cha, key, sizeof(key)); + wc_Chacha_SetIV(&cha, iv, 0); for (pos = 0; pos < fsize; pos += ENC_BLOCK_SIZE) { int fread_retval; fread_retval = fread(buf, 1, ENC_BLOCK_SIZE, f); if ((fread_retval == 0) && feof(f)) { break; } - wc_Chacha_SetIV(&cha, iv, (pos >> 4)); wc_Chacha_Process(&cha, enc_buf, buf, fread_retval); fwrite(enc_buf, 1, fread_retval, fef); } diff --git a/tools/keytools/user_settings.h b/tools/keytools/user_settings.h index 7d73512d..921dc1b8 100755 --- a/tools/keytools/user_settings.h +++ b/tools/keytools/user_settings.h @@ -68,7 +68,6 @@ #define HAVE_CHACHA /* Disables */ -#define NO_AES #define NO_CMAC #define NO_HMAC #define NO_RC4