November 2024 - gerrit-log - lists.osmocom.org

[XS] Change in osmo-ci[master]: jobs/master-builds: android-apdu-proxy -> gerrit

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38821?usp=email ) Change subject: jobs/master-builds: android-apdu-proxy -> gerrit ...................................................................... jobs/master-builds: android-apdu-proxy -> gerrit The repository is now in gerrit. Related: OS#6367 Change-Id: I102957f8b23653bdf2e414fcb7fec0f2f78feb2e --- M jobs/master-builds.yml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/21/38821/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index e37d1d2..f15386b 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -83,7 +83,6 @@ # in alphabetical order repos: - android-apdu-proxy: - repos_url: '{gitea_url}/sim-card/android-apdu-proxy' branch: master cmd: | ANDROID_CACHE="$HOME/android-cache/master-builds/android" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38821?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I102957f8b23653bdf2e414fcb7fec0f2f78feb2e Gerrit-Change-Number: 38821 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[S] Change in osmo-ci[master]: jobs/gerrit-verifications: add android-apdu-proxy

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/38822?usp=email ) Change subject: jobs/gerrit-verifications: add android-apdu-proxy ...................................................................... jobs/gerrit-verifications: add android-apdu-proxy Related: OS#6367 Change-Id: I688a78ce944e68e97a229df01ced32b7cbd10cc4 --- M jobs/gerrit-verifications.yml 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/22/38822/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index c91eb95..fdec2e8 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -84,6 +84,7 @@ -v "$CCACHE_DIR:/ccache" \ docker_img: '$USER/debian-bookworm-build' docker_img_erlang: '$USER/debian-bookworm-erlang' + docker_img_android: 'registry.osmocom.org/osmocom-build/debian-bookworm-android' timeout_cmd: '/usr/bin/timeout 30m' cmd: '{docker_run_ccache} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh' gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418' @@ -96,6 +97,19 @@ # in alphabetical order repos: + - android-apdu-proxy: + pipeline_binpkgs: "" + concurrent: false # might cause problems with shared cache + cmd: | + ANDROID_CACHE="$HOME/android-cache/gerrit-verifications/android" + GRADLE_CACHE="$HOME/android-cache/gerrit-verifications/gradle" + mkdir -p "$ANDROID_CACHE" "$GRADLE_CACHE" + docker pull {docker_img_android} + {docker_run} \ + -v "$ANDROID_CACHE":/build/.android \ + -v "$GRADLE_CACHE":/build/.gradle \ + {docker_img_android} {timeout_cmd} contrib/jenkins.sh + - asn1c: pipeline_binpkgs: "" pipeline_lint: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/38822?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I688a78ce944e68e97a229df01ced32b7cbd10cc4 Gerrit-Change-Number: 38822 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[XS] Change in android-apdu-proxy[master]: (do not merge) test commit for CI

by osmith

osmith has abandoned this change. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/38820?usp=email ) Change subject: (do not merge) test commit for CI ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38820?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: abandon Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: Ifb00a05c4df2537f5664d79858f80256a2c63fec Gerrit-Change-Number: 38820 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

7 months, 1 week

1
0
0 0

[XS] Change in android-apdu-proxy[master]: (do not merge) test commit for CI

by osmith

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38820?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: (do not merge) test commit for CI ...................................................................... (do not merge) test commit for CI Change-Id: Ifb00a05c4df2537f5664d79858f80256a2c63fec --- A test 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/android-apdu-proxy refs/changes/20/38820/3 -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38820?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: Ifb00a05c4df2537f5664d79858f80256a2c63fec Gerrit-Change-Number: 38820 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder

7 months, 1 week

1
0
0 0

[XS] Change in android-apdu-proxy[master]: (do not merge) test commit for CI

by osmith

osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/38820?usp=email ) Change subject: (do not merge) test commit for CI ...................................................................... (do not merge) test commit for CI Change-Id: Ifb00a05c4df2537f5664d79858f80256a2c63fec --- A test 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/android-apdu-proxy refs/changes/20/38820/2 -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38820?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: Ifb00a05c4df2537f5664d79858f80256a2c63fec Gerrit-Change-Number: 38820 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[NoOp] Change in android-apdu-proxy[master]: (do not merge) test commit for CI

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/android-apdu-proxy/+/38820?usp=email ) Change subject: (do not merge) test commit for CI ...................................................................... (do not merge) test commit for CI Change-Id: Ifb00a05c4df2537f5664d79858f80256a2c63fec --- A test 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/android-apdu-proxy refs/changes/20/38820/1 diff --git a/test b/test new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test -- To view, visit https://gerrit.osmocom.org/c/android-apdu-proxy/+/38820?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: android-apdu-proxy Gerrit-Branch: master Gerrit-Change-Id: Ifb00a05c4df2537f5664d79858f80256a2c63fec Gerrit-Change-Number: 38820 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de>

7 months, 1 week

1
0
0 0

[M] Change in pysim[master]: global_platform/scp: refactor _wrap_cmd_apdu

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/38635?usp=email ) Change subject: global_platform/scp: refactor _wrap_cmd_apdu ...................................................................... global_platform/scp: refactor _wrap_cmd_apdu The _wrap_cmd_apdu methods for SCP02 and SCP03 are a bit hard to read. Let's refactor them so that it is easier to understand what happens. In particular that one can not have encryption (cenc) without signing (cmac) Related: OS#6367 Change-Id: I4c5650337779a4bd1f98673650c6c3cb526d518b --- M pySim/global_platform/scp.py 1 file changed, 41 insertions(+), 34 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index 0b1f6a9..ee08058 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -275,34 +275,39 @@ def _wrap_cmd_apdu(self, apdu: bytes, *args, **kwargs) -> bytes: """Wrap Command APDU for SCP02: calculate MAC and encrypt.""" + logger.debug("wrap_cmd_apdu(%s)", b2h(apdu)) + + if not self.do_cmac: + return apdu + lc = len(apdu) - 5 assert len(apdu) >= 5, "Wrong APDU length: %d" % len(apdu) assert len(apdu) == 5 or apdu[4] == lc, "Lc differs from length of data: %d vs %d" % (apdu[4], lc) - logger.debug("wrap_cmd_apdu(%s)", b2h(apdu)) - + # CLA without log. channel can be 80 or 00 only cla = apdu[0] b8 = cla & 0x80 if cla & 0x03 or cla & CLA_SM: # nonzero logical channel in APDU, check that are the same assert cla == self._cla(False, b8), "CLA mismatch" - # CLA without log. channel can be 80 or 00 only - if self.do_cmac: - if self.mac_on_unmodified: - mlc = lc - clac = cla - else: # CMAC on modified APDU - mlc = lc + 8 - clac = cla | CLA_SM - mac = self.sk.calc_mac_1des(bytes([clac]) + apdu[1:4] + bytes([mlc]) + apdu[5:]) - if self.do_cenc: - k = DES3.new(self.sk.enc, DES.MODE_CBC, b'\x00'*8) - data = k.encrypt(pad80(apdu[5:], 8)) - lc = len(data) - else: - data = apdu[5:] - lc += 8 - apdu = bytes([self._cla(True, b8)]) + apdu[1:4] + bytes([lc]) + data + mac + + if self.mac_on_unmodified: + mlc = lc + clac = cla + else: + # CMAC on modified APDU + mlc = lc + 8 + clac = cla | CLA_SM + mac = self.sk.calc_mac_1des(bytes([clac]) + apdu[1:4] + bytes([mlc]) + apdu[5:]) + if self.do_cenc: + k = DES3.new(self.sk.enc, DES.MODE_CBC, b'\x00'*8) + data = k.encrypt(pad80(apdu[5:], 8)) + lc = len(data) + else: + data = apdu[5:] + + lc += 8 + apdu = bytes([self._cla(True, b8)]) + apdu[1:4] + bytes([lc]) + data + mac return apdu def unwrap_rsp_apdu(self, sw: bytes, rsp_apdu: bytes) -> bytes: @@ -475,6 +480,11 @@ def _wrap_cmd_apdu(self, apdu: bytes, skip_cenc: bool = False) -> bytes: """Wrap Command APDU for SCP03: calculate MAC and encrypt.""" + logger.debug("wrap_cmd_apdu(%s)", b2h(apdu)) + + if not self.do_cmac: + return apdu + cla = apdu[0] ins = apdu[1] p1 = apdu[2] @@ -484,7 +494,6 @@ cmd_data = apdu[5:] if self.do_cenc and not skip_cenc: - assert self.do_cmac if lc == 0: # No encryption shall be applied to a command where there is no command data field. In this # case, the encryption counter shall still be incremented @@ -498,20 +507,18 @@ # perform AES-CBC with ICV + S_ENC cmd_data = self.sk._encrypt(padded_data) - if self.do_cmac: - # The length of the command message (Lc) shall be incremented by 8 (in S8 mode) or 16 (in S16 - # mode) to indicate the inclusion of the C-MAC in the data field of the command message. - mlc = lc + self.s_mode - if mlc >= 256: - raise ValueError('Modified Lc (%u) would exceed maximum when appending %u bytes of mac' % (mlc, self.s_mode)) - # The class byte shall be modified for the generation or verification of the C-MAC: The logical - # channel number shall be set to zero, bit 4 shall be set to 0 and bit 3 shall be set to 1 to indicate - # GlobalPlatform proprietary secure messaging. - mcla = (cla & 0xF0) | CLA_SM - apdu = bytes([mcla, ins, p1, p2, mlc]) + cmd_data - cmac = self.sk.calc_cmac(apdu) - apdu += cmac[:self.s_mode] - + # The length of the command message (Lc) shall be incremented by 8 (in S8 mode) or 16 (in S16 + # mode) to indicate the inclusion of the C-MAC in the data field of the command message. + mlc = lc + self.s_mode + if mlc >= 256: + raise ValueError('Modified Lc (%u) would exceed maximum when appending %u bytes of mac' % (mlc, self.s_mode)) + # The class byte shall be modified for the generation or verification of the C-MAC: The logical + # channel number shall be set to zero, bit 4 shall be set to 0 and bit 3 shall be set to 1 to indicate + # GlobalPlatform proprietary secure messaging. + mcla = (cla & 0xF0) | CLA_SM + apdu = bytes([mcla, ins, p1, p2, mlc]) + cmd_data + cmac = self.sk.calc_cmac(apdu) + apdu += cmac[:self.s_mode] return apdu def unwrap_rsp_apdu(self, sw: bytes, rsp_apdu: bytes) -> bytes: -- To view, visit https://gerrit.osmocom.org/c/pysim/+/38635?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: I4c5650337779a4bd1f98673650c6c3cb526d518b Gerrit-Change-Number: 38635 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> 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>

