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

[L] Change in osmo-ttcn3-hacks[master]: library/euicc: add ESipa JSON encoder/decoder module
by dexter 11 Aug '26

11 Aug '26

Attention is currently required from: jolly, pespin. Hello Jenkins Builder, jolly, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43144?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: library/euicc: add ESipa JSON encoder/decoder module ...................................................................... library/euicc: add ESipa JSON encoder/decoder module In order to test an eIM (or IPAd), which uses the JSON ESipa bindings instead of the ASN.1 ESipa bindings a set of encoder/decoder functions is needed to generate/parse the JSON messages exchanged on the ESipa interface Change-Id: I8b6a87f39ca23658d980d19cf257b8994ea1cecb Related: SYS#8100 --- M eim/eIM_Tests.cfg M eim/eIM_Tests.ttcn M eim/gen_links.sh M library/euicc/RSPDefinitions_Types.ttcn M library/euicc/SGP32Definitions_Types.ttcn A library/euicc/esipa_Types_JSON.ttcn 6 files changed, 705 insertions(+), 43 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/44/43144/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43144?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8b6a87f39ca23658d980d19cf257b8994ea1cecb Gerrit-Change-Number: 43144 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de>

1 0

[XS] Change in osmo-ttcn3-hacks[master]: GP32Definitions_Templates: Add A2 tag to tagList
by dexter 11 Aug '26

11 Aug '26

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43201?usp=email ) Change subject: GP32Definitions_Templates: Add A2 tag to tagList ...................................................................... GP32Definitions_Templates: Add A2 tag to tagList The tagList in ts_ipaEuiccDataRequest lacks the A2 tag (eUICC Package Results). Technically this is not an error, but let's add this Tag for completeness. Related: SYS#8100 Change-Id: Ie08aa81f71ed7968a19d48f138b30e45629f9919 --- M library/euicc/SGP32Definitions_Templates.ttcn 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/01/43201/1 diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn index 6722e11..be715b6 100644 --- a/library/euicc/SGP32Definitions_Templates.ttcn +++ b/library/euicc/SGP32Definitions_Templates.ttcn @@ -339,7 +339,7 @@ } template (value) IpaEuiccDataRequest ts_ipaEuiccDataRequest := { - tagList := '81BF20BF228384A5A6A8A9A0'O, + tagList := '81BF20BF228384A5A6A8A9A0A2'O, euiccCiPKIdentifierToBeUsed := omit, searchCriteriaNotification := omit, searchCriteriaEuiccPackageResult := omit, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43201?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie08aa81f71ed7968a19d48f138b30e45629f9919 Gerrit-Change-Number: 43201 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: eim_Tests: Add testcase to test ESipa/ES9+: CancelSession
by dexter 11 Aug '26

