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

[M] Change in osmo-tetra[master]: Added keyfile parsing code and various crypto improvements
by laforge 29 Jul '23

29 Jul '23

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33997 ) Change subject: Added keyfile parsing code and various crypto improvements ...................................................................... Patch Set 2: (1 comment) File src/tetra-rx.c: https://gerrit.osmocom.org/c/osmo-tetra/+/33997/comment/4feb8f43_2f5936f7 PS2, Line 96: talloc again, just FYI: talloc is hieararchical. If one would pass the tetra_mac_state as context pointer when allocationg the tcs (instead of NULL as you're doing), then talloc_free(tms) would automatically free the tcs. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f Gerrit-Change-Number: 33997 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:25:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-tetra[master]: Added keyfile loading
by laforge 29 Jul '23

29 Jul '23

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33998 ) Change subject: Added keyfile loading ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33998 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I65b7ac8feb3c2a9a8cac95149f625e9ef534b66c Gerrit-Change-Number: 33998 Gerrit-PatchSet: 3 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:24:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmo-tetra[master]: Added keyfile parsing code and various crypto improvements
by laforge 29 Jul '23

29 Jul '23

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33997 ) Change subject: Added keyfile parsing code and various crypto improvements ...................................................................... Patch Set 2: (1 comment) File src/crypto/tetra_crypto.c: https://gerrit.osmocom.org/c/osmo-tetra/+/33997/comment/26f8ecc4_a639c136 PS2, Line 194: exit > I'm not yet sure how/where load_keystore() is called, but if it's called unconditionally then we sho […] ok, it's in the next commit, and it's optional. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f Gerrit-Change-Number: 33997 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:24:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0

[M] Change in osmo-tetra[master]: Added keyfile parsing code and various crypto improvements
by laforge 29 Jul '23

29 Jul '23

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33997 ) Change subject: Added keyfile parsing code and various crypto improvements ...................................................................... Patch Set 2: Code-Review+1 (3 comments) Patchset: PS2: commit log lines shouldn't usually exceed 72chars length, see https://www.gitkraken.com/learn/git/best-practices/git-commit-message I think my git setup would warn me locally if I attempted to commit longer lines, but maybe that's a local setting. File src/crypto/tetra_crypto.c: https://gerrit.osmocom.org/c/osmo-tetra/+/33997/comment/fa17beb0_ddb95659 PS2, Line 194: exit I'm not yet sure how/where load_keystore() is called, but if it's called unconditionally then we shouldn't exit the program if the file doesn't exist. Not everyone will need crypto support. https://gerrit.osmocom.org/c/osmo-tetra/+/33997/comment/3172eddd_62d9248b PS2, Line 232: (uint32_t *) &tcdb->keys[i].key[0], (uint32_t *) &tcdb->keys[i].key[1], : (uint32_t *) &tcdb->keys[i].key[2], (uint32_t *) &tcdb->keys[i].key[3], : (uint32_t *) &tcdb->keys[i].key[4], (uint32_t *) &tcdb->keys[i].key[5], : (uint32_t *) &tcdb->keys[i].key[6], (uint32_t *) &tcdb->keys[i].key[7], : (uint32_t *) &tcdb->keys[i].key[8], (uint32_t *) &tcdb->keys[i].key[9]); JFYI, not a change request: we'd have osmo_hexparse in libosmocore for hex-ascii-to-bytearray-conversion. -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: I1c7afeeb2dcf97ece44bb4b604f44ba88882b93f Gerrit-Change-Number: 33997 Gerrit-PatchSet: 2 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 08:23:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-tetra[master]: Fixed makefile to also clean crypto subdirectory
by laforge 29 Jul '23

29 Jul '23

Attention is currently required from: wbokslag. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-tetra/+/33996 ) Change subject: Fixed makefile to also clean crypto subdirectory ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-tetra/+/33996 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-tetra Gerrit-Branch: master Gerrit-Change-Id: Ib2a404edece89d26d5369f4ff2ad7510611cac08 Gerrit-Change-Number: 33996 Gerrit-PatchSet: 1 Gerrit-Owner: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: wbokslag <w.bokslag(a)midnightblue.nl> Gerrit-Comment-Date: Sat, 29 Jul 2023 06:27:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do
by laforge 29 Jul '23

29 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34007 ) Change subject: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do ...................................................................... ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do The command wasn't used the correct dict to allow the encoders to work. Related: OS#6121 Change-Id: Ic2bc179b413a6b139e07e3e55b93ff921cb020a9 --- M pySim/ara_m.py 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ara_m.py b/pySim/ara_m.py index e2e6da1..8144381 100644 --- a/pySim/ara_m.py +++ b/pySim/ara_m.py @@ -354,7 +354,7 @@ ref_do_content += [{'aid_ref_empty_do': None}] ref_do_content += [{'dev_app_id_ref_do': opts.device_app_id}] if opts.pkg_ref: - ref_do_content += [{'pkg_ref_do': opts.pkg_ref}] + ref_do_content += [{'pkg_ref_do': {'package_name_string': opts.pkg_ref}}] # AR ar_do_content = [] if opts.apdu_never: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic2bc179b413a6b139e07e3e55b93ff921cb020a9 Gerrit-Change-Number: 34007 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: Fix the remaining functions using the broken Card.update_ust() call
by laforge 29 Jul '23

