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

[S] Change in pysim[master]: ts_102_221: Better explain 'selected file invalidated'
by laforge 16 Jan '24

16 Jan '24

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/35565?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: ts_102_221: Better explain 'selected file invalidated' ...................................................................... ts_102_221: Better explain 'selected file invalidated' Some specs call it 'invalidated', others call it 'deactivated'. If the user is unfamiliar with this, the error message about "invalidated" might not be obvious enough; let's also mention 'deactivated' in the message and explicitly mention that it needs to be activated before use. Change-Id: I91488b0e7dc25a8970022b09e575485a4165eefa --- M docs/shell.rst M pySim-shell.py M pySim/ts_102_221.py 3 files changed, 37 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/65/35565/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35565?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: I91488b0e7dc25a8970022b09e575485a4165eefa Gerrit-Change-Number: 35565 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

[M] Change in pysim[master]: TLV: Add DGI encoding of "GP Scripting Language Annex B"
by laforge 16 Jan '24

16 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35556?usp=email ) Change subject: TLV: Add DGI encoding of "GP Scripting Language Annex B" ...................................................................... TLV: Add DGI encoding of "GP Scripting Language Annex B" The DGI encoding is specified in Annex B of the "GlobalPlatform Systems Scripting Language Specification v1.1.0" which is an "archived" specification that is no longer published by GlobalPlatform, despite it being referenced from the GlobalPlatform Card Specification v2.3, which is the basis of the GSMA eSIM specifications. For some reason it was the belief of the specification authors that yet another format of TLV encoding is needed, in addition to the BER-TLV and COMPREHENSION-TLV used by the very same specifications. The encoding of the tag is not really specified anywhere, but I've only seen 16-bit examples. The encoding of the length is specified and implemented here accordingly. Change-Id: Ie29ab7eb39f3165f3d695fcc1f02051338095697 --- M pySim/tlv.py M pySim/utils.py M tests/test_utils.py 3 files changed, 97 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/tlv.py b/pySim/tlv.py index 826f02f..31051aa 100644 --- a/pySim/tlv.py +++ b/pySim/tlv.py @@ -24,6 +24,7 @@ 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 * @@ -302,6 +303,27 @@ return bertlv_encode_len(len(val)) +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) + + @classmethod + def _parse_len(cls, do: bytes) -> Tuple[int, bytes]: + return dgi_parse_len(do) + + def _encode_tag(self) -> bytes: + return dgi_encode_tag(self._compute_tag()) + + def _encode_len(self, val: bytes) -> bytes: + return dgi_encode_len(len(val)) + + class TLV_IE_Collection(metaclass=TlvCollectionMeta): # we specify the metaclass so any downstream subclasses will automatically use it """A TLV_IE_Collection consists of multiple TLV_IE classes identified by their tags. diff --git a/pySim/utils.py b/pySim/utils.py index 6523d98..581abf2 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -358,6 +358,42 @@ return (tagdict, length, value, remainder) +def dgi_parse_tag_raw(binary: bytes) -> Tuple[int, bytes]: + # In absence of any clear spec guidance we assume it's always 16 bit + return int.from_bytes(binary[:2], 'big'), binary[2:] + +def dgi_encode_tag(t: int) -> bytes: + return t.to_bytes(2, 'big') + +def dgi_encode_len(length: int) -> bytes: + """Encode a single Length value according to GlobalPlatform Systems Scripting Language + Specification v1.1.0 Annex B. + Args: + length : length value to be encoded + Returns: + binary output data of encoded length field + """ + if length < 255: + return length.to_bytes(1, 'big') + elif length <= 0xffff: + return b'\xff' + length.to_bytes(2, 'big') + else: + raise ValueError("Length > 32bits not supported") + +def dgi_parse_len(binary: bytes) -> Tuple[int, bytes]: + """Parse a single Length value according to GlobalPlatform Systems Scripting Language + Specification v1.1.0 Annex B. + Args: + binary : binary input data of BER-TLV length field + Returns: + Tuple of (length, remainder) + """ + if binary[0] == 255: + assert len(binary) >= 3 + return ((binary[1] << 8) | binary[2]), binary[3:] + else: + return binary[0], binary[1:] + # IMSI encoded format: # For IMSI 0123456789ABCDE: # diff --git a/tests/test_utils.py b/tests/test_utils.py index ea1964b..7609f80 100755 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -222,5 +222,19 @@ res = utils.comprehensiontlv_encode_tag({'tag': 0x1234, 'comprehension':True}) self.assertEqual(res, b'\x7f\x92\x34') +class TestDgiTlv(unittest.TestCase): + def test_DgiTlvLenEnc(self): + self.assertEqual(utils.dgi_encode_len(10), b'\x0a') + self.assertEqual(utils.dgi_encode_len(254), b'\xfe') + self.assertEqual(utils.dgi_encode_len(255), b'\xff\x00\xff') + self.assertEqual(utils.dgi_encode_len(65535), b'\xff\xff\xff') + with self.assertRaises(ValueError): + utils.dgi_encode_len(65536) + + def testDgiTlvLenDec(self): + self.assertEqual(utils.dgi_parse_len(b'\x0a\x0b'), (10, b'\x0b')) + self.assertEqual(utils.dgi_parse_len(b'\xfe\x0b'), (254, b'\x0b')) + self.assertEqual(utils.dgi_parse_len(b'\xff\x00\xff\x0b'), (255, b'\x0b')) + if __name__ == "__main__": unittest.main() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35556?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: Ie29ab7eb39f3165f3d695fcc1f02051338095697 Gerrit-Change-Number: 35556 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in pysim[master]: global_platform: More definitions to support key loading
by laforge 16 Jan '24

