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

[S] Change in libosmo-asn1-tcap[master]: tests: add decode tests for TCAP End tests
by lynxis lazus 13 May '26

13 May '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42745?usp=email ) Change subject: tests: add decode tests for TCAP End tests ...................................................................... tests: add decode tests for TCAP End tests Change-Id: I5679c4a873176d73e973f5cfccff796fe6dbd941 --- M tests/parse/tcap_parse_test.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/45/42745/1 diff --git a/tests/parse/tcap_parse_test.c b/tests/parse/tcap_parse_test.c index a927b39..fe1e409 100644 --- a/tests/parse/tcap_parse_test.c +++ b/tests/parse/tcap_parse_test.c @@ -29,6 +29,19 @@ static const unsigned char pkt_begin[] = {0x62, 0x06, 0x48, 0x04, 0x00, 0x01, 0x02, 0x03}; +/* a TCAP End with DialoguePortion */ +/* without application tag 11 & 12 */ +static const unsigned char pkt_end_dialog_wo11_wo12[] = { 0x64, 0x06, 0x49, 0x04, 0x7f, 0xc2, 0x92, 0x3a}; + +/* with application tag 11 (dialog) and 12 (component) */ +static const unsigned char pkt_end_dialog_w11_w12[] = {0x64, 0x3c, 0x49, 0x4, 0x7f, 0xc2, 0x92, 0x3a, 0x6b, 0x2a, 0x28, 0x28, 0x6, 0x7, 0x0, 0x11, 0x86, 0x5, 0x1, 0x1, 0x1, 0xa0, 0x1d, 0x61, 0x1b, 0x80, 0x2, 0x7, 0x80, 0xa1, 0x9, 0x6, 0x7, 0x4, 0x0, 0x0, 0x1, 0x0, 0xe, 0x3, 0xa2, 0x3, 0x2, 0x1, 0x0, 0xa3, 0x5, 0xa1, 0x3, 0x2, 0x1, 0x0, 0x6c, 0x8, 0xa3, 0x6, 0x2, 0x1, 0x8a, 0x2, 0x1, 0x1}; + +/* with application tag 11 (dialog) but not 12 (component) */ +static const unsigned char pkt_end_dialog_w11_wo12[] = { 0x64, 0x10, 0x49, 0x04, 0x7f, 0xc2, 0x92, 0x3a, 0x6c, 0x08, 0xa3, 0x06, 0x02, 0x01, 0x8a, 0x02, 0x01, 0x01 }; + +/* with application tag 12 (dialog) but not 11 (component) */ +static const unsigned char pkt_end_dialog_wo11_w12[] = { 0x64 , 0x10 , 0x49 , 0x04 , 0x7f , 0xc2 , 0x92 , 0x3a , 0x6c , 0x08 , 0xa3 , 0x06 , 0x02 , 0x01 , 0x8a , 0x02 , 0x01 , 0x01 }; + struct testvector { const char *name; const unsigned char *vector; @@ -36,6 +49,10 @@ }; static struct testvector testvectors[] = { { .name = "Begin", .vector = pkt_begin, .vector_len = sizeof(pkt_begin) }, + { .name = "End", .vector = pkt_end_dialog_wo11_wo12, .vector_len = sizeof(pkt_end_dialog_wo11_wo12) }, + { .name = "End with Dialog & Component", .vector = pkt_end_dialog_w11_w12, .vector_len = sizeof(pkt_end_dialog_w11_w12) }, + { .name = "End with Component", .vector = pkt_end_dialog_w11_wo12, .vector_len = sizeof(pkt_end_dialog_w11_wo12) }, + { .name = "End with Dialog", .vector = pkt_end_dialog_wo11_w12, .vector_len = sizeof(pkt_end_dialog_wo11_w12) }, }; static int encode_tests(void) -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42745?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-asn1-tcap Gerrit-Branch: master Gerrit-Change-Id: I5679c4a873176d73e973f5cfccff796fe6dbd941 Gerrit-Change-Number: 42745 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[M] Change in libosmo-asn1-tcap[master]: tests: split tests into own functions
by lynxis lazus 13 May '26

