March 2025 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ccid-firmware[master]: out ep: fix swapped error handling

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39501?usp=email to look at the new patch set (#4). 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: out ep: fix swapped error handling ...................................................................... out ep: fix swapped error handling Change-Id: I2833f0aca3ffebfceaaf2a0681a9f8242817e722 --- M sysmoOCTSIM/main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/01/39501/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39501?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I2833f0aca3ffebfceaaf2a0681a9f8242817e722 Gerrit-Change-Number: 39501 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

[XS] Change in osmo-ccid-firmware[master]: usb desc: use per-interface dev class instead of CDC

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39446?usp=email to look at the new patch set (#6). 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: usb desc: use per-interface dev class instead of CDC ...................................................................... usb desc: use per-interface dev class instead of CDC Change-Id: I9d4f88b973f0c16d2c1241343d416496b35019a0 --- M sysmoOCTSIM/usb_descriptors.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/46/39446/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39446?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I9d4f88b973f0c16d2c1241343d416496b35019a0 Gerrit-Change-Number: 39446 Gerrit-PatchSet: 6 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

[M] Change in osmo-ccid-firmware[master]: fix usb usb reset handling by delayed soft reset

by Hoernchen

Attention is currently required from: Hoernchen. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39445?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: fix usb usb reset handling by delayed soft reset ...................................................................... fix usb usb reset handling by delayed soft reset Requires BL clock init, not compatible with old bootloaders! Will always reboot to DFU mode with old bootloader/wrong clocks. Change-Id: I0939930a42f3009abf7e670561a123963bbd3845 --- M sysmoOCTSIM/atmel_start.c M sysmoOCTSIM/hpl/core/hpl_init.c M sysmoOCTSIM/hpl/usb/hpl_usb.c M sysmoOCTSIM/main.c M sysmoOCTSIM/usb_start.c 5 files changed, 34 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/45/39445/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I0939930a42f3009abf7e670561a123963bbd3845 Gerrit-Change-Number: 39445 Gerrit-PatchSet: 5 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

[XL] Change in osmo-ccid-firmware[master]: Make ch9 usb tests work

by Hoernchen

Attention is currently required from: Hoernchen, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified-1 by Jenkins Builder Change subject: Make ch9 usb tests work ...................................................................... Make ch9 usb tests work This passes all tests except TD 9.9. That's is weird, because 9.9 works fine when doing the same commands on linux. It does not really matter anyway, since stalling the device ep by sending a message from the host is is only useful for the test itself... There is no reasonable way to continue running after random forced ep stalls anyway, resetting the device would be the sane option. This adds some mildly useful debug python snippets that can be used to inspect the device state. Change-Id: Icadaee9d8cbe24bd3cac002cc4f710dcf846a32b --- M ccid_common/cuart.c A contrib/ch9_epstall.py A contrib/gdb_clocktree.py A contrib/gdb_msgb.py A contrib/gdb_sercom.py A contrib/gdb_usb.py M sysmoOCTSIM/hpl/usb/hpl_usb.c M sysmoOCTSIM/main.c M sysmoOCTSIM/usb/class/ccid/device/ccid_df.c M sysmoOCTSIM/usb/class/ccid/device/ccid_df.h M sysmoOCTSIM/usb/device/usbdc.c 11 files changed, 1,306 insertions(+), 50 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/59/39759/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: Icadaee9d8cbe24bd3cac002cc4f710dcf846a32b Gerrit-Change-Number: 39759 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org>

3 months, 4 weeks

1
0
0 0

[L] Change in docker-playground[master]: nplab-{m3ua,sua}-test: Record pcap of all testsuite run

by pespin

Attention is currently required from: laforge, osmith, pespin. Hello Jenkins Builder, laforge, osmith, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: nplab-{m3ua,sua}-test: Record pcap of all testsuite run ...................................................................... nplab-{m3ua,sua}-test: Record pcap of all testsuite run Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 --- A common/tcpdump-start.sh A common/tcpdump-stop.sh M debian-buster-build/Dockerfile M nplab-m3ua-test/Dockerfile M nplab-m3ua-test/jenkins.sh M nplab-m3ua-test/osmo-stp.cfg A nplab-m3ua-test/test.sh M nplab-sua-test/Dockerfile M nplab-sua-test/jenkins.sh M nplab-sua-test/osmo-stp.cfg A nplab-sua-test/test.sh 11 files changed, 239 insertions(+), 44 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/70/39770/3 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 Gerrit-Change-Number: 39770 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

[S] Change in aram-applet[master]: AccessRuleMaster: allow locking of STORE DATA commands

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/aram-applet/+/39615?usp=email ) Change subject: AccessRuleMaster: allow locking of STORE DATA commands ...................................................................... AccessRuleMaster: allow locking of STORE DATA commands The ara-m applet has no security features whatsoever. The rules can be edited by any user that has APDU access to the ARA-M application. To add a bit of security for users who want to make sure that their ARA-M rules are not edited by unauthorized partys, let's add a propritary lock/unlock command that can be used to lock the access to STORE DATA on the normal APDU interface of the application. Once locked, the access to STORE DATA can only be unlocked via an INSTALL for personalization command that is issued from the ISD on a secure channel. Related: SYS#7245 Change-Id: I86437844585c22fc4280cc48b99edbb56e3159db --- M aram/src/main/java/fr/bmartel/aram/AccessRuleMaster.java 1 file changed, 19 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve diff --git a/aram/src/main/java/fr/bmartel/aram/AccessRuleMaster.java b/aram/src/main/java/fr/bmartel/aram/AccessRuleMaster.java index bdce9c3..4ebf704 100644 --- a/aram/src/main/java/fr/bmartel/aram/AccessRuleMaster.java +++ b/aram/src/main/java/fr/bmartel/aram/AccessRuleMaster.java @@ -48,6 +48,9 @@ public final static byte COMMAND_DELETE = (byte) 0xF1; public final static byte COMMAND_UPDATE_REFRESH_TAG = (byte) 0xF2; + public final static byte COMMAND_LOCK_ARAM = (byte) 0xA1; + public final static byte COMMAND_UNLOCK_ARAM = (byte) 0xA2; + /** * APDU data size. */ @@ -70,6 +73,11 @@ * current chunk index to send for next GET NEXT command. */ private short currentNext; + /** + * lock status of the Access Rule Master. When set to true, it is no longer possible to issue + * STORE DATA commands to the applet through its process interface. + */ + private boolean aram_lock_status; private AccessRuleMaster() { refreshTag = new byte[8]; @@ -94,7 +102,8 @@ case INS_STORE_DATA: if (apdu.setIncomingAndReceive() != (short) (buffer[ISO7816.OFFSET_LC] & 0xFF)) ISOException.throwIt(ISO7816.SW_WRONG_LENGTH); - + if (this.aram_lock_status) + ISOException.throwIt(ISO7816.SW_SECURITY_STATUS_NOT_SATISFIED); processCmdStoreData(APDU.getCurrentAPDUBuffer()); break; case INS_GET_DATA: @@ -291,6 +300,12 @@ deleteArDo(buf); } else if (buf[ofs] == AccessRuleMaster.COMMAND_UPDATE_REFRESH_TAG) { updateRefreshTag(); + } else if (buf[ofs] == AccessRuleMaster.COMMAND_LOCK_ARAM) { + this.aram_lock_status = true; + return; + } else if (buf[ofs] == AccessRuleMaster.COMMAND_UNLOCK_ARAM) { + this.aram_lock_status = false; + return; } else { ISOException.throwIt(ISO7816.SW_DATA_INVALID); } @@ -425,7 +440,9 @@ } /** - * Process data from install for personalization. + * Process data from install for personalization. Since this method is only called by the SD, no extra security + * checks are required (See also: GPC_SPE_034, section 11.5: "The INSTALL command is issued to a Security Domain + * to initiate or perform the various steps required for Card Content management."). * * @param data input data * @param ofs data offset -- To view, visit https://gerrit.osmocom.org/c/aram-applet/+/39615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: aram-applet Gerrit-Branch: master Gerrit-Change-Id: I86437844585c22fc4280cc48b99edbb56e3159db Gerrit-Change-Number: 39615 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

[S] Change in aram-applet[master]: AccessRuleMaster: allow locking of STORE DATA commands

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change by dexter. ( https://gerrit.osmocom.org/c/aram-applet/+/39615?usp=email ) Change subject: AccessRuleMaster: allow locking of STORE DATA commands ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/aram-applet/+/39615?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: aram-applet Gerrit-Branch: master Gerrit-Change-Id: I86437844585c22fc4280cc48b99edbb56e3159db Gerrit-Change-Number: 39615 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:45:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 4 weeks

1
0
0 0

[M] Change in docker-playground[master]: nplab-m3ua-test: Record pcap of all testsuite run

by laforge

Attention is currently required from: osmith, pespin. laforge has posted comments on this change by pespin. ( https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email ) Change subject: nplab-m3ua-test: Record pcap of all testsuite run ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/39770?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If4ea74c07d5aaca1278811ce8398dff23c386c10 Gerrit-Change-Number: 39770 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 11 Mar 2025 16:44:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

3 months, 4 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?usp=email ) Change subject: m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer ...................................................................... m3ua: Fix fsm dispatch failure not generating tx ERR msg to peer Recent commit reworked those code paths to return an error type instead of an err message, but wrongly left the negative error of osmo_fsm_inst_dispatch() code path as is, without converting it to a positive m3ua error code value, which ended up in an ERR msg not being generated. Fixes: 82c1d2c8c6699349258869bce690293b590a6b0d Change-Id: I16042c97453854c78e55bfe6bd6925506eae82c5 --- M src/m3ua.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/m3ua.c b/src/m3ua.c index 39c799e..04ee7c5 100644 --- a/src/m3ua.c +++ b/src/m3ua.c @@ -734,6 +734,8 @@ /* deliver that event to the ASP FSM */ rc = osmo_fsm_inst_dispatch(asp->fi, event, xua); + if (rc < 0) + rc = M3UA_ERR_UNEXPECTED_MSG; ret_free: xua_msg_free(xua); return rc; -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39771?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I16042c97453854c78e55bfe6bd6925506eae82c5 Gerrit-Change-Number: 39771 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

[XS] Change in libosmo-sigtran[master]: sccp: Use protoClass 0 to transmit SSA

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-sigtran/+/39766?usp=email ) Change subject: sccp: Use protoClass 0 to transmit SSA ...................................................................... sccp: Use protoClass 0 to transmit SSA Recent commit added the possibility to set proto Class 0 vs 1 based on Sequence Control parameter present in UNITDATA.req, but forgot to extend it to the special code path used tro transmit SSA. As a result, libosmo-sigtran started transmitting SSA with protoClass 1 instead of previous 0. This is actually not bad, but there's no need to use protocClass1 here since we don't care about other messages being sent together with this one, so protoClass0 is better fit here. Fixes: 0061e8d0bcba3b0ed5ea255588619627d0975380 Change-Id: I906094a14be670e665ed8ffd0383dd8da690cb9a --- M src/sccp_scmg.c 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sccp_scmg.c b/src/sccp_scmg.c index a8ac766..755d272 100644 --- a/src/sccp_scmg.c +++ b/src/sccp_scmg.c @@ -166,7 +166,7 @@ }; static int sccp_scmg_tx(struct osmo_sccp_user *scu, const struct osmo_sccp_addr *calling_addr, - const struct osmo_sccp_addr *called_addr, + const struct osmo_sccp_addr *called_addr, const uint32_t *seq_ctrl, uint8_t msg_type, uint8_t ssn, uint16_t pc, uint8_t smi, uint8_t *ssc_cong_lvl) { struct msgb *msg = sccp_msgb_alloc(__func__); @@ -179,6 +179,7 @@ param = &prim->u.unitdata; memcpy(&param->calling_addr, calling_addr, sizeof(*calling_addr)); memcpy(&param->called_addr, called_addr, sizeof(*called_addr)); + param->in_sequence_control = seq_ctrl ? *seq_ctrl : OSMO_SCU_UNITDATA_REQ_P_SEQUENCE_CONTROL_NOT_PRESENT; osmo_prim_init(&prim->oph, SCCP_SAP_USER, OSMO_SCU_PRIM_N_UNITDATA, PRIM_OP_REQUEST, msg); /* Fill the actual SCMG message */ @@ -243,7 +244,7 @@ if (0 /* !subsys_available(scu) */) return 0; - return sccp_scmg_tx(scu, called_addr, calling_addr, SCCP_SCMG_MSGT_SSA, + return sccp_scmg_tx(scu, called_addr, calling_addr, NULL, SCCP_SCMG_MSGT_SSA, sst->affected_ssn, sst->affected_pc, 0, NULL); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-sigtran/+/39766?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmo-sigtran Gerrit-Branch: master Gerrit-Change-Id: I906094a14be670e665ed8ffd0383dd8da690cb9a Gerrit-Change-Number: 39766 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>

3 months, 4 weeks

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2025