From fb1f35765e227530ff0e77b7a5009f6ac71ab190 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 5 Sep 2020 15:08:47 +0200 Subject: [PATCH] amlbootenc-glx.c: fix build without -std=gnu99 Fix the following build failure with old gcc and without -std=gnu99: amlbootenc-gxl.c:136:2: error: 'for' loop initial declarations are only allowed in C99 mode for (int i = 0; i < sizeof(hdr.iv); i++) { ^ amlbootenc-gxl.c:154:11: error: redefinition of 'i' for (int i = 1; i < hdr.payload_size / hdr.block_size; i++) { ^ amlbootenc-gxl.c:136:11: note: previous definition of 'i' was here for (int i = 0; i < sizeof(hdr.iv); i++) { ^ amlbootenc-gxl.c:154:2: error: 'for' loop initial declarations are only allowed in C99 mode for (int i = 1; i < hdr.payload_size / hdr.block_size; i++) { ^ Fixes: - http://autobuild.buildroot.org/results/1b76b51efb06b79e41f566381cd72e6a84404627 Signed-off-by: Fabrice Fontaine --- amlbootenc-gxl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/amlbootenc-gxl.c b/amlbootenc-gxl.c index 3695e13..a9b5d60 100644 --- a/amlbootenc-gxl.c +++ b/amlbootenc-gxl.c @@ -34,6 +34,7 @@ static int boot_enc(const char *input, const char *output) { + int i; FILE *fin, *fout; long file_size; uint8_t *src_buf, *buf; @@ -130,10 +131,10 @@ static int boot_enc(const char *input, const char *output) memcpy(hdr.iv, (uint8_t[]){ 0x14, 0x82, 0x5b, 0x1b, 0x10, 0xc1, 0x49, 0x0d, 0x8f, 0x13, 0x0a, 0x99, 0x15, 0x50, 0x1d, 0x37 }, 16); } #else - for (int i = 0; i < sizeof(hdr.key); i++) { + for (i = 0; i < sizeof(hdr.key); i++) { hdr.key[i] = rand(); } - for (int i = 0; i < sizeof(hdr.iv); i++) { + for (i = 0; i < sizeof(hdr.iv); i++) { hdr.iv[i] = rand(); } #endif @@ -151,7 +152,7 @@ static int boot_enc(const char *input, const char *output) AES_cbc_encrypt(src_buf, buf + hdr.first_offset, hdr.block_size, &aes_key, iv, AES_ENCRYPT); SHA256_Update(&sha256_ctx, buf + hdr.first_offset, hdr.block_size); - for (int i = 1; i < hdr.payload_size / hdr.block_size; i++) { + for (i = 1; i < hdr.payload_size / hdr.block_size; i++) { memset(src_buf, 0, hdr.block_size); fread(src_buf, 1, hdr.block_size, fin); AES_cbc_encrypt(src_buf, buf + hdr.data_offset + (i - 1) * hdr.block_size, hdr.block_size, &aes_key, iv, AES_ENCRYPT);