13 May '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42744?usp=email ) Change subject: tests: split tests into own functions ...................................................................... tests: split tests into own functions To improve overview. Change-Id: If9db94d17e288875fdaed52ec95b3785a78d5fa6 --- M tests/parse/tcap_parse_test.c M tests/parse/tcap_parse_test.ok 2 files changed, 40 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/44/42744/1 diff --git a/tests/parse/tcap_parse_test.c b/tests/parse/tcap_parse_test.c index 540621b..a927b39 100644 --- a/tests/parse/tcap_parse_test.c +++ b/tests/parse/tcap_parse_test.c @@ -38,29 +38,12 @@ { .name = "Begin", .vector = pkt_begin, .vector_len = sizeof(pkt_begin) }, }; -int main(int argc, char **argv) +static int encode_tests(void) { - asn_dec_rval_t rc; - - printf("Basic TCAP decode testing.\n"); - struct TCAP_TCMessage _tcapmsg = {}; - - for (int i = 0; i < ARRAY_SIZE(testvectors); i++) { - struct TCAP_TCMessage *tcapmsg = &_tcapmsg; - memset(tcapmsg, 0, sizeof(*tcapmsg)); - printf("Decoding testvector no %i - %s\n", i, testvectors[i].name); - - rc = ber_decode(0, &asn_DEF_TCAP_TCMessage, (void **)&tcapmsg, testvectors[i].vector, testvectors[i].vector_len); - if (rc.code != RC_OK) { - printf("Broken encoding %u at byte %lu\n", rc.code, rc.consumed); - } else { - asn_fprint(stdout, &asn_DEF_TCAP_TCMessage, tcapmsg); - } - ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_TCAP_TCMessage, tcapmsg); - } - uint8_t buf[] = {0x00, 0x01, 0x02, 0x03}; + printf("Basic TCAP encode testing.\n"); + struct TCAP_TCMessage msg = { .present = TCAP_TCMessage_PR_begin, .choice.begin = { @@ -72,6 +55,42 @@ }; der_encode(&asn_DEF_TCAP_TCMessage, &msg, write_stream, NULL); + return 0; +} + +static int decode_tests(void) +{ + int ret = 0; + asn_dec_rval_t rc; + + printf("Basic TCAP decode testing.\n"); + struct TCAP_TCMessage _tcapmsg = {}; + + for (int i = 0; i < ARRAY_SIZE(testvectors); i++) { + printf("Decoding testvector no %i - %s\n", i, testvectors[i].name); + struct TCAP_TCMessage *tcapmsg = &_tcapmsg; + + memset(tcapmsg, 0, sizeof(*tcapmsg)); + rc = ber_decode(0, &asn_DEF_TCAP_TCMessage, (void **)&tcapmsg, testvectors[i].vector, testvectors[i].vector_len); + if (rc.code != RC_OK) { + ret = 1; + printf("Broken encoding %u at byte %lu\n", rc.code, rc.consumed); + } else { + asn_fprint(stdout, &asn_DEF_TCAP_TCMessage, tcapmsg); + } + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_TCAP_TCMessage, tcapmsg); + } + + return ret; +} + +int main(int argc, char **argv) +{ + if (decode_tests()) + return 1; + + if (encode_tests()) + return 1; printf("All tests passed.\n"); return 0; diff --git a/tests/parse/tcap_parse_test.ok b/tests/parse/tcap_parse_test.ok index 1061d2e..ed3eac1 100644 --- a/tests/parse/tcap_parse_test.ok +++ b/tests/parse/tcap_parse_test.ok @@ -3,6 +3,7 @@ Begin ::= { otid: 00 01 02 03 } +Basic TCAP encode testing. 62 06 48 04 00 01 02 03 -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42744?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-asn1-tcap Gerrit-Branch: master Gerrit-Change-Id: If9db94d17e288875fdaed52ec95b3785a78d5fa6 Gerrit-Change-Number: 42744 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[S] Change in libosmo-asn1-tcap[master]: tests: improve test infrastructure to support multiple test vectors
by lynxis lazus 13 May '26

