psa: Import latest image signing scripts from TF-M

Import the latest image signing scripts from TF-M version
TF-Mv1.0-85-g3b7cc95a042c.

Signed-off-by: Devaraj Ranganna <[email protected]>

Author: urutva

tools/psa/tfm/bin_utils/assemble.py

@@ -25,7 +25,7 @@
 import re
 import os
 import shutil
-from . import macro_parser
+import macro_parser
 
 offset_re = re.compile(r"^\s*RE_([0-9A-Z_]+)_IMAGE_OFFSET\s*=\s*(.*)")
 size_re = re.compile(r"^\s*RE_([0-9A-Z_]+)_IMAGE_MAX_SIZE\s*=\s*(.*)")

tools/psa/tfm/bin_utils/imgtool.py

@@ -19,36 +19,15 @@
 import os
 import re
 import argparse
-from .imgtool_lib import keys
-from .imgtool_lib import image
-from .imgtool_lib import version
+from imgtool_lib import keys
+from imgtool_lib import image
+from imgtool_lib import version
 import sys
+import macro_parser
 
 sign_bin_size_re = re.compile(r"^\s*RE_SIGN_BIN_SIZE\s*=\s*(.*)")
 image_load_address_re = re.compile(r"^\s*RE_IMAGE_LOAD_ADDRESS\s*=\s*(.*)")
 
-def find_load_address(args):
-    load_address_re = re.compile(r"^#define\sIMAGE_LOAD_ADDRESS\s+(0x[0-9a-fA-F]+)")
-
-    if os.path.isabs(args.layout):
-            configFile = args.layout
-    else:
-        scriptsDir = os.path.dirname(os.path.abspath(__file__))
-        configFile = os.path.join(scriptsDir, args.layout)
-
-    ramLoadAddress = None
-    with open(configFile, 'r') as flash_layout_file:
-        for line in flash_layout_file:
-            m = load_address_re.match(line)
-            if m is not None:
-                ramLoadAddress = int(m.group(1), 0)
-                print("**[INFO]** Writing load address from the macro in "
-                      "flash_layout.h to the image header.. "
-                       + hex(ramLoadAddress)
-                       + " (dec. " + str(ramLoadAddress) + ")")
-                break
-    return ramLoadAddress
-
 # Returns the last version number if present, or None if not
 def get_last_version(path):
     if (os.path.isfile(path) == False): # Version file not present
@@ -131,15 +110,15 @@ def do_sign(args):
     else:
         sw_type = "NSPE_SPE"
 
-    pad_size = args.pad
+    pad_size = macro_parser.evaluate_macro(args.layout, sign_bin_size_re, 0, 1)
     img = image.Image.load(args.infile,
                            version=version_num,
                            header_size=args.header_size,
                            security_cnt=args.security_counter,
                            included_header=args.included_header,
                            pad=pad_size)
     key = keys.load(args.key, args.public_key_format) if args.key else None
-    ram_load_address = find_load_address(args)
+    ram_load_address = macro_parser.evaluate_macro(args.layout, image_load_address_re, 0, 1)
     img.sign(sw_type, key, ram_load_address, args.dependencies)
 
     if pad_size:

tools/psa/tfm/bin_utils/imgtool_lib/boot_record.py

@@ -15,7 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import print_function
 import os
 import sys
 import cbor

tools/psa/tfm/bin_utils/imgtool_lib/image.py

@@ -209,7 +209,7 @@ def sign(self, sw_type, key, ramLoadAddress, dependencies=None):
             else:
                 tlv.add('KEY', pub)
 
-            sig = key.sign(bytes(self.payload))
+            sig = key.sign(self.payload)
             tlv.add(key.sig_tlv(), sig)
 
         self.payload += tlv.get()

tools/psa/tfm/bin_utils/imgtool_lib/keys.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 # Copyright (c) 2017,2019 Linaro Limited.
 # Copyright (c) 2017-2019, Arm Limited.
 #