- gerrit-log - lists.osmocom.org

Change in pysim[master]: cosmetic: Switch to consistent four-spaces indent; run autopep8
by laforge 11 Feb '22

11 Feb '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27141 ) Change subject: cosmetic: Switch to consistent four-spaces indent; run autopep8 ...................................................................... cosmetic: Switch to consistent four-spaces indent; run autopep8 We had a mixture of tab and 4space based indenting, which is a bad idea. 4space is the standard in python, so convert all our code to that. The result unfortuantely still shoed even more inconsistencies, so I've decided to run autopep8 on the entire code base. Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 --- M pySim-prog.py M pySim-read.py M pySim-shell.py M pySim/__init__.py M pySim/ara_m.py M pySim/card_handler.py M pySim/card_key_provider.py M pySim/cards.py M pySim/cat.py M pySim/commands.py M pySim/construct.py M pySim/exceptions.py M pySim/filesystem.py M pySim/gsm_r.py M pySim/iso7816_4.py M pySim/jsonpath.py M pySim/profile.py M pySim/sysmocom_sja2.py M pySim/tlv.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_31_103.py M pySim/ts_51_011.py M pySim/utils.py 29 files changed, 7,420 insertions(+), 6,468 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 Gerrit-Change-Number: 27141 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 0

Change in pysim[master]: utils: Fix missing Optional[] in type annotations
by laforge 11 Feb '22

11 Feb '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27142 ) Change subject: utils: Fix missing Optional[] in type annotations ...................................................................... utils: Fix missing Optional[] in type annotations Thanks to Vadim for pointing this out Change-Id: I6e7d3725f28410d66580e88f2271d2b240d1f98e --- M pySim/utils.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 3ce3e58..555aa82 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -1253,7 +1253,7 @@ has the habit of specifying TLV data but with very spcific ordering, or specific choices of tags at specific points in a stream. This class tries to represent this.""" - def __init__(self, name: str, desc: str = None, tag: int = None): + def __init__(self, name: str, desc: Optional[str] = None, tag: Optional[int] = None): """ Args: name: A brief, all-lowercase, underscore separated string identifier @@ -1376,7 +1376,7 @@ A given encoded DO may contain any of them in any order, and may contain multiple instances of each DO.""" - def __init__(self, name: str, desc: str = None, members=None): + def __init__(self, name: str, desc: Optional[str] = None, members=None): self.name = name self.desc = desc self.members = members or [] @@ -1491,7 +1491,7 @@ By wrapping them into this formal DataObjectSequence, we can offer convenience methods for encoding or decoding an entire sequence.""" - def __init__(self, name: str, desc: str = None, sequence=None): + def __init__(self, name: str, desc: Optional[str] = None, sequence=None): self.sequence = sequence or [] self.name = name self.desc = desc 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27142 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6e7d3725f28410d66580e88f2271d2b240d1f98e Gerrit-Change-Number: 27142 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in pysim[master]: cosmetic: Switch to consistent four-spaces indent; run autopep8
by laforge 11 Feb '22

11 Feb '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/27141 ) Change subject: cosmetic: Switch to consistent four-spaces indent; run autopep8 ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 Gerrit-Change-Number: 27141 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 11 Feb 2022 13:50:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: library/Native_Functions: add f_inet6_ntoa()
by fixeria 11 Feb '22