13 May '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42743?usp=email ) Change subject: tests: improve test infrastructure to support multiple test vectors ...................................................................... tests: improve test infrastructure to support multiple test vectors Change-Id: I4a69167647dd0a8eb650b4c7cc47fd97928ebf5d --- M tests/parse/tcap_parse_test.c M tests/parse/tcap_parse_test.ok 2 files changed, 28 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-asn1-tcap refs/changes/43/42743/1 diff --git a/tests/parse/tcap_parse_test.c b/tests/parse/tcap_parse_test.c index 0f44963..540621b 100644 --- a/tests/parse/tcap_parse_test.c +++ b/tests/parse/tcap_parse_test.c @@ -14,8 +14,9 @@ #include <osmocom/tcap/TCAP_OrigTransactionID.h> #include <stdlib.h> - -static const unsigned char pkt1[] = {0x62, 0x06, 0x48, 0x04, 0x00, 0x01, 0x02, 0x03}; +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) +#endif /* ARRAY_SIZE */ static int write_stream(const void *buffer, size_t size, void *key) { @@ -26,21 +27,37 @@ return 0; } +static const unsigned char pkt_begin[] = {0x62, 0x06, 0x48, 0x04, 0x00, 0x01, 0x02, 0x03}; + +struct testvector { + const char *name; + const unsigned char *vector; + size_t vector_len; +}; +static struct testvector testvectors[] = { + { .name = "Begin", .vector = pkt_begin, .vector_len = sizeof(pkt_begin) }, +}; + int main(int argc, char **argv) { asn_dec_rval_t rc; - struct TCAP_TCMessage *tcapmsg; - tcapmsg = CALLOC(1, sizeof(*tcapmsg)); printf("Basic TCAP decode testing.\n"); + struct TCAP_TCMessage _tcapmsg = {}; - rc = ber_decode(0, &asn_DEF_TCAP_TCMessage, (void **)&tcapmsg, pkt1, sizeof(pkt1)); - if (rc.code != RC_OK) - printf("Broken encoding %u at byte %lu\n", rc.code, rc.consumed); + for (int i = 0; i < ARRAY_SIZE(testvectors); i++) { + struct TCAP_TCMessage *tcapmsg = &_tcapmsg; + memset(tcapmsg, 0, sizeof(*tcapmsg)); + printf("Decoding testvector no %i - %s\n", i, testvectors[i].name); - asn_fprint(stdout, &asn_DEF_TCAP_TCMessage, tcapmsg); - ASN_STRUCT_FREE(asn_DEF_TCAP_TCMessage, tcapmsg); - + rc = ber_decode(0, &asn_DEF_TCAP_TCMessage, (void **)&tcapmsg, testvectors[i].vector, testvectors[i].vector_len); + if (rc.code != RC_OK) { + printf("Broken encoding %u at byte %lu\n", rc.code, rc.consumed); + } else { + asn_fprint(stdout, &asn_DEF_TCAP_TCMessage, tcapmsg); + } + ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_TCAP_TCMessage, tcapmsg); + } uint8_t buf[] = {0x00, 0x01, 0x02, 0x03}; diff --git a/tests/parse/tcap_parse_test.ok b/tests/parse/tcap_parse_test.ok index 6c44530..1061d2e 100644 --- a/tests/parse/tcap_parse_test.ok +++ b/tests/parse/tcap_parse_test.ok @@ -1,4 +1,5 @@ Basic TCAP decode testing. +Decoding testvector no 0 - Begin Begin ::= { otid: 00 01 02 03 } -- To view, visit https://gerrit.osmocom.org/c/libosmo-asn1-tcap/+/42743?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: libosmo-asn1-tcap Gerrit-Branch: master Gerrit-Change-Id: I4a69167647dd0a8eb650b4c7cc47fd97928ebf5d Gerrit-Change-Number: 42743 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: RemsimServer Tests: give the remsim server some time to update the sl...
by laforge 13 May '26