11 Aug '26

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43182?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: eim_Tests: Add testcase to test ESipa/ES9+: CancelSession ...................................................................... eim_Tests: Add testcase to test ESipa/ES9+: CancelSession The testsuite never sends or receives any messages related to ESipa/ES9+ CancelSession, let's implement a varinat of the "Cancel Session Procedure for Indirect Profile Download" as described in SGP.32 section 3.2.3.3 to increase the coverage accordingly. Related: SYS#8100 Change-Id: Iadc9010fcf08de98f7d8c2a5c68bb5ff71bfb1f6 --- M eim/eIM_Tests.ttcn 1 file changed, 59 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/eim/eIM_Tests.ttcn b/eim/eIM_Tests.ttcn index 26fe2bf..21da52b 100644 --- a/eim/eIM_Tests.ttcn +++ b/eim/eIM_Tests.ttcn @@ -521,6 +521,64 @@ setverdict(pass); } +/* A testcase to try out an unsuccessful indirect profile download where the session gets canceled + * See also: GSMA SGP.32, section 3.2.3.3: Cancel Session Procedure for Indirect Profile Download */ +private function f_TC_proc_indirect_prfle_dwnld_cancel_session(charstring id) runs on eIM_ConnHdlr { + var charstring resource_id; + var HTTP_Adapter_Params http_adapter_pars; + var charstring smdpp_add := mp_es9p_ip & ":" & int2str(mp_es9p_port) + var charstring activationCode := "1$" & smdpp_add & "$MyMatchingId" + var template EsipaMessageFromEimToIpa esipa_res; + var octetstring eimTransactionId; + + f_http_register(); + + f_init_pipe(); + http_adapter_pars := { + http_host := mp_esipa_ip, + http_port := mp_esipa_port, + use_ssl := not mp_esipa_disable_ssl + }; + f_http_init(http_adapter_pars); + + /* Create a new download at the eIM */ + resource_id := f_rest_create_order("download", ts_JSON_REST_download_order(eID, activationCode)); + + /* Check the eIM for new eIM packages, we expect to get a profileDownloadTriggerRequest that contains the + * activationCode that we have created the download with (see above) */ + esipa_res := f_esipa_transceive(valueof(ts_getEimPackageRequest(eID)), + tr_getEimPackageResponse_dnlTrigReq(tr_profileDownloadTriggerRequest(activationCode))); + eimTransactionId := valueof(esipa_res.getEimPackageResponse.profileDownloadTriggerRequest.eimTransactionId); + + /* Perform common mutial authentication procedure */ + f_proc_cmn_mtl_auth(eimTransactionId); + + /* Request/download bound profile package */ + f_esipa_send(valueof(ts_getBoundProfilePackageRequestEsipa)); + f_es9p_transceive(valueof(ts_getBoundProfilePackageResponse), tr_getBoundProfilePackageRequest); + f_esipa_receive(tr_getBoundProfilePackageResponseEsipa); + + /* Cancel session */ + f_esipa_send(valueof(ts_cancelSessionRequestEsipa)); + f_es9p_transceive_empty_response(tr_cancelSessionRequestEs9); + + f_rest_lookup_resource(resource_id, "download", tr_JSON_REST_success); + f_rest_delete_resource(resource_id, "download"); + + f_sleep(2.0); + setverdict(pass); +} +testcase TC_proc_indirect_prfle_dwnld_cancel_session() runs on MTC_CT { + var charstring id := testcasename(); + var eIM_ConnHdlrPars pars := f_init_pars(); + var eIM_ConnHdlr vc_conn; + f_init(id); + vc_conn := f_start_handler(refers(f_TC_proc_indirect_prfle_dwnld_cancel_session), pars); + vc_conn.done; + setverdict(pass); +} + + /* A testcase to try out an the Generic eUICC Package Download and Execution Procedure (PSMO), * See also: GSMA SGP.32, section 3.3.1: Generic eUICC Package Download and Execution */ private function f_TC_proc_euicc_pkg_dwnld_exec_psmo_or_eco(charstring facility, charstring id, @@ -949,6 +1007,7 @@ control { execute ( TC_proc_indirect_prfle_dwnld() ); + execute ( TC_proc_indirect_prfle_dwnld_cancel_session() ); execute ( TC_proc_euicc_pkg_dwnld_exec_enable_psmo() ); execute ( TC_proc_euicc_pkg_dwnld_exec_disable_psmo() ); execute ( TC_proc_euicc_pkg_dwnld_exec_delete_psmo() ); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43182?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: Iadc9010fcf08de98f7d8c2a5c68bb5ff71bfb1f6 Gerrit-Change-Number: 43182 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in osmo-ttcn3-hacks[master]: eim_Tests: Add testcase to test ESipa/ES9+: CancelSession
by dexter 11 Aug '26

11 Aug '26

Attention is currently required from: dexter. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43182?usp=email to look at the new patch set (#2). 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: eim_Tests: Add testcase to test ESipa/ES9+: CancelSession ...................................................................... eim_Tests: Add testcase to test ESipa/ES9+: CancelSession The testsuite never sends or receives any messages related to ESipa/ES9+ CancelSession, let's implement a varinat of the "Cancel Session Procedure for Indirect Profile Download" as described in SGP.32 section 3.2.3.3 to increase the coverage accordingly. Related: SYS#8100 Change-Id: Iadc9010fcf08de98f7d8c2a5c68bb5ff71bfb1f6 --- M eim/eIM_Tests.ttcn 1 file changed, 59 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/43182/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43182?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iadc9010fcf08de98f7d8c2a5c68bb5ff71bfb1f6 Gerrit-Change-Number: 43182 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de>

1 0

[XS] Change in osmo-ci[master]: jenkins-gerrit/comment_generate: fail on 0 passed
by osmith 11 Aug '26

11 Aug '26

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/43198?usp=email ) Change subject: jenkins-gerrit/comment_generate: fail on 0 passed ...................................................................... jenkins-gerrit/comment_generate: fail on 0 passed Don't print the success message when zero jobs has passed. If this happens, we have an internal error somewhere. Change-Id: I1317f14c2f3f55f2a9b6581372c80edba33528db --- M scripts/jenkins-gerrit/comment_generate.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/jenkins-gerrit/comment_generate.py b/scripts/jenkins-gerrit/comment_generate.py index fc8a8b1..1b3bfcd 100755 --- a/scripts/jenkins-gerrit/comment_generate.py +++ b/scripts/jenkins-gerrit/comment_generate.py @@ -212,6 +212,8 @@ summary += f"{len(jobs['passed'])} passed:\n" summary += get_jobs_list_str(jobs["passed"]) + if not jobs['passed']: + summary += "Zero jobs passed, internal script error?\n" if "build" in pipeline and "deb" in pipeline and "rpm" in pipeline and \ not pipeline["build"]["passed"] and pipeline["deb"]["passed"] \ @@ -227,7 +229,7 @@ summary += "https://osmocom.org/projects/cellular-infrastructure/wiki/Linting\n" summary += "\n" - if jobs["failed"]: + if jobs["failed"] or not jobs['passed']: summary += "Build Failed\n" summary += "\n" summary += f"Find the Retrigger button here:\n{build_url}\n" -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/43198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1317f14c2f3f55f2a9b6581372c80edba33528db Gerrit-Change-Number: 43198 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>

