May 2023 - gerrit-log - lists.osmocom.org

[M] Change in pysim[master]: cards.py: support ATR-based detection of sysmoISIM-SJA5

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/32994 ) Change subject: cards.py: support ATR-based detection of sysmoISIM-SJA5 ...................................................................... cards.py: support ATR-based detection of sysmoISIM-SJA5 The cards are 99% software-compatible to the SJA2, so let's just derive the SJA5 class from the SJA2 Change-Id: I706631baaf447c49904277886bc9a3f6ba3f5532 --- M pySim/cards.py M pySim/sysmocom_sja2.py 2 files changed, 73 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/cards.py b/pySim/cards.py index b48a80c..d5cd676 100644 --- a/pySim/cards.py +++ b/pySim/cards.py @@ -1656,11 +1656,38 @@ return +class SysmoISIMSJA5(SysmoISIMSJA2): + """ + sysmocom sysmoISIM-SJA5 + """ + + name = 'sysmoISIM-SJA5' + + @classmethod + def autodetect(kls, scc): + try: + # Try card model #1 (9FJ) + atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 35 75 30 35 02 51 CC" + if scc.get_atr() == toBytes(atr): + return kls(scc) + # Try card model #2 (SLM17) + atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 35 75 30 35 02 65 F8" + if scc.get_atr() == toBytes(atr): + return kls(scc) + # Try card model #3 (9FV) + atr = "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 35 75 30 35 02 59 C4" + if scc.get_atr() == toBytes(atr): + return kls(scc) + except: + return None + return None + # In order for autodetection ... _cards_classes = [FakeMagicSim, SuperSim, MagicSim, GrcardSim, SysmoSIMgr1, SysmoSIMgr2, SysmoUSIMgr1, SysmoUSIMSJS1, - FairwavesSIM, OpenCellsSim, WavemobileSim, SysmoISIMSJA2] + FairwavesSIM, OpenCellsSim, WavemobileSim, SysmoISIMSJA2, + SysmoISIMSJA5] def card_detect(ctype, scc): diff --git a/pySim/sysmocom_sja2.py b/pySim/sysmocom_sja2.py index 4967701..e32943f 100644 --- a/pySim/sysmocom_sja2.py +++ b/pySim/sysmocom_sja2.py @@ -1,7 +1,7 @@ # coding=utf-8 -"""Utilities / Functions related to sysmocom SJA2 cards +"""Utilities / Functions related to sysmocom SJA2/SJA5 cards -(C) 2021 by Harald Welte <laforge(a)osmocom.org> +(C) 2021-2023 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 @@ -258,3 +258,34 @@ EF_USIM_SQN(name='EF.ISIM_SQN'), ] isim_adf.add_files(files_adf_isim) + +class SysmocomSJA5(CardModel): + _atrs = ["3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 35 75 30 35 02 51 CC", + "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 35 75 30 35 02 65 F8", + "3B 9F 96 80 1F 87 80 31 E0 73 FE 21 1B 67 4A 35 75 30 35 02 59 C4"] + + @classmethod + def add_files(cls, rs: RuntimeState): + """Add sysmocom SJA2 specific files to given RuntimeState.""" + rs.mf.add_file(DF_SYSTEM()) + # optional USIM application + if 'a0000000871002' in rs.mf.applications: + usim_adf = rs.mf.applications['a0000000871002'] + files_adf_usim = [ + EF_USIM_AUTH_KEY(), + EF_USIM_AUTH_KEY_2G(), + EF_GBA_SK(), + EF_GBA_REC_LIST(), + EF_GBA_INT_KEY(), + EF_USIM_SQN(), + ] + usim_adf.add_files(files_adf_usim) + # optional ISIM application + if 'a0000000871004' in rs.mf.applications: + isim_adf = rs.mf.applications['a0000000871004'] + files_adf_isim = [ + EF_USIM_AUTH_KEY(name='EF.ISIM_AUTH_KEY'), + EF_USIM_AUTH_KEY_2G(name='EF.ISIM_AUTH_KEY_2G'), + EF_USIM_SQN(name='EF.ISIM_SQN'), + ] + isim_adf.add_files(files_adf_isim) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I706631baaf447c49904277886bc9a3f6ba3f5532 Gerrit-Change-Number: 32994 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in pysim[master]: cards.py: support ATR-based detection of sysmoISIM-SJA5

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32994 ) Change subject: cards.py: support ATR-based detection of sysmoISIM-SJA5 ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32994 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I706631baaf447c49904277886bc9a3f6ba3f5532 Gerrit-Change-Number: 32994 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Fri, 26 May 2023 14:38:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in pysim[master]: ts_31_102: Add DF.SAIP support

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/32992 ) Change subject: ts_31_102: Add DF.SAIP support ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/32992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iffb65af335dfdbd7791fca9a0a6ad4b79814a57c Gerrit-Change-Number: 32992 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 May 2023 14:38:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: manuals: include osmo-gsm-manual's sigtran.adoc

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33008 ) Change subject: manuals: include osmo-gsm-manual's sigtran.adoc ...................................................................... manuals: include osmo-gsm-manual's sigtran.adoc Prepend it to the cs7 config .adoc, so that it introduces some concepts and specifies some limitations of current implementation, etc. Change-Id: I9faef2dd15b62814e474299c675c2cb05b779c44 --- M doc/manuals/osmohnbgw-usermanual.adoc 1 file changed, 14 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/osmohnbgw-usermanual.adoc b/doc/manuals/osmohnbgw-usermanual.adoc index 61a00b9..00ec1bd 100644 --- a/doc/manuals/osmohnbgw-usermanual.adoc +++ b/doc/manuals/osmohnbgw-usermanual.adoc @@ -22,6 +22,8 @@ include::./common/chapters/logging.adoc[] +include::./common/chapters/sigtran.adoc[] + include::./common/chapters/cs7-config.adoc[] include::./common/chapters/mgwpool.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I9faef2dd15b62814e474299c675c2cb05b779c44 Gerrit-Change-Number: 33008 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: manuals: include osmo-gsm-manual's sigtran.adoc

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/33008 ) Change subject: manuals: include osmo-gsm-manual's sigtran.adoc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/33008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I9faef2dd15b62814e474299c675c2cb05b779c44 Gerrit-Change-Number: 33008 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 May 2023 14:38:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33009 ) Change subject: UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git ...................................................................... UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git They were only included in osmo-stp so far. Change-Id: I004ca2ef70e7f32c83d14d90849cf13f3d1a2cdd --- M doc/manuals/osmobsc-usermanual.adoc 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/osmobsc-usermanual.adoc b/doc/manuals/osmobsc-usermanual.adoc index 2e77e1b..ea92221 100644 --- a/doc/manuals/osmobsc-usermanual.adoc +++ b/doc/manuals/osmobsc-usermanual.adoc @@ -16,6 +16,10 @@ include::./common/chapters/logging.adoc[] +include::./common/chapters/sigtran.adoc[] + +include::./common/chapters/sigtran-osmocom.adoc[] + include::./common/chapters/cs7-config.adoc[] include::{srcdir}/chapters/bts.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I004ca2ef70e7f32c83d14d90849cf13f3d1a2cdd Gerrit-Change-Number: 33009 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-bsc[master]: UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33009 ) Change subject: UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33009 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I004ca2ef70e7f32c83d14d90849cf13f3d1a2cdd Gerrit-Change-Number: 33009 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 May 2023 14:37:56 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-msc[master]: UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33010 ) Change subject: UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git ...................................................................... UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git They were only included in osmo-stp so far. Change-Id: I37e36e7919d6996a79533b62564c5d82908b57f7 --- M doc/manuals/osmomsc-usermanual.adoc 1 file changed, 15 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/doc/manuals/osmomsc-usermanual.adoc b/doc/manuals/osmomsc-usermanual.adoc index 632abc7..ad55e53 100644 --- a/doc/manuals/osmomsc-usermanual.adoc +++ b/doc/manuals/osmomsc-usermanual.adoc @@ -22,6 +22,10 @@ include::./common/chapters/logging.adoc[] +include::./common/chapters/sigtran-osmocom.adoc[] + +include::./common/chapters/cs7-config.adoc[] + include::./common/chapters/cs7-config.adoc[] include::{srcdir}/chapters/net.adoc[] -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37e36e7919d6996a79533b62564c5d82908b57f7 Gerrit-Change-Number: 33010 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-msc[master]: UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/33010 ) Change subject: UserManual: Include sigtran*.adoc from osmo-gsm-manuals.git ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/33010 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I37e36e7919d6996a79533b62564c5d82908b57f7 Gerrit-Change-Number: 33010 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 26 May 2023 14:37:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library: add a receive equivalent for ts_RSL_ChanMode_SIGN

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33034 ) Change subject: library: add a receive equivalent for ts_RSL_ChanMode_SIGN ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33034 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: Id39ca75a9194d7c62b9e5e2d96e766c4940c8281 Gerrit-Change-Number: 33034 Gerrit-PatchSet: 1 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-Comment-Date: Fri, 26 May 2023 14:37:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023