13 May '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42742?usp=email ) Change subject: RemsimServer Tests: give the remsim server some time to update the slotmap ...................................................................... RemsimServer Tests: give the remsim server some time to update the slotmap The check of the slotmap can race if it is requests straight away, because the slotmap might be still in the slotmap list as long the bankd hasn't responded yet. Change-Id: I6784e05380d844aa4bb9cde2bbe648ff37bee91b --- M remsim/RemsimServer_Tests.ttcn 1 file changed, 9 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/remsim/RemsimServer_Tests.ttcn b/remsim/RemsimServer_Tests.ttcn index 5850d29..de2c478 100644 --- a/remsim/RemsimServer_Tests.ttcn +++ b/remsim/RemsimServer_Tests.ttcn @@ -512,6 +512,9 @@ /* delete the slotmap via REST */ res := f_rsres_delete_slotmap(sm.bank); + /* an immediate slotmaps check doesn't work */ + f_sleep(1.0); + /* verify the slotmap is gone */ f_ensure_slotmaps({}); } @@ -549,6 +552,9 @@ /* delete the slotmap via REST */ res := f_rsres_delete_slotmap(sm.bank); + /* an immediate slotmaps check doesn't work */ + f_sleep(1.0); + /* verify the slotmap is gone from REST interface immediately */ f_ensure_slotmaps({}); @@ -600,6 +606,9 @@ /* delete the slotmap via REST */ res := f_rsres_delete_slotmap(sm.bank); + /* an immediate slotmaps check doesn't work */ + f_sleep(1.0); + /* verify the slotmap is gone from REST interface immediately */ f_ensure_slotmaps({}); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42742?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: I6784e05380d844aa4bb9cde2bbe648ff37bee91b Gerrit-Change-Number: 42742 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: RemsimServer Tests: give the remsim server some time to update the sl...
by laforge 13 May '26

13 May '26

Attention is currently required from: lynxis lazus. laforge has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42742?usp=email ) Change subject: RemsimServer Tests: give the remsim server some time to update the slotmap ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/42742?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6784e05380d844aa4bb9cde2bbe648ff37bee91b Gerrit-Change-Number: 42742 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Wed, 13 May 2026 13:17:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[S] Change in pysim[master]: card_key_provider: pass CardKeyFieldCryptor to constructor
by laforge 13 May '26