16 Jan '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/35564?usp=email ) Change subject: global_platform: More definitions to support key loading ...................................................................... global_platform: More definitions to support key loading With the definitions from this commit, we can build key loading TLVs, which is used to load ECC keys into eUICCs. Change-Id: I853c94d37939ef3dd795f893232b0276a5a4af81 --- M pySim/global_platform.py 1 file changed, 104 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/global_platform.py b/pySim/global_platform.py index 7e0493c..f7a4f64 100644 --- a/pySim/global_platform.py +++ b/pySim/global_platform.py @@ -114,8 +114,82 @@ class KeyInformation(BER_TLV_IE, tag=0xe0, nested=[KeyInformationData]): pass -# GlobalPlatform v2.3.1 Section H.4 -class ScpInformation(BER_TLV_IE, tag=0xa0): +# GP v2.3 11.1.9 +KeyUsageQualifier = Struct('byte1'/FlagsEnum(Byte, verification_encryption=0x80, + computation_decipherment=0x40, + sm_response=0x20, + sm_command=0x10, + confidentiality=0x08, + crypto_checksum=0x04, + digital_signature=0x02, + crypto_authorization=0x01), + 'byte2'/COptional(FlagsEnum(Byte, key_agreement=0x80))) + +# GP v2.3 11.1.10 +KeyAccess = Enum(Byte, sd_and_any_assoc_app=0x00, sd_only=0x01, any_assoc_app_but_not_sd=0x02, + not_available=0xff) + +class KeyLoading: + # Global Platform Specification v2.3 Section 11.11.4.2.2.3 DGIs for the CC Private Key + + class KeyUsageQualifier(BER_TLV_IE, tag=0x95): + _construct = KeyUsageQualifier + + class KeyAccess(BER_TLV_IE, tag=0x96): + _construct = KeyAccess + + class KeyType(BER_TLV_IE, tag=0x80): + _construct = KeyType + + class KeyLength(BER_TLV_IE, tag=0x81): + _construct = GreedyInteger() + + class KeyIdentifier(BER_TLV_IE, tag=0x82): + _construct = Int8ub + + class KeyVersionNumber(BER_TLV_IE, tag=0x83): + _construct = Int8ub + + class KeyParameterReferenceValue(BER_TLV_IE, tag=0x85): + _construct = Enum(Byte, secp256r1=0x00, secp384r1=0x01, secp521r1=0x02, brainpoolP256r1=0x03, + brainpoolP256t1=0x04, brainpoolP384r1=0x05, brainpoolP384t1=0x06, + brainpoolP512r1=0x07, brainpoolP512t1=0x08) + + # pylint: disable=undefined-variable + class ControlReferenceTemplate(BER_TLV_IE, tag=0xb9, + nested=[KeyUsageQualifier, + KeyAccess, + KeyType, + KeyLength, + KeyIdentifier, + KeyVersionNumber, + KeyParameterReferenceValue]): + pass + + # Table 11-103 + class EccPublicKey(DGI_TLV_IE, tag=0x0036): + _construct = GreedyBytes + + # Table 11-105 + class EccPrivateKey(DGI_TLV_IE, tag=0x8137): + _construct = GreedyBytes + + # Global Platform Specification v2.3 Section 11.11.4 / Table 11-91 + class KeyControlReferenceTemplate(DGI_TLV_IE, tag=0x00b9, nested=[ControlReferenceTemplate]): + pass + + +# GlobalPlatform v2.3.1 Section H.4 / Table H-6 +class ScpType(BER_TLV_IE, tag=0x80): + _construct = HexAdapter(Byte) +class ListOfSupportedOptions(BER_TLV_IE, tag=0x81): + _construct = GreedyBytes +class SupportedKeysForScp03(BER_TLV_IE, tag=0x82): + _construct = FlagsEnum(Byte, aes128=0x01, aes192=0x02, aes256=0x04) +class SupportedTlsCipherSuitesForScp81(BER_TLV_IE, tag=0x83): + _consuruct = GreedyRange(Int16ub) +class ScpInformation(BER_TLV_IE, tag=0xa0, nested=[ScpType, ListOfSupportedOptions, SupportedKeysForScp03, + SupportedTlsCipherSuitesForScp81]): pass class PrivilegesAvailableSSD(BER_TLV_IE, tag=0x81): pass @@ -123,15 +197,24 @@ pass class SupportedLFDBHAlgorithms(BER_TLV_IE, tag=0x83): pass +# GlobalPlatform Card Specification v2.3 / Table H-8 class CiphersForLFDBEncryption(BER_TLV_IE, tag=0x84): - pass + _construct = Enum(Byte, tripledes16=0x01, aes128=0x02, aes192=0x04, aes256=0x08, + icv_supported_for_lfdb=0x80) +CipherSuitesForSignatures = Struct('byte1'/FlagsEnum(Byte, rsa1024_pkcsv15_sha1=0x01, + rsa_gt1024_pss_sha256=0x02, + single_des_plus_final_triple_des_mac_16b=0x04, + cmac_aes128=0x08, cmac_aes192=0x10, cmac_aes256=0x20, + ecdsa_ecc256_sha256=0x40, ecdsa_ecc384_sha384=0x80), + 'byte2'/COptional(FlagsEnum(Byte, ecdsa_ecc512_sha512=0x01, + ecdsa_ecc_521_sha512=0x02))) class CiphersForTokens(BER_TLV_IE, tag=0x85): - pass + _construct = CipherSuitesForSignatures class CiphersForReceipts(BER_TLV_IE, tag=0x86): - pass + _construct = CipherSuitesForSignatures class CiphersForDAPs(BER_TLV_IE, tag=0x87): - pass -class KeyParameterReferenceList(BER_TLV_IE, tag=0x88): + _construct = CipherSuitesForSignatures +class KeyParameterReferenceList(BER_TLV_IE, tag=0x88, nested=[KeyLoading.KeyParameterReferenceValue]): pass class CardCapabilityInformation(BER_TLV_IE, tag=0x67, nested=[ScpInformation, PrivilegesAvailableSSD, PrivilegesAvailableApplication, @@ -253,10 +336,10 @@ pass class IssuerIdentificationNumber(BER_TLV_IE, tag=0x42): - _construct = BcdAdapter(GreedyBytes) + _construct = HexAdapter(GreedyBytes) class CardImageNumber(BER_TLV_IE, tag=0x45): - _construct = BcdAdapter(GreedyBytes) + _construct = HexAdapter(GreedyBytes) class SequenceCounterOfDefaultKvn(BER_TLV_IE, tag=0xc1): _construct = GreedyInteger() -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35564?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: I853c94d37939ef3dd795f893232b0276a5a4af81 Gerrit-Change-Number: 35564 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[M] Change in pysim[master]: global_platform: More definitions to support key loading
by laforge 16 Jan '24

