From 0d75e76899af552689dbbc748101c851fc42574a Mon Sep 17 00:00:00 2001
From: Valentin Perminov <teh-val@ya.ru>
Date: Wed, 25 Nov 2020 20:26:27 +0300
Subject: [PATCH] Fix endianness

Set platform independent endianness in struct.pack()
---
 kflash.py | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/kflash.py b/kflash.py
index d4cb1da..c0e913d 100755
--- a/kflash.py
+++ b/kflash.py
@@ -543,9 +543,9 @@ def get_terminal_size(fallback=(100, 24), terminal = False):
         class MAIXLoader:
             def change_baudrate(self, baudrate):
                 KFlash.log(INFO_MSG,"Selected Baudrate: ", baudrate, BASH_TIPS['DEFAULT'])
-                out = struct.pack('III', 0, 4, baudrate)
-                crc32_checksum = struct.pack('I', binascii.crc32(out) & 0xFFFFFFFF)
-                out = struct.pack('HH', 0xd6, 0x00) + crc32_checksum + out
+                out = struct.pack('<III', 0, 4, baudrate)
+                crc32_checksum = struct.pack('<I', binascii.crc32(out) & 0xFFFFFFFF)
+                out = struct.pack('<HH', 0xd6, 0x00) + crc32_checksum + out
                 self.write(out)
                 time.sleep(0.05)
                 self._port.baudrate = baudrate
@@ -572,9 +572,9 @@ def change_baudrate_stage0(self, baudrate):
                     # This is for openec, contained ft2232, goE and trainer
                     KFlash.log(INFO_MSG,"FT2232 mode", BASH_TIPS['DEFAULT'])
                     baudrate_stage0 = int(baudrate * 38.6 / 38)
-                    out = struct.pack('III', 0, 4, baudrate_stage0)
-                    crc32_checksum = struct.pack('I', binascii.crc32(out) & 0xFFFFFFFF)
-                    out = struct.pack('HH', 0xc6, 0x00) + crc32_checksum + out
+                    out = struct.pack('<III', 0, 4, baudrate_stage0)
+                    crc32_checksum = struct.pack('<I', binascii.crc32(out) & 0xFFFFFFFF)
+                    out = struct.pack('<HH', 0xc6, 0x00) + crc32_checksum + out
                     self.write(out)
                     time.sleep(0.05)
                     self._port.baudrate = baudrate
@@ -846,11 +846,11 @@ def flash_greeting(self):
             def boot(self, address=0x80000000):
                 KFlash.log(INFO_MSG,"Booting From " + hex(address),BASH_TIPS['DEFAULT'])
 
-                out = struct.pack('II', address, 0)
+                out = struct.pack('<II', address, 0)
 
-                crc32_checksum = struct.pack('I', binascii.crc32(out) & 0xFFFFFFFF)
+                crc32_checksum = struct.pack('<I', binascii.crc32(out) & 0xFFFFFFFF)
 
-                out = struct.pack('HH', 0xc5, 0x00) + crc32_checksum + out  # op: ISP_MEMORY_WRITE: 0xc3
+                out = struct.pack('<HH', 0xc5, 0x00) + crc32_checksum + out  # op: ISP_MEMORY_WRITE: 0xc3
                 self.write(out)
 
             def recv_debug(self):
@@ -882,9 +882,9 @@ def flash_recv_debug(self):
             def init_flash(self, chip_type):
                 chip_type = int(chip_type)
                 KFlash.log(INFO_MSG,"Selected Flash: ",("In-Chip", "On-Board")[chip_type],BASH_TIPS['DEFAULT'])
-                out = struct.pack('II', chip_type, 0)
-                crc32_checksum = struct.pack('I', binascii.crc32(out) & 0xFFFFFFFF)
-                out = struct.pack('HH', 0xd7, 0x00) + crc32_checksum + out
+                out = struct.pack('<II', chip_type, 0)
+                crc32_checksum = struct.pack('<I', binascii.crc32(out) & 0xFFFFFFFF)
+                out = struct.pack('<HH', 0xd7, 0x00) + crc32_checksum + out
                 '''Retry when it have error'''
                 retry_count = 0
                 while 1:
@@ -943,11 +943,11 @@ def flash_dataframe(self, data, address=0x80000000):
                     while 1:
                         self.checkKillExit()
                         #KFlash.log('[INFO] sending chunk', i, '@address', hex(address), 'chunklen', len(chunk))
-                        out = struct.pack('II', address, len(chunk))
+                        out = struct.pack('<II', address, len(chunk))
 
-                        crc32_checksum = struct.pack('I', binascii.crc32(out + chunk) & 0xFFFFFFFF)
+                        crc32_checksum = struct.pack('<I', binascii.crc32(out + chunk) & 0xFFFFFFFF)
 
-                        out = struct.pack('HH', 0xc3, 0x00) + crc32_checksum + out + chunk  # op: ISP_MEMORY_WRITE: 0xc3
+                        out = struct.pack('<HH', 0xc3, 0x00) + crc32_checksum + out + chunk  # op: ISP_MEMORY_WRITE: 0xc3
                         sent = self.write(out)
                         #KFlash.log('[INFO]', 'sent', sent, 'bytes', 'checksum', binascii.hexlify(crc32_checksum).decode())
 
@@ -982,11 +982,11 @@ def dump_to_flash(self, data, address=0):
 
                 for n, chunk in enumerate(data_chunks):
                     #KFlash.log('[INFO] sending chunk', i, '@address', hex(address))
-                    out = struct.pack('II', address, len(chunk))
+                    out = struct.pack('<II', address, len(chunk))
 
-                    crc32_checksum = struct.pack('I', binascii.crc32(out + chunk) & 0xFFFFFFFF)
+                    crc32_checksum = struct.pack('<I', binascii.crc32(out + chunk) & 0xFFFFFFFF)
 
-                    out = struct.pack('HH', 0xd4, 0x00) + crc32_checksum + out + chunk
+                    out = struct.pack('<HH', 0xd4, 0x00) + crc32_checksum + out + chunk
                     #KFlash.log("[$$$$]", binascii.hexlify(out[:32]).decode())
                     retry_count = 0
                     while True:
@@ -1059,7 +1059,7 @@ def flash_firmware(self, firmware_bin, aes_key = None, address_offset = 0, sha25
 
                     firmware_len = len(firmware_bin)
 
-                    data = aes_cipher_flag + struct.pack('I', firmware_len) + firmware_bin
+                    data = aes_cipher_flag + struct.pack('<I', firmware_len) + firmware_bin
 
                     sha256_hash = hashlib.sha256(data).digest()