1 0

[M] Change in pysim[master]: GP: mixed PSK TLS PUT KEY (Amendment B Table 3-13)
by Hoernchen 11 Aug '26

11 Aug '26

Attention is currently required from: dexter, laforge, lynxis lazus. Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/pysim/+/43136?usp=email ) Change subject: GP: mixed PSK TLS PUT KEY (Amendment B Table 3-13) ...................................................................... Patch Set 3: (1 comment) File pySim/global_platform/__init__.py: https://gerrit.osmocom.org/c/pysim/+/43136/comment/d555b5f2_73e2cf0f?usp=em… : PS1, Line 655: (b'\x85' + bertlv_encode_len(len(block)) + block + : bytes([len(kcv)]) + kcv) > Yes, this should definitely handled by a construct definition. Done -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43136?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I480a9d049a052aa5ae54fe6e2771dba44e89434d Gerrit-Change-Number: 43136 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Aug 2026 18:46:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>

1 0

[M] Change in pysim[master]: GP: fix kcb for non block aligned keys
by Hoernchen 11 Aug '26

11 Aug '26

Hoernchen has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/pysim/+/43200?usp=email ) Change subject: GP: fix kcb for non block aligned keys ...................................................................... GP: fix kcb for non block aligned keys how encrypt_key() pads a kcv: len(key) % blocksize bytes what it should do to actually do it right: blocksize - len(key) % blocksize so the plaintext handed to the cipher was only block aligned by luck as long as the key length happened to be a multiple of half the block size. And of course decrypt_key() did not invert encrypt_key() at all, the clear text length of GP CardSpec v2.3 Table 11-70 precedes the ENCRYPTED kcv, but it was parsed out of the DECRYPTED data, and the length byte itself was fed to the cipher along with the cryptogram. Fix this up with a helper and tests so it is actually usable. Change-Id: I02b4f2ed948c31e1741e40f0226fb49757fa2570 --- M pySim/global_platform/scp.py M tests/unittests/test_globalplatform.py 2 files changed, 48 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/00/43200/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43200?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I02b4f2ed948c31e1741e40f0226fb49757fa2570 Gerrit-Change-Number: 43200 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-CC: Jenkins Builder

1 0

[L] Change in pysim[master]: GP: LOAD/STORE DATA chunk size from SCP overhead
by Hoernchen 11 Aug '26

11 Aug '26

Attention is currently required from: dexter, laforge. Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/pysim/+/43172?usp=email ) Change subject: GP: LOAD/STORE DATA chunk size from SCP overhead ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43172?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ic208f3959a38896f64fb6ccefb24cc360a3ac3a2 Gerrit-Change-Number: 43172 Gerrit-PatchSet: 3 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Aug 2026 18:44:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[M] Change in pysim[master]: GP: mixed PSK TLS PUT KEY (Amendment B Table 3-13)
by Hoernchen 11 Aug '26

11 Aug '26