11 Feb '22

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27146 ) Change subject: library/Native_Functions: add f_inet6_ntoa() ...................................................................... library/Native_Functions: add f_inet6_ntoa() We have f_inet_ntoa() for converting IPv4 addresses to strings, but so far there was no similar function for IPv6 addresses. Change-Id: I0858cf8cb44a6673e19f3496c362d68fcdd7b18d --- M library/Native_FunctionDefs.cc M library/Native_Functions.ttcn 2 files changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/46/27146/1 diff --git a/library/Native_FunctionDefs.cc b/library/Native_FunctionDefs.cc index 78ca4d1..7139a62 100644 --- a/library/Native_FunctionDefs.cc +++ b/library/Native_FunctionDefs.cc @@ -76,6 +76,19 @@ return CHARSTRING(str); } +CHARSTRING f__inet6__ntoa(const OCTETSTRING& in) +{ + char buf[INET6_ADDRSTRLEN] = { 0 }; + TTCN_Buffer ttcn_buffer(in); + + const void *src = (const void *)ttcn_buffer.get_data(); + const char *str = inet_ntop(AF_INET6, src, buf, sizeof(buf)); + if (str == NULL) + fprintf(stderr, "inet_ntop failed: %s\n", strerror(errno)); + + return CHARSTRING((const char *)buf); +} + CHARSTRING f__str__tolower(const CHARSTRING& in) { TTCN_Buffer ttcn_buffer(in); diff --git a/library/Native_Functions.ttcn b/library/Native_Functions.ttcn index c43004a..c9cc948 100644 --- a/library/Native_Functions.ttcn +++ b/library/Native_Functions.ttcn @@ -11,6 +11,8 @@ external function f_inet_ntoa(in octetstring oct) return charstring; /* like inet_ntoa() but input is host byte order */ external function f_inet_hntoa(in octetstring oct) return charstring; + /* direct import of inet_ntop(AF_INET6) C function, input net byte order */ + external function f_inet6_ntoa(in octetstring oct) return charstring; /* convert content of charstring to lower-case using tolower(3) */ external function f_str_tolower(in charstring input) return charstring; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I0858cf8cb44a6673e19f3496c362d68fcdd7b18d Gerrit-Change-Number: 27146 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Test GTP-U Echo Request/Response
by fixeria 11 Feb '22

11 Feb '22

Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27105 ) Change subject: ggsn: Test GTP-U Echo Request/Response ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id92180be948ee3f5246c7befec666698a1b074f3 Gerrit-Change-Number: 27105 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:50:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name
by fixeria 11 Feb '22

11 Feb '22

Attention is currently required from: iedemam. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:48:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: ggsn: Split gtpu_access tests into several separated tests
by pespin 11 Feb '22