13 May '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/42735?usp=email ) Change subject: card_key_provider: pass CardKeyFieldCryptor to constructor ...................................................................... card_key_provider: pass CardKeyFieldCryptor to constructor We currently create the CardKeyFieldCryptor object inside the constructor of the concrete CardKeyProvider classes. There is currently no problem with that, but when we create the CardKeyFieldCryptor object first and then pass it as parameter to the constructor, we gain more flexibility in case we want to support other CardKeyFieldCryptor variants in the future. Related: SYS#6959 Change-Id: If43552740aadacab9126f8a002749a9582eef8f4 --- M pySim/card_key_provider.py M tests/unittests/test_card_key_provider.py 2 files changed, 11 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py index 49a2a96..e71daa6 100644 --- a/pySim/card_key_provider.py +++ b/pySim/card_key_provider.py @@ -173,18 +173,18 @@ class CardKeyProviderCsv(CardKeyProvider): """Card key provider implementation that allows to query against a specified CSV file.""" - def __init__(self, csv_filename: str, transport_keys: dict): + def __init__(self, csv_filename: str, field_cryptor: CardKeyFieldCryptor): """ Args: csv_filename : file name (path) of CSV file containing card-individual key/data - transport_keys : (see class CardKeyFieldCryptor) + field_cryptor : (see class CardKeyFieldCryptor) """ log.info("Using CSV file as card key data source: %s" % csv_filename) self.csv_file = open(csv_filename, 'r') if not self.csv_file: raise RuntimeError("Could not open CSV file '%s'" % csv_filename) self.csv_filename = csv_filename - self.crypt = CardKeyFieldCryptor(transport_keys) + self.crypt = field_cryptor def get(self, fields: List[str], key: str, value: str) -> Dict[str, str]: self.csv_file.seek(0) @@ -216,11 +216,11 @@ class CardKeyProviderPgsql(CardKeyProvider): """Card key provider implementation that allows to query against a specified PostgreSQL database table.""" - def __init__(self, config_filename: str, transport_keys: dict): + def __init__(self, config_filename: str, field_cryptor: CardKeyFieldCryptor): """ Args: config_filename : file name (path) of CSV file containing card-individual key/data - transport_keys : (see class CardKeyFieldCryptor) + field_cryptor : (see class CardKeyFieldCryptor) """ import psycopg2 log.info("Using SQL database as card key data source: %s" % config_filename) @@ -237,7 +237,7 @@ host=config.get('host')) self.tables = config.get('table_names') log.info("Card key database tables: %s" % str(self.tables)) - self.crypt = CardKeyFieldCryptor(transport_keys) + self.crypt = field_cryptor def get(self, fields: List[str], key: str, value: str) -> Dict[str, str]: import psycopg2 @@ -349,7 +349,8 @@ for par in opts.column_key: name, key = par.split(':') column_keys[name] = key + card_key_field_cryptor = CardKeyFieldCryptor(column_keys) if os.path.isfile(os.path.expanduser(opts.csv)): - card_key_provider_register(CardKeyProviderCsv(os.path.expanduser(opts.csv), column_keys)) + card_key_provider_register(CardKeyProviderCsv(os.path.expanduser(opts.csv), card_key_field_cryptor)) if os.path.isfile(os.path.expanduser(opts.pgsql)): - card_key_provider_register(CardKeyProviderPgsql(os.path.expanduser(opts.pgsql), column_keys)) + card_key_provider_register(CardKeyProviderPgsql(os.path.expanduser(opts.pgsql), card_key_field_cryptor)) diff --git a/tests/unittests/test_card_key_provider.py b/tests/unittests/test_card_key_provider.py index 121998c..a70394a 100644 --- a/tests/unittests/test_card_key_provider.py +++ b/tests/unittests/test_card_key_provider.py @@ -20,7 +20,8 @@ "KIK3" : "00010204040506070809488B0C0D0E0F"} csv_file_path = os.path.dirname(os.path.abspath(__file__)) + "/test_card_key_provider.csv" - card_key_provider_register(CardKeyProviderCsv(csv_file_path, column_keys)) + card_key_field_cryptor = CardKeyFieldCryptor(column_keys) + card_key_provider_register(CardKeyProviderCsv(csv_file_path, card_key_field_cryptor)) super().__init__(*args, **kwargs) def test_card_key_provider_get(self): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42735?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If43552740aadacab9126f8a002749a9582eef8f4 Gerrit-Change-Number: 42735 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in pysim[master]: card_key_provider: add a static method to parse --column-keys args
by laforge 13 May '26

13 May '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/42736?usp=email ) Change subject: card_key_provider: add a static method to parse --column-keys args ...................................................................... card_key_provider: add a static method to parse --column-keys args The contents of the --column-keys arguments are currently parsed in init_card_key_provider. Let's add a static method in CardKeyFieldCryptor to simplify re-usage of the CardKeyFieldCryptor Related: SYS#6959 Change-Id: Ic955f271b1de1b1b855b21c82ed10343044e45fa --- M pySim/card_key_provider.py 1 file changed, 19 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py index e71daa6..6991cfa 100644 --- a/pySim/card_key_provider.py +++ b/pySim/card_key_provider.py @@ -140,6 +140,23 @@ arg_parser.add_argument('--csv-column-key', metavar='FIELD:AES_KEY_HEX', default=[], action='append', help=argparse.SUPPRESS, dest='column_key') + @staticmethod + def transport_keys_from_opts(opts: argparse.Namespace) -> dict: + """ + Transport keys are passed via the commandline using the '--column-key' option. Each column requires a + dedicated transport key. This method can be used to extract the column keys parameters from the commandline + options into a dict that can be directly passed to the construtor with the transport_keys argument. + + Args: + opts: parsed commandline options (Namespace) + """ + + transport_keys = {} + for par in opts.column_key: + name, key = par.split(':') + transport_keys[name] = key + return transport_keys + class CardKeyProvider(abc.ABC): """Base class, not containing any concrete implementation.""" @@ -345,11 +362,8 @@ def card_key_provider_init(opts: argparse.Namespace): """Initialize card key provider depending on the user provided commandline options""" - column_keys = {} - for par in opts.column_key: - name, key = par.split(':') - column_keys[name] = key - card_key_field_cryptor = CardKeyFieldCryptor(column_keys) + transport_keys = CardKeyFieldCryptor.transport_keys_from_opts(opts) + card_key_field_cryptor = CardKeyFieldCryptor(transport_keys) if os.path.isfile(os.path.expanduser(opts.csv)): card_key_provider_register(CardKeyProviderCsv(os.path.expanduser(opts.csv), card_key_field_cryptor)) if os.path.isfile(os.path.expanduser(opts.pgsql)): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42736?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic955f271b1de1b1b855b21c82ed10343044e45fa Gerrit-Change-Number: 42736 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in pysim[master]: card_key_provider: move boiler-plate code into helper functions
by laforge 13 May '26

