Attention is currently required from: laforge.
dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37919?usp=email )
Change subject: global_platform: use scp_key_identity ICCID for ADF.ISD
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
I am not 100% sure if it is correct to always use the ICCID as scp_key_identity. At least on eUICCs I see an ADF.ISD-R and on UICCs I see an ADF.ISD. So ADF.ISD-R would use "EID" as scp_key_identity and ADF.ISD would use "ICCID" as scp_key_identity, but I am not sure if this is correct.
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37919?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I73a6f7088321a2b703074aa5228910709050cab2
Gerrit-Change-Number: 37919
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: Jenkins Builder
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Fri, 23 Aug 2024 15:41:59 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37917?usp=email )
Change subject: filesystem: add command to delete all contents from a BER-TLV EF
......................................................................
filesystem: add command to delete all contents from a BER-TLV EF
When working with BER-TLF files, we can only delete one tag at a time.
There is no way to delete all tags at once. This may make working with
BER-TLV files difficult, in particular when scripting is used and the
script needs to start with an empty file. Also export has problems,
since it does not reset the file before setting the new values there
may be unexpected results in case there still tags in the file that
are not set during import. To fill the gap, let's add a commandd that
deletes all tags in a BER-TLV EF at once.
Related: OS#6531
Change-Id: I5d6bcfe865df7cb8fa6dd0052cab3b364d929f94
---
M pySim/filesystem.py
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/17/37917/1
diff --git a/pySim/filesystem.py b/pySim/filesystem.py
index 35af140..d5e99a4 100644
--- a/pySim/filesystem.py
+++ b/pySim/filesystem.py
@@ -1338,6 +1338,12 @@
if data:
self._cmd.poutput(data)
+ def do_delete_all(self, opts):
+ """Delete all data from a BER-TLV EF"""
+ tags = self._cmd.lchan.retrieve_tags()
+ for tag in tags:
+ self._cmd.lchan.set_data(tag, None)
+
def __init__(self, fid: str, sfid: str = None, name: str = None, desc: str = None, parent: CardDF = None,
size: Size = (1, None), **kwargs):
"""
@@ -1374,6 +1380,7 @@
if tags == []:
export_str += "# empty file, no tags"
else:
+ export_str += "delete_all\n"
for t in tags:
result = lchan.retrieve_data(t)
(tag, l, val, remainer) = bertlv_parse_one(h2b(result[0]))
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37917?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I5d6bcfe865df7cb8fa6dd0052cab3b364d929f94
Gerrit-Change-Number: 37917
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37918?usp=email )
Change subject: global_platform: fix help description for establish_scp03
......................................................................
global_platform: fix help description for establish_scp03
The argument parser object for establish_scp03 (est_scp03_parser) is
copied from est_scp02_parser. This object still has the .description
property set, which is the description for establish_scp02. To get
the description string that is defined in do_establish_scp03, we must
remove the old description string first.
Related: OS#6531
Change-Id: Ibb26bddf88b2e644a7f0c6b2a06bde228aa8afc7
---
M pySim/global_platform/__init__.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/18/37918/1
diff --git a/pySim/global_platform/__init__.py b/pySim/global_platform/__init__.py
index 075a189..ecdc6b3 100644
--- a/pySim/global_platform/__init__.py
+++ b/pySim/global_platform/__init__.py
@@ -830,6 +830,7 @@
self._establish_scp(scp02, host_challenge, opts.security_level)
est_scp03_parser = deepcopy(est_scp02_parser)
+ est_scp03_parser.description = None
est_scp03_parser.add_argument('--s16-mode', action='store_true', help='S16 mode (S8 is default)')
@cmd2.with_argparser(est_scp03_parser)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37918?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ibb26bddf88b2e644a7f0c6b2a06bde228aa8afc7
Gerrit-Change-Number: 37918
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: fixeria, laforge.
dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37840?usp=email )
Change subject: ara_m: use class byte of current lchan
......................................................................
Patch Set 7:
(1 comment)
Patchset:
PS6:
> I think if you make apply_lchan=True the default (to which I agree!), then you have to audit the exi […]
This is interesting. I have looked up MANAGE CHANNEL in ETSI TS 102.221. I could not find any hint that MANAGE CHANNEL has to be exclusively used on lchan 0. Also when I look at the code [1] it seems that we already use the CLA byte of the lchan for MANAGE CHANNEL. I wonder if I am misunderstanding something here.
[1] https://gitea.osmocom.org/sim-card/pysim/src/branch/master/pySim/commands.p…
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37840?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ie3e48678f178a488bfaea6cc2b9a3e18145a8d10
Gerrit-Change-Number: 37840
Gerrit-PatchSet: 7
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 23 Aug 2024 15:36:35 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Attention is currently required from: laforge.
dexter has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/pysim/+/37895?usp=email )
Change subject: pySim-shell, cosmetic: define positional arguments last
......................................................................
Patch Set 2:
(1 comment)
File pySim-shell.py:
https://gerrit.osmocom.org/c/pysim/+/37895/comment/9e777c8f_33725b6e?usp=em… :
PS1, Line 238: apdu_cmd_parser = argparse.ArgumentParser()
> is this really a cosmetic change? I would expect that before this change, the --opts would have to […]
To my experience this will not change the command syntax. To my experience it does not matter if positional arguments come first or last. I have tested it now again:
apdu 00a40004023f00 --expect-sw 9000
apdu --expect-sw 9000 00a40004023f00
both commands work the same. I also tried it out manually with some python code. The result is the same.
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37895?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I2412eb6e7dc32ae95a575f31d4489ce210d85ea0
Gerrit-Change-Number: 37895
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Fri, 23 Aug 2024 15:36:35 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/37916?usp=email )
Change subject: filesystem: fix double space in docstring
......................................................................
filesystem: fix double space in docstring
Change-Id: I69ef171ac2dd2e2717404b1f3b10f986af419f6e
---
M pySim/filesystem.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/16/37916/1
diff --git a/pySim/filesystem.py b/pySim/filesystem.py
index 805983b..35af140 100644
--- a/pySim/filesystem.py
+++ b/pySim/filesystem.py
@@ -1333,7 +1333,7 @@
@cmd2.with_argparser(del_data_parser)
def do_delete_data(self, opts):
- """Delete data for a given tag in a BER-TLV EF"""
+ """Delete data for a given tag in a BER-TLV EF"""
(data, _sw) = self._cmd.lchan.set_data(opts.tag, None)
if data:
self._cmd.poutput(data)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37916?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I69ef171ac2dd2e2717404b1f3b10f986af419f6e
Gerrit-Change-Number: 37916
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
daniel has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37893?usp=email )
Change subject: mme: Fix order in eutran_to_geran testcase
......................................................................
mme: Fix order in eutran_to_geran testcase
The diagram shows that the S1-AP release should happen after the Delete
Session Request/Response (even though all a numbered 13).
The test started failing because a newer open5gs would check/require a
resource that was freed due to an S1 release.
Change-Id: I0d7a388dc8b1a1c13de8f7e3fe7781423fc90868
---
M mme/MME_Tests.ttcn
1 file changed, 6 insertions(+), 4 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
lynxis lazus: Looks good to me, approved
diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn
index ca36e24..21ec48d 100644
--- a/mme/MME_Tests.ttcn
+++ b/mme/MME_Tests.ttcn
@@ -1455,16 +1455,18 @@
/* TS 23.401 Figure D.3.5-1 Step 8: */
f_DIA_CancelLocation();
- /* TS 23.401 Figure D.3.5-1 Step 13:
- * Upon rx of SGSN Context Acknowledge, MME released the ENB/UE context:
- */
- as_s1ap_handle_UeContextReleaseCmd();
/* TS 23.401 Figure D.3.5-1 Step 13:
* After Gn timer triggers, the SGW session is deleted.
* Make sure Operation Indication is set to 0, to tell the SGW to keep the Session up at the PGW.
*/
as_GTP2C_DeleteSession_success(tr_GTP2C_Indication(oI := '0'B));
+
+ /* TS 23.401 Figure D.3.5-1 Step 13:
+ * Upon rx of SGSN Context Acknowledge, MME released the ENB/UE context:
+ */
+ as_s1ap_handle_UeContextReleaseCmd();
+
/* Let MME some time to handle the Create Session Response: */
f_sleep(3.0);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/37893?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: I0d7a388dc8b1a1c13de8f7e3fe7781423fc90868
Gerrit-Change-Number: 37893
Gerrit-PatchSet: 2
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>