From 6cf6c4cd852bd09c509407057e81e37e36bad52e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 19 Oct 2021 02:56:44 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Delete=20after=20encrypt.=20Lerd?=
 =?UTF-8?q?ge=20encrypt=20only=20once?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buildroot/share/PlatformIO/scripts/lerdge.py | 47 ++++++++++----------
 buildroot/share/PlatformIO/scripts/marlin.py | 16 ++++---
 ini/stm32f4.ini                              |  4 +-
 3 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/buildroot/share/PlatformIO/scripts/lerdge.py b/buildroot/share/PlatformIO/scripts/lerdge.py
index 654f0ad4df..144ab64a9a 100644
--- a/buildroot/share/PlatformIO/scripts/lerdge.py
+++ b/buildroot/share/PlatformIO/scripts/lerdge.py
@@ -12,37 +12,36 @@ from SCons.Script import DefaultEnvironment
 board = DefaultEnvironment().BoardConfig()
 
 def encryptByte(byte):
-    byte = 0xFF & ((byte << 6) | (byte >> 2))
-    i = 0x58 + byte
-    j = 0x05 + byte + (i >> 8)
-    byte = (0xF8 & i) | (0x07 & j)
-    return byte
+	byte = 0xFF & ((byte << 6) | (byte >> 2))
+	i = 0x58 + byte
+	j = 0x05 + byte + (i >> 8)
+	byte = (0xF8 & i) | (0x07 & j)
+	return byte
 
 def encrypt_file(input, output_file, file_length):
-    input_file = bytearray(input.read())
-    for i in range(len(input_file)):
-        result = encryptByte(input_file[i])
-        input_file[i] = result
-
-    output_file.write(input_file)
-    return
+	input_file = bytearray(input.read())
+	for i in range(len(input_file)):
+		input_file[i] = encryptByte(input_file[i])
+	output_file.write(input_file)
 
 # Encrypt ${PROGNAME}.bin and save it with the name given in build.encrypt
 def encrypt(source, target, env):
-    fwname = board.get("build.encrypt")
-    print("Encrypting %s to %s" % (target[0].path, fwname))
-    firmware = open(target[0].path, "rb")
-    renamed = open(target[0].dir.path + "/" + fwname, "wb")
-    length = os.path.getsize(target[0].path)
+	fwpath = target[0].path
+	enname = board.get("build.encrypt")
+	print("Encrypting %s to %s" % (fwpath, enname))
+	fwfile = open(fwpath, "rb")
+	enfile = open(target[0].dir.path + "/" + enname, "wb")
+	length = os.path.getsize(fwpath)
 
-    encrypt_file(firmware, renamed, length)
+	encrypt_file(fwfile, enfile, length)
 
-    firmware.close()
-    renamed.close()
+	fwfile.close()
+	enfile.close()
+	os.remove(fwpath)
 
 if 'encrypt' in board.get("build").keys():
-    if board.get("build.encrypt") != "":
-        marlin.add_post_action(encrypt)
+	if board.get("build.encrypt") != "":
+		marlin.add_post_action(encrypt)
 else:
-    print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
-    exit(1)
+	print("LERDGE builds require output file via board_build.encrypt = 'filename' parameter")
+	exit(1)
diff --git a/buildroot/share/PlatformIO/scripts/marlin.py b/buildroot/share/PlatformIO/scripts/marlin.py
index 3949037904..caa0c89749 100644
--- a/buildroot/share/PlatformIO/scripts/marlin.py
+++ b/buildroot/share/PlatformIO/scripts/marlin.py
@@ -48,22 +48,24 @@ def encrypt_mks(source, target, env, new_name):
 
 	key = [0xA3, 0xBD, 0xAD, 0x0D, 0x41, 0x11, 0xBB, 0x8D, 0xDC, 0x80, 0x2D, 0xD0, 0xD2, 0xC4, 0x9B, 0x1E, 0x26, 0xEB, 0xE3, 0x33, 0x4A, 0x15, 0xE4, 0x0A, 0xB3, 0xB1, 0x3C, 0x93, 0xBB, 0xAF, 0xF7, 0x3E]
 
-	firmware = open(target[0].path, "rb")
-	renamed = open(target[0].dir.path + "/" + new_name, "wb")
-	length = os.path.getsize(target[0].path)
+	fwpath = target[0].path
+	fwfile = open(fwpath, "rb")
+	enfile = open(target[0].dir.path + "/" + new_name, "wb")
+	length = os.path.getsize(fwpath)
 	position = 0
 	try:
 		while position < length:
-			byte = firmware.read(1)
+			byte = fwfile.read(1)
 			if position >= 320 and position < 31040:
 				byte = chr(ord(byte) ^ key[position & 31])
 				if sys.version_info[0] > 2:
 					byte = bytes(byte, 'latin1')
-			renamed.write(byte)
+			enfile.write(byte)
 			position += 1
 	finally:
-		firmware.close()
-		renamed.close()
+		fwfile.close()
+		enfile.close()
+		os.remove(fwpath)
 
 def add_post_action(action):
 	env.AddPostAction(join("$BUILD_DIR", "${PROGNAME}.bin"), action);
diff --git a/ini/stm32f4.ini b/ini/stm32f4.ini
index f4968a55e4..a6bc125d21 100644
--- a/ini/stm32f4.ini
+++ b/ini/stm32f4.ini
@@ -263,13 +263,13 @@ platform            = ${common_stm32.platform}
 extends             = stm32_variant
 board               = marlin_STM32F407ZGT6
 board_build.variant = MARLIN_LERDGE
-board_build.encrypt = firmware.bin
 board_build.offset  = 0x10000
 build_flags         = ${stm32_variant.build_flags}
                       -DSTM32F4 -DSTM32F4xx -DTARGET_STM32F4
                       -DDISABLE_GENERIC_SERIALUSB -DARDUINO_ARCH_STM32 -DLERDGE_TFT35
 build_unflags       = ${stm32_variant.build_unflags} -DUSBCON -DUSBD_USE_CDC -DUSBD_VID=0x0483
-extra_scripts       = ${stm32_variant.extra_scripts}
+extra_scripts       = ${common_stm32.extra_scripts}
+                      pre:buildroot/share/PlatformIO/scripts/generic_create_variant.py
                       buildroot/share/PlatformIO/scripts/lerdge.py
 
 #