13 May '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/42734?usp=email ) Change subject: card_key_provider: move boiler-plate code into helper functions ...................................................................... card_key_provider: move boiler-plate code into helper functions in pySim-shell.py we add the commandline options for the card key provider and do the setup accordingly. Let's put this boilerplate code into helper functions instead, so that we can re-use it in other pySim programs as well. Let's use pySim.transport as a pattern. Related: SYS#6959 Change-Id: I6d095cbb644e608f4a751a1d0749b1484cdc781d --- M pySim-shell.py M pySim/card_key_provider.py 2 files changed, 53 insertions(+), 24 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim-shell.py b/pySim-shell.py index 29ed3a5..66f39fc 100755 --- a/pySim-shell.py +++ b/pySim-shell.py @@ -69,8 +69,8 @@ from pySim.gsm_r import DF_EIRENE from pySim.cat import ProactiveCommand -from pySim.card_key_provider import CardKeyProviderCsv, CardKeyProviderPgsql -from pySim.card_key_provider import card_key_provider_register, card_key_provider_get_field, card_key_provider_get +from pySim.card_key_provider import card_key_provider_argparse_add_args, card_key_provider_init +from pySim.card_key_provider import card_key_provider_get_field, card_key_provider_get from pySim.app import init_card @@ -1146,18 +1146,6 @@ global_group.add_argument("--verbose", help="Enable verbose logging", action='store_true', default=False) -card_key_group = option_parser.add_argument_group('Card Key Provider Options') -card_key_group.add_argument('--csv', metavar='FILE', - default="~/.osmocom/pysim/card_data.csv", - help='Read card data from CSV file') -card_key_group.add_argument('--pgsql', metavar='FILE', - default="~/.osmocom/pysim/card_data_pgsql.cfg", - help='Read card data from PostgreSQL database (config file)') -card_key_group.add_argument('--csv-column-key', metavar='FIELD:AES_KEY_HEX', default=[], action='append', - help=argparse.SUPPRESS, dest='column_key') -card_key_group.add_argument('--column-key', metavar='FIELD:AES_KEY_HEX', default=[], action='append', - help='per-column AES transport key', dest='column_key') - adm_group = global_group.add_mutually_exclusive_group() adm_group.add_argument('-a', '--pin-adm', metavar='PIN_ADM1', dest='pin_adm', default=None, help='ADM PIN used for provisioning (overwrites default)') @@ -1170,6 +1158,7 @@ help="A pySim-shell command that would optionally be executed at startup") option_parser.add_argument('command_args', nargs=argparse.REMAINDER, help="Optional Arguments for command") +card_key_provider_argparse_add_args(option_parser) if __name__ == '__main__': startup_errors = False @@ -1178,16 +1167,8 @@ # Ensure that we are able to print formatted warnings from the beginning. PySimLogger.setup(print, {logging.WARN: YELLOW}, opts.verbose) - # Register csv-file as card data provider, either from specified CSV - # or from CSV file in home directory - column_keys = {} - for par in opts.column_key: - name, key = par.split(':') - column_keys[name] = key - if os.path.isfile(os.path.expanduser(opts.csv)): - card_key_provider_register(CardKeyProviderCsv(os.path.expanduser(opts.csv), column_keys)) - if os.path.isfile(os.path.expanduser(opts.pgsql)): - card_key_provider_register(CardKeyProviderPgsql(os.path.expanduser(opts.pgsql), column_keys)) + # Init card key provider for automatic card key retrieval + card_key_provider_init(opts) # Init card reader driver sl = init_reader(opts, proactive_handler = Proact()) diff --git a/pySim/card_key_provider.py b/pySim/card_key_provider.py index 06a6b2b..49a2a96 100644 --- a/pySim/card_key_provider.py +++ b/pySim/card_key_provider.py @@ -33,10 +33,12 @@ from osmocom.utils import h2b, b2h from pySim.log import PySimLogger +import os import abc import csv import logging import yaml +import argparse log = PySimLogger.get(__name__) @@ -130,6 +132,14 @@ cipher = AES.new(h2b(self.transport_keys[field_name.upper()]), AES.MODE_CBC, self.__IV) return b2h(cipher.encrypt(h2b(plaintext_val))) + @staticmethod + def argparse_add_args(arg_parser: argparse.ArgumentParser): + arg_parser.add_argument('--column-key', metavar='FIELD:AES_KEY_HEX', default=[], action='append', + help='per-column AES transport key', dest='column_key') + # Depprecated argument, replaced by --column-key (see above) + arg_parser.add_argument('--csv-column-key', metavar='FIELD:AES_KEY_HEX', default=[], action='append', + help=argparse.SUPPRESS, dest='column_key') + class CardKeyProvider(abc.ABC): """Base class, not containing any concrete implementation.""" @@ -148,6 +158,15 @@ fond None shall be returned. """ + @staticmethod + def argparse_add_args(arg_parser: argparse.ArgumentParser): + """ + Add the commandline arguments relevant for this card key provider. + + Args: + arg_parser : argument parser group + """ + def __str__(self): return type(self).__name__ @@ -188,6 +207,12 @@ return None return return_dict + @staticmethod + def argparse_add_args(arg_parser: argparse.ArgumentParser): + arg_parser.add_argument('--csv', metavar='FILE', + default="~/.osmocom/pysim/card_data.csv", + help='Read card data from CSV file') + class CardKeyProviderPgsql(CardKeyProvider): """Card key provider implementation that allows to query against a specified PostgreSQL database table.""" @@ -252,6 +277,11 @@ result[k] = self.crypt.decrypt_field(k, result.get(k)) return result + @staticmethod + def argparse_add_args(arg_parser: argparse.ArgumentParser): + arg_parser.add_argument('--pgsql', metavar='FILE', + default="~/.osmocom/pysim/card_data_pgsql.cfg", + help='Read card data from PostgreSQL database (config file)') def card_key_provider_register(provider: CardKeyProvider, provider_list=card_key_providers): """Register a new card key provider. @@ -305,3 +335,21 @@ fields = [field] result = card_key_provider_get(fields, key, value, card_key_providers) return result.get(field.upper()) + +def card_key_provider_argparse_add_args(arg_parser: argparse.ArgumentParser): + """Add card key provider commandline options to the given argument parser""" + card_key_group = arg_parser.add_argument_group('Card Key Provider Options') + CardKeyProviderCsv.argparse_add_args(card_key_group) + CardKeyProviderPgsql.argparse_add_args(card_key_group) + CardKeyFieldCryptor.argparse_add_args(card_key_group) + +def card_key_provider_init(opts: argparse.Namespace): + """Initialize card key provider depending on the user provided commandline options""" + column_keys = {} + for par in opts.column_key: + name, key = par.split(':') + column_keys[name] = key + if os.path.isfile(os.path.expanduser(opts.csv)): + card_key_provider_register(CardKeyProviderCsv(os.path.expanduser(opts.csv), column_keys)) + if os.path.isfile(os.path.expanduser(opts.pgsql)): + card_key_provider_register(CardKeyProviderPgsql(os.path.expanduser(opts.pgsql), column_keys)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42734?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I6d095cbb644e608f4a751a1d0749b1484cdc781d Gerrit-Change-Number: 42734 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in pysim[master]: pySim/app: use pySimLogger instead of print
by laforge 13 May '26

