February 2024 - gerrit-log - lists.osmocom.org

[S] Change in ...osmo-epdg[master]: aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35863?usp=email ) Change subject: aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE ...................................................................... aaa_ue_fsm: S6b AAR should trigger SWx SAR with type=PGW_UPDATE Change-Id: If0f0bfa21117c65c0ef7c831746b50eb83908778 --- M src/aaa_ue_fsm.erl 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/63/35863/1 diff --git a/src/aaa_ue_fsm.erl b/src/aaa_ue_fsm.erl index c043cdb..e395d58 100644 --- a/src/aaa_ue_fsm.erl +++ b/src/aaa_ue_fsm.erl @@ -186,7 +186,7 @@ state_authenticated({call, {Pid, _Tag} = From}, {rx_s6b_aar, Apn}, Data) -> lager:info("ue_fsm state_authenticated event=rx_s6b_aar Apn=~p, ~p~n", [Apn, Data]), case aaa_diameter_swx:server_assignment_request(Data#ue_fsm_data.imsi, - ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_REGISTRATION', + ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_PGW_UPDATE', Apn) of ok -> Data1 = Data#ue_fsm_data{s6b_resp_pid = Pid, apn = Apn}, {next_state, state_authenticated_wait_swx_saa, Data1, [{reply,From,ok}]}; @@ -246,7 +246,7 @@ state_authenticated_wait_swx_saa({call, From}, {rx_swx_saa, SAType, ResultCode}, Data) -> lager:info("ue_fsm state_authenticated_wait_swx_saa event=rx_swx_saa SAType=~p ResulCode=~p, ~p~n", [SAType, ResultCode, Data]), case SAType of - ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_REGISTRATION' -> + ?'DIAMETER_CX_SERVER-ASSIGNMENT-TYPE_PGW_UPDATE' -> aaa_diameter_s6b:tx_aa_answer(Data#ue_fsm_data.s6b_resp_pid, ResultCode), Data1 = Data#ue_fsm_data{pgw_sess_active = true, s6b_resp_pid = undefined}, {next_state, state_authenticated, Data1, [{reply,From,ok}]}; -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35863?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: erlang/osmo-epdg Gerrit-Branch: master Gerrit-Change-Id: If0f0bfa21117c65c0ef7c831746b50eb83908778 Gerrit-Change-Number: 35863 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: tlv.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35850?usp=email ) Change subject: pylint: tlv.py ...................................................................... pylint: tlv.py pySim/tlv.py:29:0: W0401: Wildcard import pySim.exceptions (wildcard-import) pySim/tlv.py:43:4: C0204: Metaclass class method __new__ should have 'mcs' as first argument (bad-mcs-classmethod-argument) pySim/tlv.py:66:4: C0204: Metaclass class method __new__ should have 'mcs' as first argument (bad-mcs-classmethod-argument) pySim/tlv.py:89:11: C0121: Comparison 'self.decoded == None' should be 'self.decoded is None' (singleton-comparison) pySim/tlv.py:170:8: R1703: The if statement can be replaced with 'return bool(test)' (simplifiable-if-statement) pySim/tlv.py:202:4: W0246: Useless parent or super() delegation in method '__init__' (useless-parent-delegation) pySim/tlv.py:257:4: W0246: Useless parent or super() delegation in method '__init__' (useless-parent-delegation) pySim/tlv.py:308:4: W0246: Useless parent or super() delegation in method '__init__' (useless-parent-delegation) pySim/tlv.py:383:15: C0121: Comparison 'tag == None' should be 'tag is None' (singleton-comparison) pySim/tlv.py:382:17: W0612: Unused variable 'r' (unused-variable) pySim/tlv.py:389:16: W0612: Unused variable 'dec' (unused-variable) pySim/tlv.py:461:22: R1718: Consider using a set comprehension (consider-using-set-comprehension) pySim/tlv.py:473:0: C0206: Consider iterating with .items() (consider-using-dict-items) pySim/tlv.py:473:58: C0201: Consider iterating the dictionary directly instead of calling .keys() (consider-iterating-dictionary) pySim/tlv.py:20:0: W0611: Unused Optional imported from typing (unused-import) pySim/tlv.py:20:0: W0611: Unused Dict imported from typing (unused-import) pySim/tlv.py:20:0: W0611: Unused Any imported from typing (unused-import) pySim/tlv.py:21:0: W0611: Unused bidict imported from bidict (unused-import) pySim/tlv.py:28:0: W0611: Unused LV imported from pySim.construct (unused-import) pySim/tlv.py:28:0: W0611: Unused HexAdapter imported from pySim.construct (unused-import) pySim/tlv.py:28:0: W0611: Unused BcdAdapter imported from pySim.construct (unused-import) pySim/tlv.py:28:0: W0611: Unused BitsRFU imported from pySim.construct (unused-import) pySim/tlv.py:28:0: W0611: Unused GsmStringAdapter imported from pySim.construct (unused-import) pySim/tlv.py:29:0: W0614: Unused import(s) NoCardError, ProtocolError, ReaderError and SwMatchError from wildcard import of pySim.exceptions (unused-wildcard-import) Change-Id: Ic22d00d3ae73ad81167276d9482b7b86a04476ba --- M pySim/tlv.py 1 file changed, 54 insertions(+), 35 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/tlv.py b/pySim/tlv.py index 0dfb858..8bf43c6 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -16,21 +16,18 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. - -from typing import Optional, List, Dict, Any, Tuple -from bidict import bidict +import inspect +import abc +import re +from typing import List, Tuple from pySim.utils import bertlv_encode_len, bertlv_parse_len, bertlv_encode_tag, bertlv_parse_tag from pySim.utils import comprehensiontlv_encode_tag, comprehensiontlv_parse_tag from pySim.utils import bertlv_parse_tag_raw, comprehensiontlv_parse_tag_raw from pySim.utils import dgi_parse_tag_raw, dgi_parse_len, dgi_encode_tag, dgi_encode_len -from pySim.construct import build_construct, parse_construct, LV, HexAdapter, BcdAdapter, BitsRFU, GsmStringAdapter -from pySim.exceptions import * +from pySim.construct import build_construct, parse_construct -import inspect -import abc -import re def camel_to_snake(name): name = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', name) @@ -40,9 +37,9 @@ """Metaclass which we use to set some class variables at the time of defining a subclass. This allows us to create subclasses for each TLV/IE type, where the class represents fixed parameters like the tag/type and instances of it represent the actual TLV data.""" - def __new__(metacls, name, bases, namespace, **kwargs): - #print("TlvMeta_new_(metacls=%s, name=%s, bases=%s, namespace=%s, kwargs=%s)" % (metacls, name, bases, namespace, kwargs)) - x = super().__new__(metacls, name, bases, namespace) + def __new__(mcs, name, bases, namespace, **kwargs): + #print("TlvMeta_new_(mcs=%s, name=%s, bases=%s, namespace=%s, kwargs=%s)" % (mcs, name, bases, namespace, kwargs)) + x = super().__new__(mcs, name, bases, namespace) # this becomes a _class_ variable, not an instance variable x.tag = namespace.get('tag', kwargs.get('tag', None)) x.desc = namespace.get('desc', kwargs.get('desc', None)) @@ -63,9 +60,9 @@ """Metaclass which we use to set some class variables at the time of defining a subclass. This allows us to create subclasses for each Collection type, where the class represents fixed parameters like the nested IE classes and instances of it represent the actual TLV data.""" - def __new__(metacls, name, bases, namespace, **kwargs): - #print("TlvCollectionMeta_new_(metacls=%s, name=%s, bases=%s, namespace=%s, kwargs=%s)" % (metacls, name, bases, namespace, kwargs)) - x = super().__new__(metacls, name, bases, namespace) + def __new__(mcs, name, bases, namespace, **kwargs): + #print("TlvCollectionMeta_new_(mcs=%s, name=%s, bases=%s, namespace=%s, kwargs=%s)" % (mcs, name, bases, namespace, kwargs)) + x = super().__new__(mcs, name, bases, namespace) # this becomes a _class_ variable, not an instance variable x.possible_nested = namespace.get('nested', kwargs.get('nested', None)) return x @@ -86,7 +83,7 @@ def to_bytes(self, context: dict = {}) -> bytes: """Convert from internal representation to binary bytes. Store the binary result in the internal state and return it.""" - if self.decoded == None: + if self.decoded is None: do = b'' elif self._construct: do = build_construct(self._construct, self.decoded, context) @@ -167,10 +164,7 @@ def is_constructed(self): """Is this IE constructed by further nested IEs?""" - if len(self.children): - return True - else: - return False + return bool(len(self.children) > 0) @abc.abstractmethod def to_ie(self, context: dict = {}) -> bytes: @@ -199,9 +193,6 @@ class TLV_IE(IE): """Abstract base class for various TLV type Information Elements.""" - def __init__(self, **kwargs): - super().__init__(**kwargs) - def _compute_tag(self) -> int: """Compute the tag (sometimes the tag encodes part of the value).""" return self.tag @@ -254,9 +245,6 @@ class BER_TLV_IE(TLV_IE): """TLV_IE formatted as ASN.1 BER described in ITU-T X.690 8.1.2.""" - def __init__(self, **kwargs): - super().__init__(**kwargs) - @classmethod def _decode_tag(cls, do: bytes) -> Tuple[dict, bytes]: return bertlv_parse_tag(do) @@ -305,9 +293,6 @@ class DGI_TLV_IE(TLV_IE): """TLV_IE formated as GlobalPlatform Systems Scripting Language Specification v1.1.0 Annex B.""" - def __init__(self, **kwargs): - super().__init__(**kwargs) - @classmethod def _parse_tag_raw(cls, do: bytes) -> Tuple[int, bytes]: return dgi_parse_tag_raw(do) @@ -379,14 +364,14 @@ while len(remainder): context['siblings'] = res # obtain the tag at the start of the remainder - tag, r = first._parse_tag_raw(remainder) - if tag == None: + tag, _r = first._parse_tag_raw(remainder) + if tag is None: break if tag in self.members_by_tag: cls = self.members_by_tag[tag] # create an instance and parse accordingly inst = cls() - dec, remainder = inst.from_tlv(remainder, context=context) + _dec, remainder = inst.from_tlv(remainder, context=context) res.append(inst) else: # unknown tag; create the related class on-the-fly using the same base class @@ -397,7 +382,7 @@ cls._to_bytes = lambda s: bytes.fromhex(s.decoded['raw']) # create an instance and parse accordingly inst = cls() - dec, remainder = inst.from_tlv(remainder, context=context) + _dec, remainder = inst.from_tlv(remainder, context=context) res.append(inst) self.children = res return res @@ -458,7 +443,7 @@ return True def are_elements_unique(lod): - set_of_keys = set([list(x.keys())[0] for x in lod]) + set_of_keys = {list(x.keys())[0] for x in lod} return len(lod) == len(set_of_keys) if isinstance(inp, list): @@ -470,10 +455,10 @@ newdict[key] = e[key] inp = newdict # process result as any native dict - return {k:flatten_dict_lists(inp[k]) for k in inp.keys()} + return {k:flatten_dict_lists(v) for k,v in inp.items()} else: return [flatten_dict_lists(x) for x in inp] elif isinstance(inp, dict): - return {k:flatten_dict_lists(inp[k]) for k in inp.keys()} + return {k:flatten_dict_lists(v) for k,v in inp.items()} else: return inp -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35850?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic22d00d3ae73ad81167276d9482b7b86a04476ba Gerrit-Change-Number: 35850 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: construct.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35851?usp=email ) Change subject: pylint: construct.py ...................................................................... pylint: construct.py pySim/construct.py:47:0: W0311: Bad indentation. Found 16 spaces, expected 12 (bad-indentation) pySim/construct.py:59:0: W0311: Bad indentation. Found 16 spaces, expected 12 (bad-indentation) pySim/construct.py:82:0: W0311: Bad indentation. Found 16 spaces, expected 12 (bad-indentation) pySim/construct.py:1:0: C0114: Missing module docstring (missing-module-docstring) pySim/construct.py:14:0: W0105: String statement has no effect (pointless-string-statement) pySim/construct.py:178:29: W0613: Unused argument 'instr' (unused-argument) pySim/construct.py:199:15: C0121: Comparison 'codepoint_prefix == None' should be 'codepoint_prefix is None' (singleton-comparison) pySim/construct.py:269:15: C0121: Comparison 'v == False' should be 'v is False' if checking for the singleton value False, or 'not v' if testing for falsiness (singleton-comparison) pySim/construct.py:271:17: C0121: Comparison 'v == True' should be 'v is True' if checking for the singleton value True, or 'v' if testing for truthiness (singleton-comparison) pySim/construct.py:385:15: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) pySim/construct.py:392:15: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) pySim/construct.py:408:11: C0123: Use isinstance() rather than type() for a typecheck. (unidiomatic-typecheck) pySim/construct.py:421:7: R1701: Consider merging these isinstance calls to isinstance(c, (Container, dict)) (consider-merging-isinstance) pySim/construct.py:444:11: R1729: Use a generator instead 'all(v == 255 for v in raw_bin_data)' (use-a-generator) pySim/construct.py:434:81: W0613: Unused argument 'exclude_prefix' (unused-argument) pySim/construct.py:544:12: W0707: Consider explicitly re-raising using 'raise IntegerError(str(e), path=path) from e' (raise-missing-from) pySim/construct.py:561:8: R1731: Consider using 'nbytes = max(nbytes, minlen)' instead of unnecessary if block (consider-using-max-builtin) pySim/construct.py:573:12: W0707: Consider explicitly re-raising using 'raise IntegerError(str(e), path=path) from e' (raise-missing-from) pySim/construct.py:3:0: C0411: standard import "import typing" should be placed before "from construct.lib.containers import Container, ListContainer" (wrong-import-order) pySim/construct.py:10:0: C0411: third party import "import gsm0338" should be placed before "from pySim.utils import b2h, h2b, swap_nibbles" (wrong-import-order) pySim/construct.py:11:0: C0411: standard import "import codecs" should be placed before "from construct.lib.containers import Container, ListContainer" (wrong-import-order) pySim/construct.py:12:0: C0411: standard import "import ipaddress" should be placed before "from construct.lib.containers import Container, ListContainer" (wrong-import-order) pySim/construct.py:7:0: W0611: Unused BitwisableString imported from construct.core (unused-import) Change-Id: Ic8a06d65a7bcff9ef399fe4e7e5d82f271c946bb --- M pySim/construct.py 1 file changed, 63 insertions(+), 28 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/construct.py b/pySim/construct.py index 8ef7941..881f1f2 100644 --- a/pySim/construct.py +++ b/pySim/construct.py @@ -1,17 +1,20 @@ -from construct.lib.containers import Container, ListContainer -from construct.core import EnumIntegerString +"""Utility code related to the integration of the 'construct' declarative parser.""" + import typing -from construct import Adapter, Prefixed, Int8ub, GreedyBytes, Default, Flag, Byte, Construct, Enum -from construct import BitsInteger, BitStruct, Bytes, StreamError, stream_read_entire, stream_write -from construct import SizeofError, IntegerError, swapbytes -from construct.core import evaluate, BitwisableString -from construct.lib import integertypes -from pySim.utils import b2h, h2b, swap_nibbles -import gsm0338 import codecs import ipaddress -"""Utility code related to the integration of the 'construct' declarative parser.""" +import gsm0338 + +from construct.lib.containers import Container, ListContainer +from construct.core import EnumIntegerString +from construct import Adapter, Prefixed, Int8ub, GreedyBytes, Default, Flag, Byte, Construct, Enum +from construct import BitsInteger, BitStruct, Bytes, StreamError, stream_read_entire, stream_write +from construct import SizeofError, IntegerError, swapbytes +from construct.core import evaluate +from construct.lib import integertypes + +from pySim.utils import b2h, h2b, swap_nibbles # (C) 2021-2022 by Harald Welte <laforge(a)osmocom.org> # @@ -44,7 +47,7 @@ def _decode(self, obj, context, path): # In case the string contains only 0xff bytes we interpret it as an empty string if obj == b'\xff' * len(obj): - return "" + return "" return codecs.decode(obj, "utf-8") def _encode(self, obj, context, path): @@ -56,7 +59,7 @@ def _decode(self, obj, context, path): # In case the string contains only 0xff bytes we interpret it as an empty string if obj == b'\xff' * len(obj): - return "" + return "" # one of the magic bytes of TS 102 221 Annex A if obj[0] in [0x80, 0x81, 0x82]: ad = Ucs2Adapter(GreedyBytes) @@ -79,7 +82,7 @@ def _decode(self, obj, context, path): # In case the string contains only 0xff bytes we interpret it as an empty string if obj == b'\xff' * len(obj): - return "" + return "" if obj[0] == 0x80: # TS 102 221 Annex A Variant 1 return codecs.decode(obj[1:], 'utf_16_be') @@ -177,7 +180,7 @@ def _encode_variant1(instr: str) -> bytes: """Encode according to TS 102 221 Annex A Variant 1""" - return b'\x80' + codecs.encode(obj, 'utf_16_be') + return b'\x80' + codecs.encode(instr, 'utf_16_be') def _encode_variant2(instr: str) -> bytes: """Encode according to TS 102 221 Annex A Variant 2""" @@ -196,7 +199,7 @@ assert codepoint_prefix == c_prefix enc = (0x80 + (c_codepoint & 0x7f)).to_bytes(1, byteorder='big') chars += enc - if codepoint_prefix == None: + if codepoint_prefix is None: codepoint_prefix = 0 return hdr + codepoint_prefix.to_bytes(1, byteorder='big') + chars @@ -266,9 +269,9 @@ # skip all private entries if k.startswith('_'): continue - if v == False: + if v is False: obj[k] = True - elif v == True: + elif v is True: obj[k] = False return obj @@ -382,14 +385,14 @@ self.min_len = min_len def _decode(self, obj, context, path): - assert type(obj) == bytes + assert isinstance(obj, bytes) # pad with suppressed/missing bytes if len(obj) < self.total_length: obj += self.default_value * (self.total_length - len(obj)) return int.from_bytes(obj, 'big') def _encode(self, obj, context, path): - assert type(obj) == int + assert isinstance(obj, int) obj = obj.to_bytes(self.total_length, 'big') # remove trailing bytes if they are zero while len(obj) > self.min_len and obj[-1] == self.default_value[0]: @@ -405,20 +408,20 @@ for (key, value) in d.items(): if key.startswith(exclude_prefix): continue - if type(value) is dict: + if isinstance(value, dict): res[key] = filter_dict(value) else: res[key] = value return res -def normalize_construct(c): +def normalize_construct(c, exclude_prefix: str = '_'): """Convert a construct specific type to a related base type, mostly useful so we can serialize it.""" # we need to include the filter_dict as we otherwise get elements like this # in the dict: '_io': <_io.BytesIO object at 0x7fdb64e05860> which we cannot json-serialize - c = filter_dict(c) - if isinstance(c, Container) or isinstance(c, dict): + c = filter_dict(c, exclude_prefix) + if isinstance(c, (Container, dict)): r = {k: normalize_construct(v) for (k, v) in c.items()} elif isinstance(c, ListContainer): r = [normalize_construct(x) for x in c] @@ -441,11 +444,11 @@ # if the input is all-ff, this means the content is undefined. Let's avoid passing StreamError # exceptions in those situations (which might occur if a length field 0xff is 255 but then there's # actually less bytes in the remainder of the file. - if all([v == 0xff for v in raw_bin_data]): + if all(v == 0xff for v in raw_bin_data): return None else: raise e - return normalize_construct(parsed) + return normalize_construct(parsed, exclude_prefix) def build_construct(c, decoded_data, context: dict = {}): """Helper function to handle total_len.""" @@ -558,8 +561,7 @@ # round up to the minimum number # of bytes we anticipate - if nbytes < minlen: - nbytes = minlen + nbytes = max(nbytes, minlen) return nbytes @@ -570,7 +572,7 @@ try: data = obj.to_bytes(length, byteorder='big', signed=self.signed) except ValueError as e: - raise IntegerError(str(e), path=path) + raise IntegerError(str(e), path=path) from e if evaluate(self.swapped, context): data = swapbytes(data) stream_write(stream, data, length, path) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35851?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic8a06d65a7bcff9ef399fe4e7e5d82f271c946bb Gerrit-Change-Number: 35851 Gerrit-PatchSet: 4 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: pySim-shell: Fix regression in 'apdu' command on cards without profile

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35860?usp=email ) Change subject: pySim-shell: Fix regression in 'apdu' command on cards without profile ...................................................................... pySim-shell: Fix regression in 'apdu' command on cards without profile Cards where no profile was detected don't have a logical channel, and hence must use the raw APDU at all times. Change-Id: I08e5d190bdb4e62ee808bfd77584cb3e0b85a8ae Fixes: Change-Id Id0c364f772c31e11e8dfa21624d8685d253220d0 --- M pySim-shell.py 1 file changed, 14 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim-shell.py b/pySim-shell.py index 89fdf6e..127e366 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -250,7 +250,7 @@ # noted that the apdu command plays an exceptional role since it is the only card accessing command that # can be executed without the presence of a runtime state (self.rs) object. However, this also means that # self.lchan is also not present (see method equip). - if opts.raw: + if opts.raw or self.lchan is None: data, sw = self.card._scc.send_apdu(opts.APDU) else: data, sw = self.lchan.scc.send_apdu(opts.APDU) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35860?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I08e5d190bdb4e62ee808bfd77584cb3e0b85a8ae Gerrit-Change-Number: 35860 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[S] Change in pysim[master]: global_platform: Fix INSTALL [for personalization]

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35853?usp=email ) Change subject: global_platform: Fix INSTALL [for personalization] ...................................................................... global_platform: Fix INSTALL [for personalization] The APDU hex string needs to use %02x instead of %02u... Change-Id: Ic3b30ba623ee04f5190c77afd226b52165b3183f --- M pySim/global_platform/__init__.py 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index c7ea0be..ca99f5f 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -630,7 +630,7 @@ """Perform GlobalPlatform INSTALL [for personalization] command in order to inform a Security Domain that the following STORE DATA commands are meant for a specific AID (specified here).""" # Section 11.5.2.3.6 / Table 11-47 - self.install(0x20, 0x00, "0000%02u%s000000" % (len(opts.application_aid)//2, opts.application_aid)) + self.install(0x20, 0x00, "0000%02x%s000000" % (len(opts.application_aid)//2, opts.application_aid)) inst_inst_parser = argparse.ArgumentParser() inst_inst_parser.add_argument('--load-file-aid', type=is_hexstr, default='', -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35853?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic3b30ba623ee04f5190c77afd226b52165b3183f Gerrit-Change-Number: 35853 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in pysim[master]: pylint: global_platform/__init__.py

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35852?usp=email ) Change subject: pylint: global_platform/__init__.py ...................................................................... pylint: global_platform/__init__.py pySim/global_platform/__init__.py:468:4: W0221: Number of parameters was 2 in 'CardFile.decode_select_response' and is now 1 in overriding 'ADF_SD.decode_select_response' method (arguments-differ) pySim/global_platform/__init__.py:473:8: W0246: Useless parent or super() delegation in method '__init__' (useless-parent-delegation) pySim/global_platform/__init__.py:491:19: W0612: Unused variable 'sw' (unused-variable) pySim/global_platform/__init__.py:528:22: W0612: Unused variable 'sw' (unused-variable) pySim/global_platform/__init__.py:559:12: C0200: Consider using enumerate instead of iterating with range and len (consider-using-enumerate) pySim/global_platform/__init__.py:587:18: W0612: Unused variable 'sw' (unused-variable) pySim/global_platform/__init__.py:617:20: W0612: Unused variable 'dec' (unused-variable) pySim/global_platform/__init__.py:645:12: W0612: Unused variable 'data' (unused-variable) pySim/global_platform/__init__.py:645:18: W0612: Unused variable 'sw' (unused-variable) pySim/global_platform/__init__.py:746:15: C0121: Comparison 'opts.key_id == None' should be 'opts.key_id is None' (singleton-comparison) pySim/global_platform/__init__.py:746:39: C0121: Comparison 'opts.key_ver == None' should be 'opts.key_ver is None' (singleton-comparison) pySim/global_platform/__init__.py:750:15: C0121: Comparison 'opts.key_id != None' should be 'opts.key_id is not None' (singleton-comparison) pySim/global_platform/__init__.py:752:15: C0121: Comparison 'opts.key_ver != None' should be 'opts.key_ver is not None' (singleton-comparison) pySim/global_platform/__init__.py:787:16: W0612: Unused variable 'rsp_hex' (unused-variable) pySim/global_platform/__init__.py:787:25: W0612: Unused variable 'sw' (unused-variable) pySim/global_platform/__init__.py:836:30: W0612: Unused variable 'sw' (unused-variable) pySim/global_platform/__init__.py:839:12: W0612: Unused variable 'ext_auth_resp' (unused-variable) pySim/global_platform/__init__.py:846:33: W0613: Unused argument 'opts' (unused-argument) pySim/global_platform/__init__.py:878:15: R1716: Simplify chained comparison between the operands (chained-comparison) pySim/global_platform/__init__.py:886:29: W0613: Unused argument 'kvn' (unused-argument) pySim/global_platform/__init__.py:893:0: C0413: Import "from Cryptodome.Cipher import DES, DES3, AES" should be placed at the top of the module (wrong-import-position) pySim/global_platform/__init__.py:23:0: C0411: standard import "from typing import Optional, List, Dict, Tuple" should be placed before "from construct import Optional as COptional" (wrong-import-order) pySim/global_platform/__init__.py:24:0: C0411: standard import "from copy import deepcopy" should be placed before "from construct import Optional as COptional" (wrong-import-order) pySim/global_platform/__init__.py:893:0: C0411: third party import "from Cryptodome.Cipher import DES, DES3, AES" should be placed before "from pySim.global_platform.scp import SCP02, SCP03" (wrong-import-order) pySim/global_platform/__init__.py:893:0: C0412: Imports from package Cryptodome are not grouped (ungrouped-imports) Change-Id: Iea6afb5e72e035637e761bb25535f48fd4bc99f4 --- M pySim/global_platform/__init__.py 1 file changed, 53 insertions(+), 23 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 6f72bdc..c7ea0be 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -17,12 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. """ +from copy import deepcopy +from typing import Optional, List, Dict, Tuple from construct import Optional as COptional from construct import Struct, GreedyRange, FlagsEnum, Int16ub, Int24ub, Padding, Bit, Const -from typing import Optional, List, Dict, Tuple -from copy import deepcopy -from bidict import bidict from Cryptodome.Random import get_random_bytes +from Cryptodome.Cipher import DES, DES3, AES from pySim.global_platform.scp import SCP02, SCP03 from pySim.construct import * from pySim.utils import * @@ -446,15 +446,11 @@ super().__init__(aid=aid, fid=None, sfid=None, name=name, desc=desc) self.shell_commands += [self.AddlShellCommands()] - @staticmethod - def decode_select_response(res_hex: str) -> object: - return decode_select_response(res_hex) + def decode_select_response(self, data_hex: str) -> object: + return decode_select_response(data_hex) @with_default_category('Application-Specific Commands') class AddlShellCommands(CommandSet): - def __init__(self): - super().__init__() - get_data_parser = argparse.ArgumentParser() get_data_parser.add_argument('data_object_name', type=str, help='Name of the data object to be retrieved from the card') @@ -470,7 +466,7 @@ self._cmd.poutput('Unknown data object "%s", available options: %s' % (tlv_cls_name, do_names)) return - (data, sw) = self._cmd.lchan.scc.get_data(cla=0x80, tag=tlv_cls.tag) + (data, _sw) = self._cmd.lchan.scc.get_data(cla=0x80, tag=tlv_cls.tag) ie = tlv_cls() ie.from_tlv(h2b(data)) self._cmd.poutput_json(ie.to_dict()) @@ -507,7 +503,7 @@ {'last_block': len(remainder) == 0, 'encryption': encryption, 'structure': structure, 'response': response_permitted}) hdr = "80E2%02x%02x%02x" % (p1b[0], block_nr, len(chunk)) - data, sw = self._cmd.lchan.scc.send_apdu_checksw(hdr + b2h(chunk)) + data, _sw = self._cmd.lchan.scc.send_apdu_checksw(hdr + b2h(chunk)) block_nr += 1 response += data return data @@ -566,7 +562,7 @@ See GlobalPlatform CardSpecification v2.3 Section 11.8 for details.""" key_data = kvn.to_bytes(1, 'big') + build_construct(ADF_SD.AddlShellCommands.KeyDataBasic, key_dict) hdr = "80D8%02x%02x%02x" % (old_kvn, kid, len(key_data)) - data, sw = self._cmd.lchan.scc.send_apdu_checksw(hdr + b2h(key_data)) + data, _sw = self._cmd.lchan.scc.send_apdu_checksw(hdr + b2h(key_data)) return data get_status_parser = argparse.ArgumentParser() @@ -596,7 +592,7 @@ while len(remainder): # tlv sequence, each element is one GpRegistryRelatedData() grd = GpRegistryRelatedData() - dec, remainder = grd.from_tlv(remainder) + _dec, remainder = grd.from_tlv(remainder) grd_list.append(grd) if sw != '6310': return grd_list @@ -624,7 +620,7 @@ 'scope'/SetStatusScope, 'status'/CLifeCycleState, 'aid'/HexAdapter(Prefixed(Int8ub, COptional(GreedyBytes)))) apdu = build_construct(SetStatus, {'scope':scope, 'status':status, 'aid':aid}) - data, sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(apdu)) + _data, _sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(apdu)) inst_perso_parser = argparse.ArgumentParser() inst_perso_parser.add_argument('application-aid', type=is_hexstr, help='Application AID') @@ -700,13 +696,13 @@ """Perform GlobalPlaform DELETE (Key) command. If both KID and KVN are specified, exactly one key is deleted. If only either of the two is specified, multiple matching keys may be deleted.""" - if opts.key_id == None and opts.key_ver == None: + if opts.key_id is None and opts.key_ver is None: raise ValueError('At least one of KID or KVN must be specified') p2 = 0x80 if opts.delete_related_objects else 0x00 cmd = "" - if opts.key_id != None: + if opts.key_id is not None: cmd += "d001%02x" % opts.key_id - if opts.key_ver != None: + if opts.key_ver is not None: cmd += "d201%02x" % opts.key_ver self.delete(0x00, p2, cmd) @@ -759,17 +755,17 @@ def _establish_scp(self, scp, host_challenge, security_level): # perform the common functionality shared by SCP02 and SCP03 establishment init_update_apdu = scp.gen_init_update_apdu(host_challenge=host_challenge) - init_update_resp, sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(init_update_apdu)) + init_update_resp, _sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(init_update_apdu)) scp.parse_init_update_resp(h2b(init_update_resp)) ext_auth_apdu = scp.gen_ext_auth_apdu(security_level) - ext_auth_resp, sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(ext_auth_apdu)) + _ext_auth_resp, _sw = self._cmd.lchan.scc.send_apdu_checksw(b2h(ext_auth_apdu)) self._cmd.poutput("Successfully established a %s secure channel" % str(scp)) # store a reference to the SCP instance self._cmd.lchan.scc.scp = scp self._cmd.update_prompt() - def do_release_scp(self, opts): + def do_release_scp(self, _opts): """Release a previously establiehed secure channel.""" if not self._cmd.lchan.scc.scp: self._cmd.poutput("Cannot release SCP as none is established") @@ -801,7 +797,7 @@ class GpCardKeyset: """A single set of GlobalPlatform card keys and the associated KVN.""" def __init__(self, kvn: int, enc: bytes, mac: bytes, dek: bytes): - assert kvn >= 0 and kvn < 256 + assert 0 < kvn < 256 assert len(enc) == len(mac) == len(dek) self.kvn = kvn self.enc = enc @@ -810,13 +806,12 @@ @classmethod def from_single_key(cls, kvn: int, base_key: bytes) -> 'GpCardKeyset': - return cls(int, base_key, base_key, base_key) + return cls(kvn, base_key, base_key, base_key) def __str__(self): return "%s(KVN=%u, ENC=%s, MAC=%s, DEK=%s)" % (self.__class__.__name__, self.kvn, b2h(self.enc), b2h(self.mac), b2h(self.dek)) -from Cryptodome.Cipher import DES, DES3, AES def compute_kcv_des(key:bytes) -> bytes: # GP Card Spec B.6: For a DES key, the key check value is computed by encrypting 8 bytes, each with -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35852?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iea6afb5e72e035637e761bb25535f48fd4bc99f4 Gerrit-Change-Number: 35852 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 year, 5 months

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)

