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

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)

by pespin

Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email ) Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Patch Set 5: (1 comment) File include/osmocom/sigtran/osmo_ss7.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/bbc2e07f_d7e2e855 PS4, Line 515: int osmo_ss7_asp_get_trans_proto(const struct osmo_ss7_asp *asp); > > Is this needed by any app right now? […] It's not specific about this API, but in general when having developed stuff for libosmo-sccp I have the feeling a lot of stuff ended up being public which wasn't really needed, and that made making improvements later on more difficult. So in general in this lib my opinion is: keep it private until it is needed by someone else. Late on Moving private -> public is easy. Moving public -> private is not. -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Feb 2024 23:24:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in libosmo-sccp[master]: fix xua_msg_dump(): convert message length to the host's byte order

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35996?usp=email ) Change subject: fix xua_msg_dump(): convert message length to the host's byte order ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35996?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I516e486fb7b51a25e33965ed5a0f12ab4488d240 Gerrit-Change-Number: 35996 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Feb 2024 23:21:55 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)

by fixeria

Attention is currently required from: jolly, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email ) Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Patch Set 5: (2 comments) File include/osmocom/sigtran/osmo_ss7.h: https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/c98135b5_c87c5106 PS4, Line 515: int osmo_ss7_asp_get_trans_proto(const struct osmo_ss7_asp *asp); > Is this needed by any app right now? No. But this does not mean that we should not be adding it. It complements the existing `osmo_ss7_asp_get_proto()`. I would keep it, unless you're totally against it. https://gerrit.osmocom.org/c/libosmo-sccp/+/35796/comment/f5c7c2c7_c89902c9 PS4, Line 566: int trans_proto; > You need to update TODO-RELEASE about new fields and APIs. […] Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Feb 2024 22:49:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in libosmo-sccp[master]: return CMD_WARNING if osmo_ss7_xua_server_create() fails

by fixeria

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35968?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: return CMD_WARNING if osmo_ss7_xua_server_create() fails ...................................................................... return CMD_WARNING if osmo_ss7_xua_server_create() fails Change-Id: I12bbfd48e16166c0f508ccbf2ed4fa786e786082 Related: SYS#5424 --- M src/osmo_ss7_vty.c 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/68/35968/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35968?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I12bbfd48e16166c0f508ccbf2ed4fa786e786082 Gerrit-Change-Number: 35968 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[L] Change in libosmo-sccp[master]: Implement M3UA-over-TCP (in addition to SCTP)

by fixeria

