Skip to content

Update provisioning tooling and libraries from main #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
silabs-matter-ci-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update provisioning tooling and libraries from main #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions provision/headers/ProvisionStorage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

//
Expand Down
Binary file added provision/libs/libProvision-efr32mg24.a
View file
Open in desktop
Binary file not shown.
Binary file added provision/libs/libProvision-efr32mg26.a
View file
Open in desktop
Binary file not shown.
Binary file added provision/libs/libProvision-mgm24.a
View file
Open in desktop
Binary file not shown.
Binary file added provision/libs/libProvision-si917.a
View file
Open in desktop
Binary file not shown.
Binary file added provision/libs/libProvisionFlash-efr32mg24.a
View file
Open in desktop
Binary file not shown.
Binary file added provision/libs/libProvisionFlash-efr32mg26.a
View file
Open in desktop
Binary file not shown.
Binary file added provision/libs/libProvisionFlash-mgm24.a
View file
Open in desktop
Binary file not shown.
Binary file added provision/libs/libProvisionPSA-si917.a
View file
Open in desktop
Binary file not shown.
10 changes: 5 additions & 5 deletions provision/modules/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import json
import os
import shlex
import subprocess
import sys
import traceback
Expand Down Expand Up @@ -60,7 +61,7 @@
@staticmethod
def quote(path):
s = path and path.strip().strip('"') or ''
return '"{}"'.format(os.path.normpath(s))
return os.path.normpath(s)


class File:
Expand Down Expand Up @@ -121,14 +122,13 @@
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)))

Check failure

Code scanning / CodeQL

Clear-text logging of sensitive information High

This expression logs
sensitive data (password)
Loading
as clear text.
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))
Expand All @@ -145,7 +145,7 @@
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
Expand Down
Loading