commit a797f2097a37d10dbe6cf7596d81816d1b514b4e
author Donald Chan <hoiho@amazon.com> Mon Jan 10 19:31:13 2022 +0000
committer Jérôme Forissier <jerome@forissier.org> Tue Jan 11 09:46:26 2022 +0100
tree d4e1072a97e1171d7d61bfa4a7fdeaab0b850514
parent 769488761879119d186e0463d1ccc031c9a83636

scripts/sign_encrypt.py: readability improvements

A few constant values would have been better if replaced with constant
definitions

Signed-off-by: Donald Chan <hoiho@amazon.com>
Reviewed-by: Jerome Forissier <jerome@forissier.org>

scripts/sign_encrypt.py

diff --git a/scripts/sign_encrypt.py b/scripts/sign_encrypt.py
index 37a22b5..e4704b7 100755
--- a/scripts/sign_encrypt.py
+++ b/scripts/sign_encrypt.py
@@ -14,6 +14,11 @@
 enc_key_type = {'SHDR_ENC_KEY_DEV_SPECIFIC': 0x0,
                 'SHDR_ENC_KEY_CLASS_WIDE': 0x1}
 
+SHDR_BOOTSTRAP_TA = 1
+SHDR_ENCRYPTED_TA = 2
+SHDR_MAGIC = 0x4f545348
+SHDR_SIZE = 20
+
 
 def uuid_parse(s):
     from uuid import UUID
@@ -198,11 +203,11 @@
 
     hdr_version = args.ta_version  # struct shdr_bootstrap_ta::ta_version
 
-    magic = 0x4f545348   # SHDR_MAGIC
+    magic = SHDR_MAGIC
     if args.enc_key:
-        img_type = 2         # SHDR_ENCRYPTED_TA
+        img_type = SHDR_ENCRYPTED_TA
     else:
-        img_type = 1         # SHDR_BOOTSTRAP_TA
+        img_type = SHDR_BOOTSTRAP_TA
 
     shdr = struct.pack('<IIIIHH',
                        magic, img_type, img_size, algo[args.algo],