Attention is currently required from: fixeria, jolly, laforge. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Implement M3UA-over-TCP (in addition to SCTP) ...................................................................... Implement M3UA-over-TCP (in addition to SCTP) RFC 4666 section 1.3.1 states that "TCP MAY be used as the underlying common transport protocol" under certain scenarios. There is even IANA-allocated TCP port 2905 for that purpose (see section 1.4.8). Since TCP is a stream oriented protocol, so we need to handle message boundaries ourselves by reading the M3UA header to know the PDU length. Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Related: SYS#5424 --- M TODO-RELEASE M include/osmocom/sigtran/osmo_ss7.h M src/osmo_ss7.c M src/osmo_ss7_asp.c M src/osmo_ss7_vty.c M src/osmo_ss7_xua_srv.c M src/sccp_user.c M src/ss7_internal.h M tests/ss7/ss7_test.c M tests/vty/ss7_asp_test.vty 10 files changed, 633 insertions(+), 126 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/96/35796/5 -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35796?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I8c76d271472befacbeb998a93bbdc9e8660d9b5d Gerrit-Change-Number: 35796 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: jolly <andreas(a)eversberg.eu> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[S] Change in libosmo-sccp[master]: fix xua_msg_dump(): convert message length to the host's byte order

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35996?usp=email ) Change subject: fix xua_msg_dump(): convert message length to the host's byte order ...................................................................... fix xua_msg_dump(): convert message length to the host's byte order This fixes bogus messages like this one: Received MGMT_ERR 'Invalid Routing Context': HDR=(MGMT:ERROR,V=1,LEN=268435456), PART(T=Error Code,L=4,D=00000019) ^^^^^^^^^^^^^ Change-Id: I516e486fb7b51a25e33965ed5a0f12ab4488d240 --- M src/xua_msg.c 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/96/35996/1 diff --git a/src/xua_msg.c b/src/xua_msg.c index 5671e1a..067c8dd 100644 --- a/src/xua_msg.c +++ b/src/xua_msg.c @@ -531,7 +531,7 @@ buf[0] = '\0'; OSMO_STRBUF_PRINTF(sb, "HDR=(%s,V=%u,LEN=%u)", xua_hdr_dump(xua, dialect), - xua->hdr.version, xua->hdr.msg_length); + xua->hdr.version, ntohl(xua->hdr.msg_length)); llist_for_each_entry(part, &xua->headers, entry) OSMO_STRBUF_PRINTF(sb, ", PART(T=%s,L=%u,D=%s)", -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35996?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I516e486fb7b51a25e33965ed5a0f12ab4488d240 Gerrit-Change-Number: 35996 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in libgtpnl[master]: gtp-link: add IPv6 support

by pablo

Attention is currently required from: osmith, pespin. pablo has posted comments on this change. ( https://gerrit.osmocom.org/c/libgtpnl/+/35985?usp=email ) Change subject: gtp-link: add IPv6 support ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libgtpnl/+/35985/comment/25cc503d_2ce707b4 PS1, Line 15: ./gtp-link add gtp0 ip6 --sgsn # IPv6 SGSN > @pablo@gnumonks. […] I have extended the gtp-link stub to allow to take an optional listener address to show that this is possible, see patch at: https://osmocom.org/issues/1952#note-60 Following your description, you need one gtp devices for A.B.C.D and one for ::Z. There is a 1:1 association between the listener address and the device. That is correct. -- To view, visit https://gerrit.osmocom.org/c/libgtpnl/+/35985?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libgtpnl Gerrit-Branch: master Gerrit-Change-Id: I201c32a1bf9a2ab7a228287590bc7ec19c4997b9 Gerrit-Change-Number: 35985 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pablo <pablo(a)gnumonks.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 15 Feb 2024 21:02:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pablo <pablo(a)gnumonks.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 4 months

1
0
0 0

[S] Change in pysim[master]: Dynamically determine maximum CMD data length depending on SCP

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/35995?usp=email ) Change subject: Dynamically determine maximum CMD data length depending on SCP ...................................................................... Dynamically determine maximum CMD data length depending on SCP If we're using a Secure Channel Protocol, this will add overhead in terms of the C-MAC appended to the C-APDU. This means in turn that the useable length of the data field shrinks by a certain number of bytes. Let's make sure the SCP instances expose an 'overhead' property of how much overhead they add - and that other commands use this to determine the maximum command data field length. Change-Id: I0a081a23efe20c77557600e62b52ba90a401058d --- M pySim/commands.py M pySim/global_platform/__init__.py M pySim/global_platform/scp.py 3 files changed, 38 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/95/35995/1 diff --git a/pySim/commands.py b/pySim/commands.py index 4e439e6..9a49124 100644 --- a/pySim/commands.py +++ b/pySim/commands.py @@ -84,6 +84,14 @@ """Return the (cached) patched default CLA byte for this card.""" return self._cla4lchan + @property + def max_cmd_len(self) -> int: + """Maximum length of the command apdu data section. Depends on secure channel protocol used.""" + if self.scp: + return 255 - self.scp.overhead + else: + return 255 + @cla_byte.setter def cla_byte(self, new_val: Hexstr): """Set the (raw, without lchan) default CLA value for this card.""" @@ -318,7 +326,7 @@ total_data = '' chunk_offset = 0 while chunk_offset < length: - chunk_len = min(255, length-chunk_offset) + chunk_len = min(self.max_cmd_len, length-chunk_offset) pdu = self.cla_byte + \ 'b0%04x%02x' % (offset + chunk_offset, chunk_len) try: @@ -376,7 +384,7 @@ total_data = '' chunk_offset = 0 while chunk_offset < data_length: - chunk_len = min(255, data_length - chunk_offset) + chunk_len = min(self.max_cmd_len, data_length - chunk_offset) # chunk_offset is bytes, but data slicing is hex chars, so we need to multiply by 2 pdu = self.cla_byte + \ 'd6%04x%02x' % (offset + chunk_offset, chunk_len) + \ @@ -560,10 +568,10 @@ total_len = len(tlv_bin) remaining = tlv_bin while len(remaining) > 0: - fragment = remaining[:255] + fragment = remaining[:self.max_cmd_len] rdata, sw = self._set_data(fragment, first=first) first = False - remaining = remaining[255:] + remaining = remaining[self.max_cmd_len:] return rdata, sw def run_gsm(self, rand: Hexstr) -> ResTuple: diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py index 4d553a7..9960560 100644 --- a/pySim/global_platform/__init__.py +++ b/pySim/global_platform/__init__.py @@ -492,13 +492,14 @@ def store_data(self, data: bytes, structure:str = 'none', encryption:str = 'none', response_permitted: bool = False) -> bytes: """Perform the GlobalPlatform GET DATA command in order to store some card-specific data. See GlobalPlatform CardSpecification v2.3Section 11.11 for details.""" + max_cmd_len = self._cmd.lchan.scc.max_cmd_len # Table 11-89 of GP Card Specification v2.3 remainder = data block_nr = 0 response = '' while len(remainder): - chunk = remainder[:255] - remainder = remainder[255:] + chunk = remainder[:max_cmd_len] + remainder = remainder[max_cmd_len:] p1b = build_construct(ADF_SD.StoreData, {'last_block': len(remainder) == 0, 'encryption': encryption, 'structure': structure, 'response': response_permitted}) diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index 0804492..967a582 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -218,6 +218,10 @@ 'seq_counter'/Int16ub, 'card_challenge'/Bytes(6), 'card_cryptogram'/Bytes(8)) kvn_range = [0x20, 0x2f] + def __init__(self, *args, **kwargs): + self.overhead = 8 + super().__init__(*args, **kwargs) + def dek_encrypt(self, plaintext:bytes) -> bytes: cipher = DES.new(self.card_keys.dek, DES.MODE_ECB) return cipher.encrypt(plaintext) @@ -410,6 +414,7 @@ def __init__(self, *args, **kwargs): self.s_mode = kwargs.pop('s_mode', 8) + self.overhead = self.s_mode super().__init__(*args, **kwargs) def dek_encrypt(self, plaintext:bytes) -> bytes: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/35995?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: I0a081a23efe20c77557600e62b52ba90a401058d Gerrit-Change-Number: 35995 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 4 months

1
0
0 0

[M] Change in ...osmo-epdg[master]: Use new 'pre-create tundev' feature from gtp_u_kmod

by pespin

Attention is currently required from: lynxis lazus, osmith. Hello Jenkins Builder, lynxis lazus, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35993?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: Use new 'pre-create tundev' feature from gtp_u_kmod ...................................................................... Use new 'pre-create tundev' feature from gtp_u_kmod This way osmo-epdg doesn't need to create the gtp tun device, and it can be pre-created and configured by other tools, like gtp-link from libgtpnl.git. Change-Id: I2297b8a75e75cc8095ae1485f73c49c5e6b26c4e --- M Makefile M config/sys.config M rebar.lock 3 files changed, 46 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/93/35993/3 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-epdg/+/35993?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: I2297b8a75e75cc8095ae1485f73c49c5e6b26c4e Gerrit-Change-Number: 35993 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

[M] Change in docker-playground[master]: ttcn3-epdg: Use new 'pre-create tundev' feature from gtp_u_kmod

by pespin

Attention is currently required from: lynxis lazus, osmith. Hello Jenkins Builder, lynxis lazus, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/35994?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ttcn3-epdg: Use new 'pre-create tundev' feature from gtp_u_kmod ...................................................................... ttcn3-epdg: Use new 'pre-create tundev' feature from gtp_u_kmod This way osmo-epdg doesn't need to create the gtp tun device, and it can be pre-created and configured by other tools, like gtp-link from libgtpnl.git. Change-Id: Ie7e2b4fadef69c889b12792fc2b8050f1ef5c684 --- M osmo-epdg-master/Dockerfile M ttcn3-epdg-test/jenkins.sh M ttcn3-epdg-test/osmo-epdg.config A ttcn3-epdg-test/osmo-epdg.sh 4 files changed, 48 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/94/35994/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/35994?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: Ie7e2b4fadef69c889b12792fc2b8050f1ef5c684 Gerrit-Change-Number: 35994 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

1 year, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2024