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 (#5).
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/5
--
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: 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>
Attention is currently required from: laforge.
Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759?usp=email )
Change subject: Make ch9 usb tests work
......................................................................
Patch Set 2:
(4 comments)
File contrib/ch9_epstall.py:
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759/comment/c1ebedac_68… :
PS1, Line 3: ch9 usb ep halt test
> Does that test have a name/number? If so, it would be good to add as a spec reference.
Done
File contrib/gdb_clocktree.py:
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759/comment/4f1d368a_b8… :
PS1, Line 1: import gdb
> please add copyright/author and at least a brief summary.
Done
File contrib/gdb_sercom.py:
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759/comment/794b71d1_c8… :
PS1, Line 1: import gdb
> a line with author / copyright information is missing, and at least a very high-level description of […]
Done
File contrib/gdb_usb.py:
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39759/comment/34c176e3_45… :
PS1, Line 3:
> same here: copyright/author/brief description
there will not be a description because i specifically said snippets which means collection of random code fragments that might or might not be useful. nothing is useful as is. i just don't want to poke google every time some arcane gdb python bullshit acts up again.
--
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: comment
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: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 11 Mar 2025 17:47:08 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Attention is currently required from: laforge.
Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email )
Change subject: add ext power detect & dev reset
......................................................................
Patch Set 8:
(1 comment)
File sysmoOCTSIM/main.c:
https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447/comment/63e1ecf6_3a… :
PS7, Line 334: {
> the purpose here is to reset the board if it switches from bus-powered to self-powered? might be goo […]
i really don't think we need one line of comments for a 2 line function that is called extpower_detect and calls systemreset...
--
To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/39447?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-Change-Id: Ied62450670dba2227daa96cbcd162cfe8414445a
Gerrit-Change-Number: 39447
Gerrit-PatchSet: 8
Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Comment-Date: Tue, 11 Mar 2025 17:47:03 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
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>
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>
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>
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>
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>
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>