11 Feb '22

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27145 ) Change subject: ggsn: Split gtpu_access tests into several separated tests ...................................................................... ggsn: Split gtpu_access tests into several separated tests Those tests validated several different scenarios, let's better handle them separately one at a time, it makes it easier to understand the behavior of the SUT and see what needs to be fixed. Change-Id: I39342fcf2366030ce743dd4b4773f0fff5d61b9f --- M ggsn_tests/GGSN_Tests.ttcn 1 file changed, 103 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/45/27145/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 5ec535c..cebd6f2 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -1001,22 +1001,64 @@ f_wait_gtpu_fail(ctx); } - /* Check that attempting RA with another ll src addr won't work, packet dropped: */ - var OCT16 saddr_ll_wrong := f_ipv6_mangle(saddr_ll, 8); - f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_ll_wrong)); - f_wait_gtpu_fail(ctx); - /* Check if we can use valid global src addr, should work */ var OCT16 saddr_glob := f_ipv6_global(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address); f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_glob, dns1_addr)); f_wait_icmp6_echo_reply(ctx); - /* Assert that packets with wrong global src addr are dropped by GGSN */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Check that attempting RA with another ll src addr won't work, packet dropped: */ + testcase TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv6_DNS); + f_pdp_ctx_act(ctx); + + f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); + f_wait_rtr_adv(ctx); + f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx)); + + var OCT16 saddr_ll := f_ipv6_link_local(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address); + var OCT16 saddr_ll_wrong := f_ipv6_mangle(saddr_ll, 8); + f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_ll_wrong)); + f_wait_gtpu_fail(ctx); + + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong global src addr are dropped by GGSN */ + testcase TC_pdp6_act_deact_gtpu_access_wrong_global_saddr() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv6_DNS); + f_pdp_ctx_act(ctx); + + f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); + f_wait_rtr_adv(ctx); + f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx)); + + var OCT16 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '0003'O); + var OCT16 saddr_glob := f_ipv6_global(ctx.eua.endUserAddress.endUserAddressIPv6.ipv6_address); var OCT16 saddr_wrong := f_ipv6_mangle(saddr_glob); f_send_gtpu(ctx, f_gen_icmpv6_echo(saddr_wrong, dns1_addr)); f_wait_gtpu_fail(ctx); - /* Send an IPv4 ICMP ECHO REQUEST to APN6, should fail (packet dropped) */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Send an IPv4 ICMP ECHO REQUEST to APN6, should fail (packet dropped */ + testcase TC_pdp6_act_deact_gtpu_access_ipv4_apn6() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet6, valueof(t_EuaIPv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv6_DNS); + f_pdp_ctx_act(ctx); + + f_send_gtpu(ctx, f_icmpv6_rs_for_pdp(ctx)); + f_wait_rtr_adv(ctx); + f_send_gtpu(ctx, f_gen_icmpv6_neigh_solicit_for_pdp(ctx)); + var OCT4 saddr_v4 := f_inet_addr("192.168.10.2"); var OCT4 daddr_v4 := f_inet_addr("8.8.8.8"); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr_v4, daddr_v4)); @@ -1161,15 +1203,38 @@ f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); - /* Assert that packets with wrong global src addr are dropped by GGSN */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong global src addr are dropped by GGSN */ + testcase TC_pdp4_act_deact_gtpu_access_wrong_saddr() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + f_PCO_ensure_no_duplicates(ctx.pco_neg); + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4.ipv4_address; var OCT4 saddr_wrong := substr(saddr, 0, 3) & (saddr[3] xor4b '11'O); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr_wrong, dns1_addr)); f_wait_gtpu_fail(ctx); + f_pdp_ctx_del(ctx, '1'B); + } + + /* Send an IPv6 RA to APN4, should fail (packet dropped) */ + testcase TC_pdp4_act_deact_gtpu_access_ipv6_apn4() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + /* Send an IPv6 RA to APN4, should fail (packet dropped) */ var OCT16 saddr_v6 := f_inet6_addr("fde4:8dba:82e1:2000:1:2:3:4"); f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_v6)); f_wait_gtpu_fail(ctx); + f_pdp_ctx_del(ctx, '1'B); } @@ -1415,15 +1480,36 @@ f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr)); f_wait_icmp4_echo_reply(ctx); - /* Assert that packets with wrong global src addr are dropped by GGSN */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong ipv4 src addr are dropped by GGSN on APN IPv4v6 */ + testcase TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4andIPv6.ipv4_address; var OCT4 saddr_wrong := substr(saddr, 0, 3) & (saddr[3] xor4b '11'O); f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr_wrong, dns1_addr)); f_wait_gtpu_fail(ctx); - /* Send an IPv6 RA to APN4, should fail (packet dropped) */ + f_pdp_ctx_del(ctx, '1'B); + } + + /* Assert that packets with wrong ipv6 global src addr are dropped by GGSN on APN IPv4v6 */ + testcase TC_pdp46_act_deact_gtpu_access_wrong_global_saddr_ipv6() runs on GT_CT { + f_init(); + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), '1234'O, c_ApnInet46, valueof(t_EuaIPv4Dynv6Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + var OCT16 saddr_v6 := f_inet6_addr("fde4:8dba:82e1:2000:1:2:3:4"); f_send_gtpu(ctx, f_gen_icmpv6_router_solicitation(saddr_v6)); f_wait_gtpu_fail(ctx); + f_pdp_ctx_del(ctx, '1'B); } @@ -1591,6 +1677,8 @@ execute(TC_pdp4_act_deact_ipcp_pap_broken()); execute(TC_pdp4_act_deact_pcodns()); execute(TC_pdp4_act_deact_gtpu_access()); + execute(TC_pdp4_act_deact_gtpu_access_wrong_saddr()); + execute(TC_pdp4_act_deact_gtpu_access_ipv6_apn4()); execute(TC_pdp4_clients_interact_with_txseq()); execute(TC_pdp4_clients_interact_without_txseq()); execute(TC_pdp4_act_deact_with_single_dns()); @@ -1600,6 +1688,9 @@ execute(TC_pdp6_act_deact_pcodns()); execute(TC_pdp6_act_deact_icmp6()); execute(TC_pdp6_act_deact_gtpu_access()); + execute(TC_pdp6_act_deact_gtpu_access_wrong_ll_saddr()); + execute(TC_pdp6_act_deact_gtpu_access_wrong_global_saddr()); + execute(TC_pdp6_act_deact_gtpu_access_ipv4_apn6()); execute(TC_pdp6_clients_interact()); execute(TC_pdp46_act_deact()); @@ -1608,6 +1699,8 @@ execute(TC_pdp46_act_deact_pcodns4()); execute(TC_pdp46_act_deact_pcodns6()); execute(TC_pdp46_act_deact_gtpu_access()); + execute(TC_pdp46_act_deact_gtpu_access_wrong_saddr_ipv4()); + execute(TC_pdp46_act_deact_gtpu_access_wrong_global_saddr_ipv6()); execute(TC_pdp46_clients_interact()); execute(TC_pdp46_act_deact_apn4()); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27145 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I39342fcf2366030ce743dd4b4773f0fff5d61b9f Gerrit-Change-Number: 27145 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