by pespin

Attention is currently required from: fixeria, jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email ) Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/387baa10_30fe0d34 PS2, Line 19: Rx only mode makes no sense for data calls, so in tch_recv_cb() we You may have a race condition between dropping rx valid data and signalling data transfer started here? In a voice call you don't care much, but probably in here you drop valid data? I'm not sure about all this, just sharing in case it makes sense. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 18:09:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[S] Change in osmocom-bb[master]: mobile: use tch_send_msg() in tch_csd_tx_to_l1()

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35862?usp=email ) Change subject: mobile: use tch_send_msg() in tch_csd_tx_to_l1() ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35862?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Icd5b5fad835feecd96a83fa5c83ed08037826fa6 Gerrit-Change-Number: 35862 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 18:07:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)

by Jenkins Builder

Attention is currently required from: jolly, pespin. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email ) Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... Patch Set 2: (1 comment) File src/host/layer23/src/mobile/tch.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-14222): https://gerrit.osmocom.org/c/osmocom-bb/+/35739/comment/600ec3bf_a84d7ae4 PS2, Line 62: } else { else is not generally useful after a break or return -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 05 Feb 2024 18:06:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 5 months

1
0
0 0

[M] Change in osmocom-bb[master]: mobile: init TCH state earlier (on receipt of CC ALERTING)

by fixeria

Attention is currently required from: jolly, pespin. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: mobile: init TCH state earlier (on receipt of CC ALERTING) ...................................................................... mobile: init TCH state earlier (on receipt of CC ALERTING) During a Mobile Originating voice call, we would normally start receiving traffic indications with ringback tone (or even some melody) before the call gets CONNECTed. So in order for the user to be able to hear that, we need to init the voice call handler earlier (on receipt of CC ALERTING message). We should not be transmitting voice/data frames before the call gets CONNECTed, so add 'rx_only' flag to the TCH state. In tch_send_msg() drop msgb if this flag is set. Rx only mode makes no sense for data calls, so in tch_recv_cb() we discard received DL frames and thus do not trigger sending UL frames. Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/mobile/tch.h M src/host/layer23/src/mobile/tch.c 2 files changed, 52 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/39/35739/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35739?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idd32c823639cc1f9999d77fcefe7e260e31a85ec Gerrit-Change-Number: 35739 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024