13 May '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/42738?usp=email ) Change subject: pySim/app: use pySimLogger instead of print ...................................................................... pySim/app: use pySimLogger instead of print let's replace the stray print statements with proper logger calls. Related: SYS#6959 Change-Id: I95b4536cc8853e7ba6a5dd573b903dfb85e56b9a --- M pySim/app.py 1 file changed, 7 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/app.py b/pySim/app.py index 23a4c3c..4e88788 100644 --- a/pySim/app.py +++ b/pySim/app.py @@ -26,6 +26,9 @@ from pySim.ts_102_221 import CardProfileUICC from pySim.utils import all_subclasses from pySim.exceptions import SwMatchError +from pySim.log import PySimLogger + +log = PySimLogger.get(__name__) # we need to import this module so that the SysmocomSJA2 sub-class of # CardModel is created, which will add the ATR-based matching and @@ -54,7 +57,7 @@ # Wait up to three seconds for a card in reader and try to detect # the card type. - print("Waiting for card...") + log.info("Waiting for card...") sl.wait_for_card(3) # The user may opt to skip all card initialization. In this case only the @@ -66,7 +69,7 @@ generic_card = False card = card_detect(scc) if card is None: - print("Warning: Could not detect card type - assuming a generic card type...") + log.warning("Could not detect card type - assuming a generic card type...") card = SimCardBase(scc) generic_card = True @@ -76,7 +79,7 @@ # just means that pySim was unable to recognize the card profile. This # may happen in particular with unprovisioned cards that do not have # any files on them yet. - print("Unsupported card type!") + log.warning("Unsupported card type!") return None, card # ETSI TS 102 221, Table 9.3 specifies a default for the PIN key @@ -87,7 +90,7 @@ if generic_card and isinstance(profile, CardProfileUICC): card._adm_chv_num = 0x0A - print("Info: Card is of type: %s" % str(profile)) + log.info("Card is of type: %s", str(profile)) # FIXME: this shouldn't really be here but somewhere else/more generic. # We cannot do it within pySim/profile.py as that would create circular -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42738?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I95b4536cc8853e7ba6a5dd573b903dfb85e56b9a Gerrit-Change-Number: 42738 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[XS] Change in pysim[master]: pySimLogger: fix default log format string
by laforge 13 May '26

