diff --git a/provision/headers/ProvisionStorage.h b/provision/headers/ProvisionStorage.h index 92a3448f..4486e8e8 100644 --- a/provision/headers/ProvisionStorage.h +++ b/provision/headers/ProvisionStorage.h @@ -165,11 +165,11 @@ struct Storage : public GenericStorage, public: friend class Manager; - friend class Protocol1; - friend class Command; - friend class CsrCommand; - friend class ReadCommand; - friend class WriteCommand; + friend struct Protocol1; + friend struct Command; + friend struct CsrCommand; + friend struct ReadCommand; + friend struct WriteCommand; // // Initialization @@ -238,7 +238,7 @@ struct Storage : public GenericStorage, CHIP_ERROR SetTestEventTriggerKey(const ByteSpan & value); CHIP_ERROR GetTestEventTriggerKey(MutableByteSpan & keySpan) override; - CHIP_ERROR DecryptUsingOtaTlvEncryptionKey(MutableByteSpan & block, uint32_t & mIVOffset); + CHIP_ERROR DecryptUsingOtaTlvEncryptionKey(MutableByteSpan & block, uint32_t & mIVOffset) override; CHIP_ERROR GetOtaTlvEncryptionKeyId(uint32_t & value) override; // diff --git a/provision/libs/libProvision-efr32mg24.a b/provision/libs/libProvision-efr32mg24.a new file mode 100644 index 00000000..55ea4fc1 Binary files /dev/null and b/provision/libs/libProvision-efr32mg24.a differ diff --git a/provision/libs/libProvision-efr32mg26.a b/provision/libs/libProvision-efr32mg26.a new file mode 100644 index 00000000..0fdd1ca2 Binary files /dev/null and b/provision/libs/libProvision-efr32mg26.a differ diff --git a/provision/libs/libProvision-mgm24.a b/provision/libs/libProvision-mgm24.a new file mode 100644 index 00000000..8c195df2 Binary files /dev/null and b/provision/libs/libProvision-mgm24.a differ diff --git a/provision/libs/libProvision-si917.a b/provision/libs/libProvision-si917.a new file mode 100644 index 00000000..13a667dd Binary files /dev/null and b/provision/libs/libProvision-si917.a differ diff --git a/provision/libs/libProvisionFlash-efr32mg24.a b/provision/libs/libProvisionFlash-efr32mg24.a new file mode 100644 index 00000000..adc69665 Binary files /dev/null and b/provision/libs/libProvisionFlash-efr32mg24.a differ diff --git a/provision/libs/libProvisionFlash-efr32mg26.a b/provision/libs/libProvisionFlash-efr32mg26.a new file mode 100644 index 00000000..77491fb3 Binary files /dev/null and b/provision/libs/libProvisionFlash-efr32mg26.a differ diff --git a/provision/libs/libProvisionFlash-mgm24.a b/provision/libs/libProvisionFlash-mgm24.a new file mode 100644 index 00000000..f5bfb113 Binary files /dev/null and b/provision/libs/libProvisionFlash-mgm24.a differ diff --git a/provision/libs/libProvisionPSA-si917.a b/provision/libs/libProvisionPSA-si917.a new file mode 100644 index 00000000..bd31cfa8 Binary files /dev/null and b/provision/libs/libProvisionPSA-si917.a differ diff --git a/provision/modules/util.py b/provision/modules/util.py index f8ceba6d..2fe48510 100644 --- a/provision/modules/util.py +++ b/provision/modules/util.py @@ -1,5 +1,6 @@ import json import os +import shlex import subprocess import sys import traceback @@ -60,7 +61,7 @@ def normalize(self, base, path=None): @staticmethod def quote(path): s = path and path.strip().strip('"') or '' - return '"{}"'.format(os.path.normpath(s)) + return os.path.normpath(s) class File: @@ -121,14 +122,13 @@ def write(self, data): def execute(args, output=False, check=True, env=None, retry=1, dir=None): sys.stdout.reconfigure(encoding='utf-8') args = [str(x) for x in args] - cmd = ' '.join(args) - print("{}> {}\n".format(MARGIN, cmd)) + print("{}> {}\n".format(MARGIN, shlex.join(args))) if env is None: env = os.environ.copy() if output: try: - return subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT, env=env, cwd=dir) + return subprocess.check_output(args, shell=False, stderr=subprocess.STDOUT, env=env, cwd=dir) except subprocess.CalledProcessError as err: print("{}Command output:\n{}".format(MARGIN, err.output.decode() if err.output else "No output")) print("{}Return code: {}".format(MARGIN, err.returncode)) @@ -145,7 +145,7 @@ def execute(args, output=False, check=True, env=None, retry=1, dir=None): retry = retry - 1 try: # Capture both stdout and stderr for better debugging - result = subprocess.run(cmd, shell=True, env=env, cwd=dir, + result = subprocess.run(args, shell=False, env=env, cwd=dir, capture_output=True, text=True) if result.returncode == 0: return 0