16 Jan '24

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35564?usp=email ) Change subject: global_platform: More definitions to support key loading ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35564?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: I853c94d37939ef3dd795f893232b0276a5a4af81 Gerrit-Change-Number: 35564 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 16 Jan 2024 18:03:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: vty: show mscs: tweak output
by osmith 16 Jan '24

16 Jan '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35596?usp=email ) Change subject: vty: show mscs: tweak output ...................................................................... vty: show mscs: tweak output Make the output more readable and split it over two lines, in preparation to add more information in the next patch. Before: OsmoBSC> show mscs 0 m3ua RI=SSN_PC,PC=0.23.3,SSN=BSSAP RI=SSN_PC,PC=0.23.1,SSN=BSSAP After: OsmoBSC> show mscs MSC 0: RI=SSN_PC,PC=0.23.3,SSN=BSSAP <-> RI=SSN_PC,PC=0.23.1,SSN=BSSAP ASP protocol: m3ua Related: OS#6741 Change-Id: I70ad1b0f44f2a923248f4e3259747cb3fec98fd2 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 28 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/35596/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 925f21f..27ceae4 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3250,13 +3250,15 @@ { struct bsc_msc_data *msc; llist_for_each_entry(msc, &bsc_gsmnet->mscs, entry) { - vty_out(vty, "%d %s %s ", + vty_out(vty, "MSC %d: %s <-> ", msc->a.cs7_instance, - osmo_ss7_asp_protocol_name(msc->a.asp_proto), osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.bsc_addr)); vty_out(vty, "%s%s", osmo_sccp_inst_addr_name(msc->a.sccp, &msc->a.msc_addr), VTY_NEWLINE); + vty_out(vty, " ASP protocol: %s%s", + osmo_ss7_asp_protocol_name(msc->a.asp_proto), + VTY_NEWLINE); } return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35596?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I70ad1b0f44f2a923248f4e3259747cb3fec98fd2 Gerrit-Change-Number: 35596 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: vty: show mscs: add BSSMAP state
by osmith 16 Jan '24