13 May '26

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/42737?usp=email ) Change subject: pySimLogger: fix default log format string ...................................................................... pySimLogger: fix default log format string In format string we prepend when we log in verbose mode. We use %(module)s as format string quaifier. This qualifier is replaced with the name of the module from where the logger was called. This is mostly equal to the logger name (__name__) we pass when we create the logger. However, this is not the behavior we actually want. We want to log the logger name that we passed when the logger was created. For this, we must use %(name)s as qualifier. Related: SYS#6959 Change-Id: I3951a70ad6ce864a7158b093cba46ae9fc1cb5bd --- M pySim/log.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/log.py b/pySim/log.py index 801ad69..345cf78 100644 --- a/pySim/log.py +++ b/pySim/log.py @@ -44,7 +44,7 @@ """ LOG_FMTSTR = "%(levelname)s: %(message)s" - LOG_FMTSTR_VERBOSE = "%(module)s.%(lineno)d -- " + LOG_FMTSTR + LOG_FMTSTR_VERBOSE = "%(name)s.%(lineno)d -- " + LOG_FMTSTR __formatter = logging.Formatter(LOG_FMTSTR) __formatter_verbose = logging.Formatter(LOG_FMTSTR_VERBOSE) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/42737?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I3951a70ad6ce864a7158b093cba46ae9fc1cb5bd Gerrit-Change-Number: 42737 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

2026

2025

2024

2023

2022

gerrit-log May 2026