7 months, 1 week

1
0
0 0

[S] Change in osmo-hlr[master]: vty: always emit reject-cause lines in saved config

by fixeria

Attention is currently required from: falconia. fixeria has posted comments on this change by falconia. ( https://gerrit.osmocom.org/c/osmo-hlr/+/38818?usp=email ) Change subject: vty: always emit reject-cause lines in saved config ...................................................................... Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: I never liked hiding settings, even if they're set to default, so CR+1 from me. -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/38818?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I18708fc1c08a85e98582c97ec59dd3822a0767fb Gerrit-Change-Number: 38818 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Comment-Date: Tue, 19 Nov 2024 09:35:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[M] Change in osmo-bts[master]: csd_v110: handle TCH/F14.4

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email ) Change subject: csd_v110: handle TCH/F14.4 ...................................................................... Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38751?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I3c3bef0bd2f72b8381597b5699e2060165b702a0 Gerrit-Change-Number: 38751 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 09:22:30 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

[S] Change in osmo-bts[master]: csd_v110: clarify lchan description for TCH/F14.4

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-bts/+/38817?usp=email ) Change subject: csd_v110: clarify lchan description for TCH/F14.4 ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File include/osmo-bts/csd_v110.h: https://gerrit.osmocom.org/c/osmo-bts/+/38817/comment/95eef219_96026898?usp… : PS1, Line 11: uint16_t num_other_bits; /* number of other bits (e.g. M-bits for TCH/F14.4) */ this can be a uint8_t afaiu? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/38817?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4f11eda98420587efa339484b62f46bf19f78809 Gerrit-Change-Number: 38817 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 19 Nov 2024 09:18:39 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes

7 months, 1 week

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2024