16 Jan '24

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35597?usp=email ) Change subject: vty: show mscs: add BSSMAP state ...................................................................... vty: show mscs: add BSSMAP state New output: OsmoBSC> show mscs MSC 0: RI=SSN_PC,PC=0.23.3,SSN=BSSAP <-> RI=SSN_PC,PC=0.23.1,SSN=BSSAP ASP protocol: m3ua BSSMAP state: CONNECTED Closes: OS#6741 Change-Id: I23ddba7d935e5cc5dae041458207c674ccb9d013 --- M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bssmap_reset.c 2 files changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/97/35597/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 27ceae4..8a0747c 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3259,6 +3259,10 @@ vty_out(vty, " ASP protocol: %s%s", osmo_ss7_asp_protocol_name(msc->a.asp_proto), VTY_NEWLINE); + vty_out(vty, " BSSMAP state: %s%s", + msc->a.bssmap_reset ? osmo_fsm_inst_state_name(msc->a.bssmap_reset->fi) : "", + VTY_NEWLINE); + } return CMD_SUCCESS; diff --git a/src/osmo-bsc/bssmap_reset.c b/src/osmo-bsc/bssmap_reset.c index ac304a5..018ecba 100644 --- a/src/osmo-bsc/bssmap_reset.c +++ b/src/osmo-bsc/bssmap_reset.c @@ -198,7 +198,7 @@ static struct osmo_fsm_state bssmap_reset_fsm_states[] = { [BSSMAP_RESET_ST_DISC] = { - .name = "DISC", + .name = "DISCONNECTED", .in_event_mask = 0 | S(BSSMAP_RESET_EV_RX_RESET) | S(BSSMAP_RESET_EV_RX_RESET_ACK) @@ -213,7 +213,7 @@ .action = bssmap_reset_disc_action, }, [BSSMAP_RESET_ST_CONN] = { - .name = "CONN", + .name = "CONNECTED", .in_event_mask = 0 | S(BSSMAP_RESET_EV_RX_RESET) | S(BSSMAP_RESET_EV_RX_RESET_ACK) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35597?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I23ddba7d935e5cc5dae041458207c674ccb9d013 Gerrit-Change-Number: 35597 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in pysim[master]: TLV: Add DGI encoding of "GP Scripting Language Annex B"
by laforge 16 Jan '24

16 Jan '24

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/35556?usp=email ) Change subject: TLV: Add DGI encoding of "GP Scripting Language Annex B" ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35556?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: Ie29ab7eb39f3165f3d695fcc1f02051338095697 Gerrit-Change-Number: 35556 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 16 Jan 2024 18:03:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: pySim-shell: Permit 'reset' command also in unqeuipped stage
by laforge 16 Jan '24