29 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34008 ) Change subject: Fix the remaining functions using the broken Card.update_ust() call ...................................................................... Fix the remaining functions using the broken Card.update_ust() call Card.update_ust() got replaced by the file operation ust_update(). In addition to Change-Id I7a6a77b872a6f5d8c478ca75dcff8ea067b8203e Fixes: f8d2e2ba0892 ("split pySim/legacy/{cards,utils} from pySim/{cards,utils}") Change-Id: Ie6405cae37493a2101e5089a8d11766fbfed4518 --- M pySim/ts_31_102.py M pySim/ts_31_103.py 2 files changed, 27 insertions(+), 8 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/ts_31_102.py b/pySim/ts_31_102.py index a90139d..c7a58f1 100644 --- a/pySim/ts_31_102.py +++ b/pySim/ts_31_102.py @@ -660,12 +660,14 @@ super().__init__() def do_est_service_enable(self, arg): - """Enable a service within EF.UST""" - self._cmd.card.update_est(int(arg), 1) + """Enable a service within EF.EST""" + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_est_service_disable(self, arg): - """Disable a service within EF.UST""" - self._cmd.card.update_est(int(arg), 0) + """Disable a service within EF.EST""" + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) # TS 31.102 Section 4.2.48 class EF_ACL(TransparentEF): @@ -1062,11 +1064,13 @@ def do_prose_service_activate(self, arg): """Activate a service within EF.5G_PROSE_ST""" - self._cmd.card.update_ust(int(arg), 1) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_prose_service_deactivate(self, arg): """Deactivate a service within EF.5G_PROSE_ST""" - self._cmd.card.update_ust(int(arg), 0) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) # TS 31.102 Section 4.4.13.3 (Rel 17) class EF_5G_PROSE_DD(TransparentEF): diff --git a/pySim/ts_31_103.py b/pySim/ts_31_103.py index 19ade2b..4327a1a 100644 --- a/pySim/ts_31_103.py +++ b/pySim/ts_31_103.py @@ -111,11 +111,13 @@ def do_ist_service_activate(self, arg): """Activate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 1) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [int(arg)], []) def do_ist_service_deactivate(self, arg): """Deactivate a service within EF.IST""" - self._cmd.card.update_ist(int(arg), 0) + selected_file = self._cmd.lchan.selected_file + selected_file.ust_update(self._cmd, [], [int(arg)]) def do_ist_service_check(self, arg): """Check consistency between services of this file and files present/activated. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie6405cae37493a2101e5089a8d11766fbfed4518 Gerrit-Change-Number: 34008 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

[S] Change in pysim[master]: Fix the remaining functions using the broken Card.update_ust() call
by laforge 29 Jul '23

29 Jul '23

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34008 ) Change subject: Fix the remaining functions using the broken Card.update_ust() call ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34008 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie6405cae37493a2101e5089a8d11766fbfed4518 Gerrit-Change-Number: 34008 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: Sat, 29 Jul 2023 06:23:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do
by laforge 29 Jul '23

29 Jul '23

Attention is currently required from: lynxis lazus. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/34007 ) Change subject: ARA-M: fix encoding of the PkgRefDO when using aram_store_ref_ar_do ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34007 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic2bc179b413a6b139e07e3e55b93ff921cb020a9 Gerrit-Change-Number: 34007 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: Sat, 29 Jul 2023 06:22:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in pysim[master]: utils.py: remove superfluous import from itself
by laforge 29 Jul '23

29 Jul '23

laforge has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34002 ) Change subject: utils.py: remove superfluous import from itself ...................................................................... utils.py: remove superfluous import from itself b2h() is already available. Change-Id: Ied513a08cc8b5091dd467106250f1e6b5067c3a8 --- M pySim/utils.py 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/pySim/utils.py b/pySim/utils.py index 1541e2e..6cacdaa 100644 --- a/pySim/utils.py +++ b/pySim/utils.py @@ -537,7 +537,6 @@ from Cryptodome.Cipher import AES # pylint: disable=no-name-in-module from Cryptodome.Util.strxor import strxor - from pySim.utils import b2h # We pass in hex string and now need to work on bytes ki_bytes = bytes(h2b(ki_hex)) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34002 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ied513a08cc8b5091dd467106250f1e6b5067c3a8 Gerrit-Change-Number: 34002 Gerrit-PatchSet: 3 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0