1*4882a593SmuzhiyunFrom 7c5475187d1bdf861360ffd8bc1aaea84a341db3 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Dagg Stompler <daggs@gmx.com> 3*4882a593SmuzhiyunDate: Fri, 11 Sep 2020 12:28:52 +0300 4*4882a593SmuzhiyunSubject: [PATCH] amlbootenc-gxl: remove non std C convention in for 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunnot all compilers have c99 or gnu99 enabled, so try not to use a 7*4882a593Smuzhiyunnon std C convention in for call loops 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Dagg Stompler <daggs@gmx.com> 10*4882a593Smuzhiyun--- 11*4882a593Smuzhiyun amlbootenc-gxl.c | 7 ++++--- 12*4882a593Smuzhiyun 1 file changed, 4 insertions(+), 3 deletions(-) 13*4882a593Smuzhiyun 14*4882a593Smuzhiyundiff --git a/amlbootenc-gxl.c b/amlbootenc-gxl.c 15*4882a593Smuzhiyunindex 3695e13..233563d 100644 16*4882a593Smuzhiyun--- a/amlbootenc-gxl.c 17*4882a593Smuzhiyun+++ b/amlbootenc-gxl.c 18*4882a593Smuzhiyun@@ -51,6 +51,7 @@ static int boot_enc(const char *input, const char *output) 19*4882a593Smuzhiyun ._unknown3 = 0x02000000, 20*4882a593Smuzhiyun .sig2 = AMLOGIC_C_SIGNATURE, 21*4882a593Smuzhiyun }; 22*4882a593Smuzhiyun+ int i; 23*4882a593Smuzhiyun 24*4882a593Smuzhiyun assert(sizeof(hdr) == 0x100); 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun@@ -130,10 +131,10 @@ static int boot_enc(const char *input, const char *output) 27*4882a593Smuzhiyun memcpy(hdr.iv, (uint8_t[]){ 0x14, 0x82, 0x5b, 0x1b, 0x10, 0xc1, 0x49, 0x0d, 0x8f, 0x13, 0x0a, 0x99, 0x15, 0x50, 0x1d, 0x37 }, 16); 28*4882a593Smuzhiyun } 29*4882a593Smuzhiyun #else 30*4882a593Smuzhiyun- for (int i = 0; i < sizeof(hdr.key); i++) { 31*4882a593Smuzhiyun+ for (i = 0; i < sizeof(hdr.key); i++) { 32*4882a593Smuzhiyun hdr.key[i] = rand(); 33*4882a593Smuzhiyun } 34*4882a593Smuzhiyun- for (int i = 0; i < sizeof(hdr.iv); i++) { 35*4882a593Smuzhiyun+ for (i = 0; i < sizeof(hdr.iv); i++) { 36*4882a593Smuzhiyun hdr.iv[i] = rand(); 37*4882a593Smuzhiyun } 38*4882a593Smuzhiyun #endif 39*4882a593Smuzhiyun@@ -151,7 +152,7 @@ static int boot_enc(const char *input, const char *output) 40*4882a593Smuzhiyun AES_cbc_encrypt(src_buf, buf + hdr.first_offset, hdr.block_size, &aes_key, iv, AES_ENCRYPT); 41*4882a593Smuzhiyun SHA256_Update(&sha256_ctx, buf + hdr.first_offset, hdr.block_size); 42*4882a593Smuzhiyun 43*4882a593Smuzhiyun- for (int i = 1; i < hdr.payload_size / hdr.block_size; i++) { 44*4882a593Smuzhiyun+ for (i = 1; i < hdr.payload_size / hdr.block_size; i++) { 45*4882a593Smuzhiyun memset(src_buf, 0, hdr.block_size); 46*4882a593Smuzhiyun fread(src_buf, 1, hdr.block_size, fin); 47*4882a593Smuzhiyun AES_cbc_encrypt(src_buf, buf + hdr.data_offset + (i - 1) * hdr.block_size, hdr.block_size, &aes_key, iv, AES_ENCRYPT); 48*4882a593Smuzhiyun-- 49*4882a593Smuzhiyun2.28.0 50*4882a593Smuzhiyun 51