16 Jan '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35595?usp=email ) Change subject: pySim-shell: Permit 'reset' command also in unqeuipped stage ...................................................................... pySim-shell: Permit 'reset' command also in unqeuipped stage If we are not 'equipped' as we could not detect any known applications on the card, we used to only permit the 'apdu' command. However, we should also permit the 'reset' command, as it also is something that's possible with ever card, even of unknown types. Change-Id: I23199da727973d7095ac18031f49e1e8423aa287 --- M pySim-shell.py 1 file changed, 21 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/95/35595/1 diff --git a/pySim-shell.py b/pySim-shell.py index c645403..5b80588 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -254,6 +254,13 @@ if not sw_match(sw, opts.expect_sw): raise SwMatchError(sw, opts.expect_sw) + @cmd2.with_category(CUSTOM_CATEGORY) + def do_reset(self, opts): + """Reset the Card.""" + atr = self.card.reset() + self.poutput('Card ATR: %s' % i2h(atr)) + self.update_prompt() + class InterceptStderr(list): def __init__(self): self._stderr_backup = sys.stderr @@ -702,12 +709,6 @@ raise RuntimeError( "unable to export %i dedicated files(s)%s" % (context['ERR'], exception_str_add)) - def do_reset(self, opts): - """Reset the Card.""" - atr = self._cmd.card.reset() - self._cmd.poutput('Card ATR: %s' % i2h(atr)) - self._cmd.update_prompt() - def do_desc(self, opts): """Display human readable file description for the currently selected file""" desc = self._cmd.lchan.selected_file.desc -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35595?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: I23199da727973d7095ac18031f49e1e8423aa287 Gerrit-Change-Number: 35595 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: Add logging category for libosmo-cc
by jolly 16 Jan '24

16 Jan '24

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35572?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: Add logging category for libosmo-cc ...................................................................... Add logging category for libosmo-cc A new library is introduced: https://gitea.osmocom.org/cc/libosmo-cc It depends on logging API of libosmocore. The new category is DLCC. Change-Id: I9df433b2cfb51f04dbf16e9f8dee567a59ab5cb7 --- M include/osmocom/core/logging.h M src/core/logging.c M tests/logging/logging_vty_test.vty 3 files changed, 23 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/72/35572/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35572?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9df433b2cfb51f04dbf16e9f8dee567a59ab5cb7 Gerrit-Change-Number: 35572 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 0

[S] Change in docker-playground[master]: ttcn3-epdg: Set new osmo-epdg diameter connect/wathdog configs
by pespin 16 Jan '24

16 Jan '24

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/35594?usp=email ) Change subject: ttcn3-epdg: Set new osmo-epdg diameter connect/wathdog configs ...................................................................... ttcn3-epdg: Set new osmo-epdg diameter connect/wathdog configs Depends: osmo-epdg.git Change-Id I99b5e02264c2c35a3fbfcd2d6083a07e2cfea566 Change-Id: I3632abb8b33d5f2636f443573196d73ea8d3c818 --- M ttcn3-epdg-test/EPDG_Tests.cfg M ttcn3-epdg-test/osmo-epdg.config 2 files changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/35594/1 diff --git a/ttcn3-epdg-test/EPDG_Tests.cfg b/ttcn3-epdg-test/EPDG_Tests.cfg index 2a39b67..5dbcb4c 100644 --- a/ttcn3-epdg-test/EPDG_Tests.cfg +++ b/ttcn3-epdg-test/EPDG_Tests.cfg @@ -16,6 +16,9 @@ EPDG_Tests.mp_s6b_remote_ip := "172.18.10.20" EPDG_Tests.mp_s2b_remote_ip := "172.18.10.20" +# Match (diameter_watchdog_timer/1000)*diameter_watchdog_config["okay"] in osmo-epdg.config: +EPDG_Tests.mp_diam_watchdog_initial_wait_sec := 6; + [MAIN_CONTROLLER] [EXECUTE] diff --git a/ttcn3-epdg-test/osmo-epdg.config b/ttcn3-epdg-test/osmo-epdg.config index 0aa9807..8acdc4f 100644 --- a/ttcn3-epdg-test/osmo-epdg.config +++ b/ttcn3-epdg-test/osmo-epdg.config @@ -10,6 +10,11 @@ {diameter_remote_ip, "172.18.10.103"}, {diameter_remote_port, 3868}, {diameter_proto, sctp}, + {diameter_connect_timer, 200}, + {diameter_watchdog_timer, 6000}, + {diameter_watchdog_config, + [{okay, 1}, + {suspect, 1}]}, {vendor_id, 0}, {origin_host, "epdg.localdomain"}, {origin_realm, "localdomain"}, @@ -18,6 +23,11 @@ {dia_s6b_local_ip, "172.18.10.20"}, {dia_s6b_local_port, 3869}, {dia_s6b_proto, sctp}, + {dia_s6b_connect_timer, 200}, + {dia_s6b_watchdog_timer, 6000}, + {dia_s6b_watchdog_config, + [{okay, 1}, + {suspect, 1}]}, {dia_s6b_vendor_id, 0}, {dia_s6b_origin_host, "aaa.localdomain"}, {dia_s6b_origin_realm, "localdomain"}, -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35594?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I3632abb8b33d5f2636f443573196d73ea8d3c818 Gerrit-Change-Number: 35594 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0