Attention is currently required from: dexter, laforge, lynxis lazus. Hoernchen has posted comments on this change by Hoernchen. ( https://gerrit.osmocom.org/c/pysim/+/43136?usp=email ) Change subject: GP: mixed PSK TLS PUT KEY (Amendment B Table 3-13) ...................................................................... Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43136?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I480a9d049a052aa5ae54fe6e2771dba44e89434d Gerrit-Change-Number: 43136 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 10 Aug 2026 18:44:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No

1 0

[M] Change in pysim[master]: GP: fix kcb for non block aligned keys
by Hoernchen 11 Aug '26

11 Aug '26

Hoernchen has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/43200?usp=email ) Change subject: GP: fix kcb for non block aligned keys ...................................................................... GP: fix kcb for non block aligned keys how encrypt_key() pads a kcv: len(key) % blocksize bytes what it should do to actually do it right: blocksize - len(key) % blocksize so the plaintext handed to the cipher was only block aligned by luck as long as the key length happened to be a multiple of half the block size. And of course decrypt_key() did not invert encrypt_key() at all, the clear text length of Table 11-70 precedes the ENCRYPTED kcv, but it was parsed out of the DECRYPTED data, and the length byte itself was fed to the cipher along with the cryptogram. Fix this up with a helper and tests so it is actually usable. Change-Id: I02b4f2ed948c31e1741e40f0226fb49757fa2570 --- M pySim/global_platform/scp.py M tests/unittests/test_globalplatform.py 2 files changed, 48 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/00/43200/1 diff --git a/pySim/global_platform/scp.py b/pySim/global_platform/scp.py index a5fcf51..a50b17e 100644 --- a/pySim/global_platform/scp.py +++ b/pySim/global_platform/scp.py @@ -215,11 +215,19 @@ def gen_ext_auth_apdu(self, security_level: int = 0x01) -> bytes: pass + def pad_to_blocksize(self, data: bytes) -> bytes: + """Right pad the data with zero bytes to a multiple of the DEK cipher block size.""" + if len(data) % self.sk.blocksize: + data += b'\x00' * (self.sk.blocksize - len(data) % self.sk.blocksize) + return data + def encrypt_key(self, key: bytes) -> bytes: """Encrypt a key with the DEK.""" - num_pad = len(key) % self.sk.blocksize - if num_pad: - return bertlv_encode_len(len(key)) + self.dek_encrypt(key + b'\x00'*num_pad) + if len(key) % self.sk.blocksize: + # The kcv is right padded before encryption and the kcb + # is formatted as described in Table 11-70: preceded by the actual length of the + # clear text kcv. + return bertlv_encode_len(len(key)) + self.dek_encrypt(self.pad_to_blocksize(key)) return self.dek_encrypt(key) def decrypt_key(self, encrypted_key:bytes) -> bytes: @@ -232,9 +240,8 @@ # Block provides the actual length of the key component value, which allows recovering the # clear-text key component value after decryption of the encrypted key component value and removal # of padding bytes. - decrypted = self.dek_decrypt(encrypted_key) - key_len, remainder = bertlv_parse_len(decrypted) - return remainder[:key_len] + key_len, remainder = bertlv_parse_len(encrypted_key) + return self.dek_decrypt(remainder)[:key_len] else: # If the length of the Key Component Block is a multiple of the block size of the encryption # algorithm (i.e. 8 bytes for DES, 16 bytes for AES), then it shall be assumed that no padding diff --git a/tests/unittests/test_globalplatform.py b/tests/unittests/test_globalplatform.py index 8698470..576407d 100644 --- a/tests/unittests/test_globalplatform.py +++ b/tests/unittests/test_globalplatform.py @@ -283,6 +283,41 @@ # FIXME: test auth with random (0x60) vs pseudo-random (0x70) challenge +class KeyComponentBlock_Test(unittest.TestCase): + """Tests for the kcb of GP CardSpec v2.3 + - Table 11-70 kcv that required padding, preceded by its clear-text length + - Table 11-71 no padding required""" + + def setUp(self): + # SCP02 (3DES DEK, 8 byte blocks), same vectors as SCP02_Test + self.scp02 = SCP02(card_keys=ck_3des_70) + self.scp02.gen_init_update_apdu(host_challenge=h2b('40A62C37FA6304F8')) + self.scp02.parse_init_update_resp(h2b('00000000000000000000700200016B4524ABEE7CF32EA3838BC148F3')) + self.scp02.gen_ext_auth_apdu() + # SCP03 (AES DEK, 16 byte blocks), same vectors as SCP03_Test_AES128_11 + self.scp03 = SCP03(card_keys=KEYSET_AES128) + self.scp03.gen_init_update_apdu(h2b('b13e5f938fc108c4')) + self.scp03.parse_init_update_resp(h2b('000000000000000000003003703eb51047495b249f66c484c1d2ef1948000002')) + self.scp03.gen_ext_auth_apdu(0x11) + + def test_encrypt_decrypt_key(self): + for scp in (self.scp02, self.scp03): + bs = scp.sk.blocksize + for keylen in range(1, 3 * bs + 1): + with self.subTest(scp=type(scp).__name__, keylen=keylen): + key = bytes(range(keylen)) + kcb = scp.encrypt_key(key) + if keylen % bs: + # Table 11-70: <length of clear key component> || <encrypted padded value> + self.assertEqual(kcb[0], keylen) + self.assertEqual((len(kcb) - 1) % bs, 0) + self.assertEqual(len(kcb) - 1, keylen + (bs - keylen % bs)) + else: + # Table 11-71: only the encrypted key component value + self.assertEqual(len(kcb), keylen) + self.assertEqual(scp.decrypt_key(kcb), key) + + class SCP03_KCV_Test(unittest.TestCase): def test_kcv(self): self.assertEqual(compute_kcv('aes', KEYSET_AES128.enc), h2b('C35280')) -- To view, visit https://gerrit.osmocom.org/c/pysim/+/43200?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I02b4f2ed948c31e1741e40f0226fb49757fa2570 Gerrit-Change-Number: 43200 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026