Change in libosmo-abis[master]: stats: add RSL line number to TCP stats name
by pespin 11 Feb '22

11 Feb '22

Attention is currently required from: iedemam, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/27134 ) Change subject: stats: add RSL line number to TCP stats name ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/27134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-abis Gerrit-Branch: master Gerrit-Change-Id: Ie42d8a0cb3757f2d01a4b6d69ea2bcce400b7538 Gerrit-Change-Number: 27134 Gerrit-PatchSet: 3 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 11 Feb 2022 12:41:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in pysim[master]: cosmetic: Switch to consistent four-spaces indent; run autopep8
by laforge 11 Feb '22

11 Feb '22

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/+/27141 to look at the new patch set (#3). Change subject: cosmetic: Switch to consistent four-spaces indent; run autopep8 ...................................................................... cosmetic: Switch to consistent four-spaces indent; run autopep8 We had a mixture of tab and 4space based indenting, which is a bad idea. 4space is the standard in python, so convert all our code to that. The result unfortuantely still shoed even more inconsistencies, so I've decided to run autopep8 on the entire code base. Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 --- M pySim-prog.py M pySim-read.py M pySim-shell.py M pySim/__init__.py M pySim/ara_m.py M pySim/card_handler.py M pySim/card_key_provider.py M pySim/cards.py M pySim/cat.py M pySim/commands.py M pySim/construct.py M pySim/exceptions.py M pySim/filesystem.py M pySim/gsm_r.py M pySim/iso7816_4.py M pySim/jsonpath.py M pySim/profile.py M pySim/sysmocom_sja2.py M pySim/tlv.py M pySim/transport/__init__.py M pySim/transport/calypso.py M pySim/transport/modem_atcmd.py M pySim/transport/pcsc.py M pySim/transport/serial.py M pySim/ts_102_221.py M pySim/ts_31_102.py M pySim/ts_31_103.py M pySim/ts_51_011.py M pySim/utils.py 29 files changed, 7,420 insertions(+), 6,468 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/41/27141/3 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27141 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I4a4b1b444a2f43fab05fc5d2c8a7dd6ddecb5f07 Gerrit-Change-Number: 27141 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 0

Change in pysim[master]: ts_102_221: Implement proper parsing of EF.DIR
by laforge 11 Feb '22

11 Feb '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/27130 ) Change subject: ts_102_221: Implement proper parsing of EF.DIR ...................................................................... ts_102_221: Implement proper parsing of EF.DIR EF.DIR can not only contain the AID + Label of TS 102 221, but can also contain any of the DOs specified in ISO7816-4. Let's imoplement this based on the modern pySim.tlv parser Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Closes: OS#5410 --- A pySim/iso7816_4.py M pySim/ts_102_221.py 2 files changed, 78 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/iso7816_4.py b/pySim/iso7816_4.py new file mode 100644 index 0000000..ea838cf --- /dev/null +++ b/pySim/iso7816_4.py @@ -0,0 +1,62 @@ +# coding=utf-8 +"""Utilities / Functions related to ISO 7816-4 + +(C) 2022 by Harald Welte <laforge(a)osmocom.org> + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +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 construct import * +from pySim.construct import * +from pySim.utils import * +from pySim.filesystem import * +from pySim.tlv import * + +# Table 91 + Section 8.2.1.2 +class ApplicationId(BER_TLV_IE, tag=0x4f): + _construct = GreedyBytes + +# Table 91 +class ApplicationLabel(BER_TLV_IE, tag=0x50): + _construct = GreedyBytes + +# Table 91 + Section 5.3.1.2 +class FileReference(BER_TLV_IE, tag=0x51): + _construct = GreedyBytes + +# Table 91 +class CommandApdu(BER_TLV_IE, tag=0x52): + _construct = GreedyBytes + +# Table 91 +class DiscretionaryData(BER_TLV_IE, tag=0x53): + _construct = GreedyBytes + +# Table 91 +class DiscretionaryTemplate(BER_TLV_IE, tag=0x73): + _construct = GreedyBytes + +# Table 91 + RFC1738 / RFC2396 +class URL(BER_TLV_IE, tag=0x5f50): + _construct = GreedyString('ascii') + +# Table 91 +class ApplicationRelatedDOSet(BER_TLV_IE, tag=0x61): + _construct = GreedyBytes + +# Section 8.2.1.3 Application Template +class ApplicationTemplate(BER_TLV_IE, tag=0x61, nested=[ApplicationId, ApplicationLabel, FileReference, + CommandApdu, DiscretionaryData, DiscretionaryTemplate,URL, + ApplicationRelatedDOSet]): + pass diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index 71d5b82..1955484 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -22,10 +22,12 @@ from pySim.construct import * from pySim.utils import * from pySim.filesystem import * +from pySim.tlv import * from bidict import bidict from pySim.profile import CardProfile from pySim.profile import match_uicc from pySim.profile import match_sim +import pySim.iso7816_4 as iso7816_4 # A UICC will usually also support 2G functionality. If this is the case, we # need to add DF_GSM and DF_TELECOM along with the UICC related files @@ -502,18 +504,22 @@ # TS 102 221 Section 13.1 class EF_DIR(LinFixedEF): + class ApplicationLabel(BER_TLV_IE, tag=0x50): + # TODO: UCS-2 coding option as per Annex A of TS 102 221 + _construct = GreedyString('ascii') + + # see https://github.com/PyCQA/pylint/issues/5794 + #pylint: disable=undefined-variable + class ApplicationTemplate(BER_TLV_IE, tag=0x61, + nested=[iso7816_4.ApplicationId, ApplicationLabel, iso7816_4.FileReference, + iso7816_4.CommandApdu, iso7816_4.DiscretionaryData, + iso7816_4.DiscretionaryTemplate, iso7816_4.URL, + iso7816_4.ApplicationRelatedDOSet]): + pass + def __init__(self, fid='2f00', sfid=0x1e, name='EF.DIR', desc='Application Directory'): super().__init__(fid, sfid=sfid, name=name, desc=desc, rec_len={5,54}) - - def _decode_record_hex(self, raw_hex_data): - raw_hex_data = raw_hex_data.upper() - atempl_base_tlv = TLV(['61']) - atempl_base = atempl_base_tlv.parse(raw_hex_data) - atempl_TLV_MAP = {'4F': 'aid_value', 50:'label'} - atempl_tlv = TLV(atempl_TLV_MAP) - atempl = atempl_tlv.parse(atempl_base['61']) - # FIXME: "All other Dos are according to ISO/IEC 7816-4" - return tlv_key_replace(atempl_TLV_MAP, atempl) + self._tlv = EF_DIR.ApplicationTemplate # TS 102 221 Section 13.2 class EF_ICCID(TransparentEF): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27130 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I875eb49e1f0370428c2eae69af84f5483bd5b1fc Gerrit-Change-Number: 27130 Gerrit-PatchSet: 7 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log