Skip to content
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.

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

fix (cbor2): add pre-check to verify cbor objects to parse #55

Merged
merged 2 commits into from
Nov 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ncs/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from jinja2 import Template
from argparse import ArgumentParser

sys.path.append(str(pathlib.Path(__file__).parents[1].absolute()))
robertstypa marked this conversation as resolved.
Show resolved Hide resolved
sys.path.insert(0, str(pathlib.Path(__file__).parents[1].absolute()))

from suit_generator.cmd_image import ImageCreator # noqa: E402

Expand Down
2 changes: 1 addition & 1 deletion suit_generator/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import sys
import pathlib

sys.path.append(str(pathlib.Path(__file__).parents[1].absolute()))
sys.path.insert(0, str(pathlib.Path(__file__).parents[1].absolute()))
robertstypa marked this conversation as resolved.
Show resolved Hide resolved

from suit_generator import cmd_parse, cmd_keys, cmd_convert, cmd_create, cmd_image, args
from suit_generator.exceptions import GeneratorError, SUITError
Expand Down
2 changes: 1 addition & 1 deletion suit_generator/suit/manifest.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ class SuitCommand(SuitUnion):
class SuitComponentIdentifierPart(SuitUnion):
"""Abstract element to define possible sub-elements."""

_metadata = Metadata(children=[SuitBchar, cbstr(SuitTstr), SuitUUID, cbstr(SuitUint), SuitBstr])
_metadata = Metadata(children=[SuitUUID, SuitBchar, cbstr(SuitTstr), cbstr(SuitUint), SuitBstr])


class SuitComponentIdentifier(SuitList):
Expand Down
Loading
Loading