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

[XL] Change in osmo-ttcn3-hacks[master]: smdpp: es9p testsuite

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-ttcn3-hacks/+/41119?usp=email to look at the new patch set (#5). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: smdpp: es9p testsuite ...................................................................... smdpp: es9p testsuite Implemented parts conform to sgp 23 v1.13-v1.15 Certs are from https://www.gsma.com/solutions-and-impact/technologies/esim/wp-content/uplo… the invalid ones are generated using smdpp/generate_all_test_certificates.py Change-Id: I3ba163d9155a3b019214dbccc3c8031dfd7deb6b --- M .checkpatch.conf A smdpp/.clang-format A smdpp/InvalidTestCases/CERT_EUICC_ECDSA_NIST_EXPIRED.der A smdpp/InvalidTestCases/CERT_EUICC_ECDSA_NIST_INVALID.der A smdpp/InvalidTestCases/CERT_EUICC_ECDSA_NIST_INVALID_EID.der A smdpp/InvalidTestCases/CERT_EUICC_ECDSA_NIST_INVALID_EID.pem A smdpp/InvalidTestCases/CERT_EUICC_ECDSA_NIST_UNMATCHED_EID.der A smdpp/InvalidTestCases/CERT_EUICC_ECDSA_NIST_UNMATCHED_EID.pem A smdpp/InvalidTestCases/CERT_EUM_ECDSA_NIST_EXPIRED.der A smdpp/InvalidTestCases/CERT_EUM_ECDSA_NIST_INVALID.der A smdpp/InvalidTestCases/CERT_EUM_ECDSA_NIST_UNKNOWN_CI.der A smdpp/InvalidTestCases/CERT_UNKNOWN_CI_ECDSA_NIST.der A smdpp/bsp_crypto.cpp A smdpp/bsp_crypto.h A smdpp/gen_links.sh A smdpp/generate_all_test_certificates.py A smdpp/helpers.h A smdpp/logger.h A smdpp/package.yml A smdpp/regen_makefile.sh A smdpp/rsp_client.cpp A smdpp/sgp26/CertificateIssuer/CERT_CI_ECDSA_BRP.der A smdpp/sgp26/CertificateIssuer/CERT_CI_ECDSA_BRP.pem A smdpp/sgp26/CertificateIssuer/CERT_CI_ECDSA_NIST.der A smdpp/sgp26/CertificateIssuer/CERT_CI_ECDSA_NIST.pem A smdpp/sgp26/CertificateIssuer/CI-csr.cnf A smdpp/sgp26/CertificateIssuer/SK_CI_ECDSA_BRP.pem A smdpp/sgp26/CertificateIssuer/SK_CI_ECDSA_NIST.pem A smdpp/sgp26/DPauth/CERT_S_SM_DP2auth_ECDSA_BRP.der A smdpp/sgp26/DPauth/CERT_S_SM_DP2auth_ECDSA_NIST.der A smdpp/sgp26/DPauth/CERT_S_SM_DPauth_ECDSA_BRP.der A smdpp/sgp26/DPauth/CERT_S_SM_DPauth_ECDSA_NIST.der A smdpp/sgp26/DPauth/PK_S_SM_DP2auth_ECDSA_BRP.pem A smdpp/sgp26/DPauth/PK_S_SM_DP2auth_ECDSA_NIST.pem A smdpp/sgp26/DPauth/PK_S_SM_DPauth_ECDSA_BRP.pem A smdpp/sgp26/DPauth/PK_S_SM_DPauth_ECDSA_NIST.pem A smdpp/sgp26/DPauth/SK_S_SM_DP2auth_ECDSA_BRP.pem A smdpp/sgp26/DPauth/SK_S_SM_DP2auth_ECDSA_NIST.pem A smdpp/sgp26/DPauth/SK_S_SM_DPauth_ECDSA_BRP.pem A smdpp/sgp26/DPauth/SK_S_SM_DPauth_ECDSA_NIST.pem A smdpp/sgp26/DPpb/CERT_S_SM_DP2pb_ECDSA_BRP.der A smdpp/sgp26/DPpb/CERT_S_SM_DP2pb_ECDSA_NIST.der A smdpp/sgp26/DPpb/CERT_S_SM_DPpb_ECDSA_BRP.der A smdpp/sgp26/DPpb/CERT_S_SM_DPpb_ECDSA_NIST.der A smdpp/sgp26/DPpb/PK_S_SM_DP2pb_ECDSA_BRP.pem A smdpp/sgp26/DPpb/PK_S_SM_DP2pb_ECDSA_NIST.pem A smdpp/sgp26/DPpb/PK_S_SM_DPpb_ECDSA_BRP.pem A smdpp/sgp26/DPpb/PK_S_SM_DPpb_ECDSA_NIST.pem A smdpp/sgp26/DPpb/SK_S_SM_DP2pb_ECDSA_BRP.pem A smdpp/sgp26/DPpb/SK_S_SM_DP2pb_ECDSA_NIST.pem A smdpp/sgp26/DPpb/SK_S_SM_DPpb_ECDSA_BRP.pem A smdpp/sgp26/DPpb/SK_S_SM_DPpb_ECDSA_NIST.pem A smdpp/sgp26/DPtls/CERT_S_SM_DP2_TLS.csr.cnf A smdpp/sgp26/DPtls/CERT_S_SM_DP2_TLS.der A smdpp/sgp26/DPtls/CERT_S_SM_DP2_TLS.ext.cnf A smdpp/sgp26/DPtls/CERT_S_SM_DP4_TLS.csr.cnf A smdpp/sgp26/DPtls/CERT_S_SM_DP4_TLS.der A smdpp/sgp26/DPtls/CERT_S_SM_DP4_TLS.ext.cnf A smdpp/sgp26/DPtls/CERT_S_SM_DP8_TLS.csr.cnf A smdpp/sgp26/DPtls/CERT_S_SM_DP8_TLS.der A smdpp/sgp26/DPtls/CERT_S_SM_DP8_TLS.ext.cnf A smdpp/sgp26/DPtls/CERT_S_SM_DP_TLS.csr.cnf A smdpp/sgp26/DPtls/CERT_S_SM_DP_TLS.ext.cnf A smdpp/sgp26/DPtls/CERT_S_SM_DP_TLS_BRP.der A smdpp/sgp26/DPtls/CERT_S_SM_DP_TLS_NIST.der A smdpp/sgp26/DPtls/PK_S_SM_DP2_TLS_NIST.pem A smdpp/sgp26/DPtls/PK_S_SM_DP4_TLS.pem A smdpp/sgp26/DPtls/PK_S_SM_DP8_TLS.pem A smdpp/sgp26/DPtls/PK_S_SM_DP_TLS_BRP.pem A smdpp/sgp26/DPtls/PK_S_SM_DP_TLS_NIST.pem A smdpp/sgp26/DPtls/SK_S_SM_DP2_TLS_NIST.pem A smdpp/sgp26/DPtls/SK_S_SM_DP4_TLS.pem A smdpp/sgp26/DPtls/SK_S_SM_DP8_TLS.pem A smdpp/sgp26/DPtls/SK_S_SM_DP_TLS_BRP.pem A smdpp/sgp26/DPtls/SK_S_SM_DP_TLS_NIST.pem A smdpp/sgp26/EUM/CERT_EUM_ECDSA_BRP.der A smdpp/sgp26/EUM/CERT_EUM_ECDSA_NIST.der A smdpp/sgp26/EUM/EUM-csr.cnf A smdpp/sgp26/EUM/EUM-ext.cnf A smdpp/sgp26/EUM/PK_EUM_ECDSA_BRP.pem A smdpp/sgp26/EUM/PK_EUM_ECDSA_NIST.pem A smdpp/sgp26/EUM/SK_EUM_ECDSA_BRP.pem A smdpp/sgp26/EUM/SK_EUM_ECDSA_NIST.pem A smdpp/sgp26/eUICC/CERT_EUICC_ECDSA_BRP.der A smdpp/sgp26/eUICC/CERT_EUICC_ECDSA_NIST.der A smdpp/sgp26/eUICC/PK_EUICC_ECDSA_BRP.pem A smdpp/sgp26/eUICC/PK_EUICC_ECDSA_NIST.pem A smdpp/sgp26/eUICC/SK_EUICC_ECDSA_BRP.pem A smdpp/sgp26/eUICC/SK_EUICC_ECDSA_NIST.pem A smdpp/sgp26/eUICC/eUICC-csr.cnf A smdpp/sgp26/eUICC/eUICC-ext.cnf A smdpp/smdpp_Tests.cfg A smdpp/smdpp_Tests.default A smdpp/smdpp_Tests.ttcn A smdpp/smdpp_Tests_Functions.cc 95 files changed, 10,895 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/19/41119/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41119?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: I3ba163d9155a3b019214dbccc3c8031dfd7deb6b Gerrit-Change-Number: 41119 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> Gerrit-Attention: laforge <laforge(a)osmocom.org>

1 day, 17 hours

1
0
0 0

[L] Change in ...osmo-s1gw[master]: [REST] Implement Pfcp{AssocState,Heartbeat}

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41100?usp=email ) Change subject: [REST] Implement Pfcp{AssocState,Heartbeat} ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41100?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: Idc98952d46d8e224969da343dc29ef323c6ed813 Gerrit-Change-Number: 41100 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Sep 2025 15:27:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 day, 18 hours

1
0
0 0

[L] Change in ...osmo-s1gw[master]: [REST] Implement MetricsList

by pespin

Attention is currently required from: fixeria, laforge. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41099?usp=email ) Change subject: [REST] Implement MetricsList ...................................................................... Patch Set 7: (1 comment) File doc/osmo-s1gw-cli.md: https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41099/comment/d2480afe_941d… : PS7, Line 109: | pfcp.assoc_setup_req.timeout | counter | 21 | imho it would be better to have those as "c" and "g", otherwise it populates a lot of space. In any case, I'd have the value next to the name. -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41099?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I43114aa8f5f8a388dd6a436f83ad1ee97f1d2ab1 Gerrit-Change-Number: 41099 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Sep 2025 15:27:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 day, 18 hours

1
0
0 0

[M] Change in ...osmo-s1gw[master]: [REST] Integrate Erlang REST Framework

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41098?usp=email ) Change subject: [REST] Integrate Erlang REST Framework ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41098?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I20ad3208b8cd4f5483992e3bf22af30ff62b0311 Gerrit-Change-Number: 41098 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Sep 2025 15:25:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 day, 19 hours

1
0
0 0

[M] Change in ...osmo-s1gw[master]: [REST] osmo-s1gw-cli.py skeleton

by pespin

Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41097?usp=email ) Change subject: [REST] osmo-s1gw-cli.py skeleton ...................................................................... Patch Set 7: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41097?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I05600f2fa6d213b9cee28871761231722ff5b876 Gerrit-Change-Number: 41097 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Sep 2025 15:24:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 day, 19 hours

1
0
0 0

[M] Change in ...osmo-s1gw[master]: [REST] OpenAPI specification skeleton

by pespin

Attention is currently required from: fixeria, jolly. pespin has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41096?usp=email ) Change subject: [REST] OpenAPI specification skeleton ...................................................................... Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/erlang/osmo-s1gw/+/41096?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: erlang/osmo-s1gw Gerrit-Branch: master Gerrit-Change-Id: I84e6ef5cc67cd26b11f7bed8510420e43e18c69b Gerrit-Change-Number: 41096 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Sep 2025 15:23:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 day, 19 hours

1
0
0 0

[XS] Change in libosmocore[master]: Correctly calculate size iofd_msgb_alloc2()

by pespin

Attention is currently required from: jolly. pespin has posted comments on this change by jolly. ( https://gerrit.osmocom.org/c/libosmocore/+/41138?usp=email ) Change subject: Correctly calculate size iofd_msgb_alloc2() ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmocore/+/41138/comment/88e33270_e39670fc?… : PS1, Line 10: too small, if headroom exceeds 65535. how can headroom exceed 65535 is it's limited to 16bit value? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/41138?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I16c1e08fb64a1fafaeee1844fd8c00ecc2861d12 Gerrit-Change-Number: 41138 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Fri, 19 Sep 2025 15:21:31 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 day, 19 hours

1
0
0 0

[M] Change in docker-playground[master]: redmine: set session_store to active_record_store

by pespin

Attention is currently required from: neels, osmith. pespin has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/docker-playground/+/41137?usp=email ) Change subject: redmine: set session_store to active_record_store ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/41137?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: Iacec800b9179cfac894f41e9eb1a5cca7e56ff1c Gerrit-Change-Number: 41137 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Fri, 19 Sep 2025 15:19:48 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 day, 19 hours

1
0
0 0

[XL] Change in osmo-ttcn3-hacks[master]: euicc: clean up superfluous encdec cpp files

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40983?usp=email ) Change subject: euicc: clean up superfluous encdec cpp files ...................................................................... euicc: clean up superfluous encdec cpp files As a bonus this means in the future encdec copypaste is only required once instead of twice in two files. Change-Id: Ice4ab4328faf6ad34a060bc2004a44de10691cff --- M eim/gen_links.sh M eim/regen_makefile.sh M ipad/gen_links.sh M ipad/regen_makefile.sh D library/euicc/PKIX1Explicit88_EncDec.cc M library/euicc/PKIX1Explicit88_Types.ttcn D library/euicc/PKIX1Implicit88_EncDec.cc M library/euicc/PKIX1Implicit88_Types.ttcn D library/euicc/RSPDefinitions_EncDec.cc M library/euicc/RSPDefinitions_Types.ttcn D library/euicc/SGP32Definitions_EncDec.cc M library/euicc/SGP32Definitions_Types.ttcn 12 files changed, 180 insertions(+), 920 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/eim/gen_links.sh b/eim/gen_links.sh index c633311..a8f91dd 100755 --- a/eim/gen_links.sh +++ b/eim/gen_links.sh @@ -35,7 +35,6 @@ FILES+="PKIX1Explicit88_Templates.ttcn PKIX1Explicit88_Types.ttcn PKIX1Implicit88_Templates.ttcn " FILES+="PKIX1Implicit88_Types.ttcn RSPDefinitions_Templates.ttcn RSPDefinitions_Types.ttcn " FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn " -FILES+="PKIX1Explicit88_EncDec.cc PKIX1Implicit88_EncDec.cc RSPDefinitions_EncDec.cc SGP32Definitions_EncDec.cc " FILES+="es9p_Types_JSON.ttcn esx_header_Types_JSON.ttcn" gen_links $DIR $FILES diff --git a/eim/regen_makefile.sh b/eim/regen_makefile.sh index 2b5cb24..942f849 100755 --- a/eim/regen_makefile.sh +++ b/eim/regen_makefile.sh @@ -13,10 +13,6 @@ Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc - SGP32Definitions_EncDec.cc - RSPDefinitions_EncDec.cc - PKIX1Explicit88_EncDec.cc - PKIX1Implicit88_EncDec.cc PIPEasp_PT.cc " . ../_buildsystem/regen_makefile.inc.sh diff --git a/ipad/gen_links.sh b/ipad/gen_links.sh index f47bc6e..a0b8197 100755 --- a/ipad/gen_links.sh +++ b/ipad/gen_links.sh @@ -31,7 +31,6 @@ FILES+="PKIX1Explicit88_Templates.ttcn PKIX1Explicit88_Types.ttcn PKIX1Implicit88_Templates.ttcn " FILES+="PKIX1Implicit88_Types.ttcn RSPDefinitions_Templates.ttcn RSPDefinitions_Types.ttcn " FILES+="SGP32Definitions_Templates.ttcn SGP32Definitions_Types.ttcn " -FILES+="PKIX1Explicit88_EncDec.cc PKIX1Implicit88_EncDec.cc RSPDefinitions_EncDec.cc SGP32Definitions_EncDec.cc" gen_links $DIR $FILES DIR=../library diff --git a/ipad/regen_makefile.sh b/ipad/regen_makefile.sh index 6aab793..021de52 100755 --- a/ipad/regen_makefile.sh +++ b/ipad/regen_makefile.sh @@ -13,10 +13,6 @@ Native_FunctionDefs.cc TCCConversion.cc TCCInterface.cc - SGP32Definitions_EncDec.cc - RSPDefinitions_EncDec.cc - PKIX1Explicit88_EncDec.cc - PKIX1Implicit88_EncDec.cc VPCD_CodecPort_CtrlFunctDef.cc " . ../_buildsystem/regen_makefile.inc.sh diff --git a/library/euicc/PKIX1Explicit88_EncDec.cc b/library/euicc/PKIX1Explicit88_EncDec.cc deleted file mode 100644 index 3cfb156..0000000 --- a/library/euicc/PKIX1Explicit88_EncDec.cc +++ /dev/null @@ -1,213 +0,0 @@ -#include "PKIX1Explicit88.hh" - -namespace PKIX1Explicit88__Types { - -using namespace PKIX1Explicit88; - -TTCN_Module PKIX1Explicit88__EncDec("PKIX1Explicit88_EncDec", __DATE__, __TIME__); - -OCTETSTRING enc__X520name(const X520name &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520name_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520name dec__X520name(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520name msg; - buf.put_os(stream); - - msg.decode(X520name_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520CommonName(const X520CommonName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520CommonName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520CommonName dec__X520CommonName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520CommonName msg; - buf.put_os(stream); - - msg.decode(X520CommonName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520LocalityName(const X520LocalityName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520LocalityName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520LocalityName dec__X520LocalityName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520LocalityName msg; - buf.put_os(stream); - - msg.decode(X520LocalityName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520StateOrProvinceName(const X520StateOrProvinceName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520StateOrProvinceName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520StateOrProvinceName dec__X520StateOrProvinceName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520StateOrProvinceName msg; - buf.put_os(stream); - - msg.decode(X520StateOrProvinceName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520OrganizationName(const X520OrganizationName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520OrganizationName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520OrganizationName dec__X520OrganizationName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520OrganizationName msg; - buf.put_os(stream); - - msg.decode(X520OrganizationName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520OrganizationalUnitName(const X520OrganizationalUnitName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520OrganizationalUnitName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520OrganizationalUnitName dec__X520OrganizationalUnitName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520OrganizationalUnitName msg; - buf.put_os(stream); - - msg.decode(X520OrganizationalUnitName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520Title(const X520Title &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520Title_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520Title dec__X520Title(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520Title msg; - buf.put_os(stream); - - msg.decode(X520Title_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520dnQualifier(const X520dnQualifier &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520dnQualifier_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520dnQualifier dec__X520dnQualifier(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520dnQualifier msg; - buf.put_os(stream); - - msg.decode(X520dnQualifier_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520countryName(const X520countryName &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520countryName_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520countryName dec__X520countryName(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520countryName msg; - buf.put_os(stream); - - msg.decode(X520countryName_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520SerialNumber(const X520SerialNumber &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520SerialNumber_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520SerialNumber dec__X520SerialNumber(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520SerialNumber msg; - buf.put_os(stream); - - msg.decode(X520SerialNumber_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__X520Pseudonym(const X520Pseudonym &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(X520Pseudonym_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -X520Pseudonym dec__X520Pseudonym(const OCTETSTRING &stream) { - TTCN_Buffer buf; - X520Pseudonym msg; - buf.put_os(stream); - - msg.decode(X520Pseudonym_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__Certificate(const Certificate &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(Certificate_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -Certificate dec__Certificate(const OCTETSTRING &stream) { - TTCN_Buffer buf; - Certificate msg; - buf.put_os(stream); - - msg.decode(Certificate_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -} diff --git a/library/euicc/PKIX1Explicit88_Types.ttcn b/library/euicc/PKIX1Explicit88_Types.ttcn index 4f33f8c..c1c7d01 100644 --- a/library/euicc/PKIX1Explicit88_Types.ttcn +++ b/library/euicc/PKIX1Explicit88_Types.ttcn @@ -3,40 +3,64 @@ import from PKIX1Explicit88 all; import from Native_Functions all; -external function dec_X520name(in octetstring stream) return X520name; -external function enc_X520name(in X520name msg) return octetstring; +external function dec_X520name(in octetstring stream) return X520name +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520name(in X520name msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520CommonName(in octetstring stream) return X520CommonName; -external function enc_X520CommonName(in X520CommonName msg) return octetstring; +external function dec_X520CommonName(in octetstring stream) return X520CommonName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520CommonName(in X520CommonName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520LocalityName(in octetstring stream) return X520LocalityName; -external function enc_X520LocalityName(in X520LocalityName msg) return octetstring; +external function dec_X520LocalityName(in octetstring stream) return X520LocalityName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520LocalityName(in X520LocalityName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520StateOrProvinceName(in octetstring stream) return X520StateOrProvinceName; -external function enc_X520StateOrProvinceName(in X520StateOrProvinceName msg) return octetstring; +external function dec_X520StateOrProvinceName(in octetstring stream) return X520StateOrProvinceName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520StateOrProvinceName(in X520StateOrProvinceName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520OrganizationName(in octetstring stream) return X520OrganizationName; -external function enc_X520OrganizationName(in X520OrganizationName msg) return octetstring; +external function dec_X520OrganizationName(in octetstring stream) return X520OrganizationName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520OrganizationName(in X520OrganizationName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520OrganizationalUnitName(in octetstring stream) return X520OrganizationalUnitName; -external function enc_X520OrganizationalUnitName(in X520OrganizationalUnitName msg) return octetstring; +external function dec_X520OrganizationalUnitName(in octetstring stream) return X520OrganizationalUnitName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520OrganizationalUnitName(in X520OrganizationalUnitName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520Title(in octetstring stream) return X520Title; -external function enc_X520Title(in X520Title msg) return octetstring; +external function dec_X520Title(in octetstring stream) return X520Title +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520Title(in X520Title msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520dnQualifier(in octetstring stream) return X520dnQualifier; -external function enc_X520dnQualifier(in X520dnQualifier msg) return octetstring; +external function dec_X520dnQualifier(in octetstring stream) return X520dnQualifier +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520dnQualifier(in X520dnQualifier msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520countryName(in octetstring stream) return X520countryName; -external function enc_X520countryName(in X520countryName msg) return octetstring; +external function dec_X520countryName(in octetstring stream) return X520countryName +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520countryName(in X520countryName msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520SerialNumber(in octetstring stream) return X520SerialNumber; -external function enc_X520SerialNumber(in X520SerialNumber msg) return octetstring; +external function dec_X520SerialNumber(in octetstring stream) return X520SerialNumber +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520SerialNumber(in X520SerialNumber msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_X520Pseudonym(in octetstring stream) return X520Pseudonym; -external function enc_X520Pseudonym(in X520Pseudonym msg) return octetstring; +external function dec_X520Pseudonym(in octetstring stream) return X520Pseudonym +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_X520Pseudonym(in X520Pseudonym msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_Certificate(in octetstring stream) return Certificate; -external function enc_Certificate(in Certificate msg) return octetstring; +external function dec_Certificate(in octetstring stream) return Certificate +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_Certificate(in Certificate msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; } diff --git a/library/euicc/PKIX1Implicit88_EncDec.cc b/library/euicc/PKIX1Implicit88_EncDec.cc deleted file mode 100644 index 7ce2b16..0000000 --- a/library/euicc/PKIX1Implicit88_EncDec.cc +++ /dev/null @@ -1,26 +0,0 @@ -#include "PKIX1Implicit88.hh" - -namespace PKIX1Implicit88__Types { - -using namespace PKIX1Implicit88; - -TTCN_Module PKIX1Implicit88__EncDec("PKIX1Implicit88_EncDec", __DATE__, __TIME__); - -OCTETSTRING enc__SubjectKeyIdentifier(const SubjectKeyIdentifier &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(SubjectKeyIdentifier_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -SubjectKeyIdentifier dec__SubjectKeyIdentifier(const OCTETSTRING &stream) { - TTCN_Buffer buf; - SubjectKeyIdentifier msg; - buf.put_os(stream); - - msg.decode(SubjectKeyIdentifier_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -} diff --git a/library/euicc/PKIX1Implicit88_Types.ttcn b/library/euicc/PKIX1Implicit88_Types.ttcn index f816c6e..ce08199 100644 --- a/library/euicc/PKIX1Implicit88_Types.ttcn +++ b/library/euicc/PKIX1Implicit88_Types.ttcn @@ -3,7 +3,9 @@ import from PKIX1Implicit88 all; import from Native_Functions all; -external function dec_SubjectKeyIdentifier(in octetstring stream) return SubjectKeyIdentifier; -external function enc_SubjectKeyIdentifier(in SubjectKeyIdentifier msg) return octetstring; +external function dec_SubjectKeyIdentifier(in octetstring stream) return SubjectKeyIdentifier +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_SubjectKeyIdentifier(in SubjectKeyIdentifier msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; } diff --git a/library/euicc/RSPDefinitions_EncDec.cc b/library/euicc/RSPDefinitions_EncDec.cc deleted file mode 100644 index fe4b68d..0000000 --- a/library/euicc/RSPDefinitions_EncDec.cc +++ /dev/null @@ -1,417 +0,0 @@ -#include "RSPDefinitions.hh" - -namespace RSPDefinitions__Types { - -using namespace RSPDefinitions; - -TTCN_Module RSPDefinitions__EncDec("RSPDefinitions_EncDec", __DATE__, __TIME__); - -OCTETSTRING enc__GetEuiccChallengeResponse(const GetEuiccChallengeResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(GetEuiccChallengeResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -GetEuiccChallengeResponse dec__GetEuiccChallengeResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - GetEuiccChallengeResponse msg; - buf.put_os(stream); - - msg.decode(GetEuiccChallengeResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EUICCInfo1(const EUICCInfo1 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EUICCInfo1_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EUICCInfo1 dec__EUICCInfo1(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EUICCInfo1 msg; - buf.put_os(stream); - - msg.decode(EUICCInfo1_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EUICCInfo2(const EUICCInfo2 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EUICCInfo2_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EUICCInfo2 dec__EUICCInfo2(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EUICCInfo2 msg; - buf.put_os(stream); - - msg.decode(EUICCInfo2_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EuiccSigned1(const EuiccSigned1 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EuiccSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EuiccSigned1 dec__EuiccSigned1(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EuiccSigned1 msg; - buf.put_os(stream); - - msg.decode(EuiccSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EUICCSigned2(const EUICCSigned2 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EUICCSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EUICCSigned2 dec__EUICCSigned2(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EUICCSigned2 msg; - buf.put_os(stream); - - msg.decode(EUICCSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ControlRefTemplate(const ControlRefTemplate &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ControlRefTemplate_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ControlRefTemplate dec__ControlRefTemplate(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ControlRefTemplate msg; - buf.put_os(stream); - - msg.decode(ControlRefTemplate_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__AuthenticateServerResponse(const AuthenticateServerResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(AuthenticateServerResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -AuthenticateServerResponse dec__AuthenticateServerResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - AuthenticateServerResponse msg; - buf.put_os(stream); - - msg.decode(AuthenticateServerResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__CancelSessionResponse(const CancelSessionResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(CancelSessionResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -CancelSessionResponse dec__CancelSessionResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - CancelSessionResponse msg; - buf.put_os(stream); - - msg.decode(CancelSessionResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__PrepareDownloadResponse(const PrepareDownloadResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(PrepareDownloadResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -PrepareDownloadResponse dec__PrepareDownloadResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - PrepareDownloadResponse msg; - buf.put_os(stream); - - msg.decode(PrepareDownloadResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ProfileInstallationResult(const ProfileInstallationResult &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ProfileInstallationResult_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ProfileInstallationResult dec__ProfileInstallationResult(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ProfileInstallationResult msg; - buf.put_os(stream); - - msg.decode(ProfileInstallationResult_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__NotificationSentResponse(const NotificationSentResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(NotificationSentResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -NotificationSentResponse dec__NotificationSentResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - NotificationSentResponse msg; - buf.put_os(stream); - - msg.decode(NotificationSentResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__RetrieveNotificationsListResponse(const RetrieveNotificationsListResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(RetrieveNotificationsListResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -RetrieveNotificationsListResponse dec__RetrieveNotificationsListResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - RetrieveNotificationsListResponse msg; - buf.put_os(stream); - - msg.decode(RetrieveNotificationsListResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__GetEuiccDataResponse(const GetEuiccDataResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(GetEuiccDataResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -GetEuiccDataResponse dec__GetEuiccDataResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - GetEuiccDataResponse msg; - buf.put_os(stream); - - msg.decode(GetEuiccDataResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EuiccConfiguredAddressesResponse(const EuiccConfiguredAddressesResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EuiccConfiguredAddressesResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EuiccConfiguredAddressesResponse dec__EuiccConfiguredAddressesResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EuiccConfiguredAddressesResponse msg; - buf.put_os(stream); - - msg.decode(EuiccConfiguredAddressesResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__PendingNotification(const PendingNotification &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(PendingNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -PendingNotification dec__PendingNotification(const OCTETSTRING &stream) { - TTCN_Buffer buf; - PendingNotification msg; - buf.put_os(stream); - - msg.decode(PendingNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ServerSigned1(const ServerSigned1 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ServerSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ServerSigned1 dec__ServerSigned1(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ServerSigned1 msg; - buf.put_os(stream); - - msg.decode(ServerSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__BoundProfilePackage(const BoundProfilePackage &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(BoundProfilePackage_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -BoundProfilePackage dec__BoundProfilePackage(const OCTETSTRING &stream) { - TTCN_Buffer buf; - BoundProfilePackage msg; - buf.put_os(stream); - - msg.decode(BoundProfilePackage_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__StoreMetadataRequest(const StoreMetadataRequest &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(StoreMetadataRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -StoreMetadataRequest dec__StoreMetadataRequest(const OCTETSTRING &stream) { - TTCN_Buffer buf; - StoreMetadataRequest msg; - buf.put_os(stream); - - msg.decode(StoreMetadataRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__SmdpSigned2(const SmdpSigned2 &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(SmdpSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -SmdpSigned2 dec__SmdpSigned2(const OCTETSTRING &stream) { - TTCN_Buffer buf; - SmdpSigned2 msg; - buf.put_os(stream); - - msg.decode(SmdpSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__RemoteProfileProvisioningResponse(const RemoteProfileProvisioningResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(RemoteProfileProvisioningResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -RemoteProfileProvisioningResponse dec__RemoteProfileProvisioningResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - RemoteProfileProvisioningResponse msg; - buf.put_os(stream); - - msg.decode(RemoteProfileProvisioningResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__RemoteProfileProvisioningRequest(const RemoteProfileProvisioningRequest &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(RemoteProfileProvisioningRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -RemoteProfileProvisioningRequest dec__RemoteProfileProvisioningRequest(const OCTETSTRING &stream) { - TTCN_Buffer buf; - RemoteProfileProvisioningRequest msg; - buf.put_os(stream); - - msg.decode(RemoteProfileProvisioningRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EuiccCancelSessionSigned(const EuiccCancelSessionSigned &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EuiccCancelSessionSigned_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EuiccCancelSessionSigned dec__EuiccCancelSessionSigned(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EuiccCancelSessionSigned msg; - buf.put_os(stream); - - msg.decode(EuiccCancelSessionSigned_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__OtherSignedNotification(const OtherSignedNotification &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(OtherSignedNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -OtherSignedNotification dec__OtherSignedNotification(const OCTETSTRING &stream) { - TTCN_Buffer buf; - OtherSignedNotification msg; - buf.put_os(stream); - - msg.decode(OtherSignedNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__NotificationMetadata(const NotificationMetadata &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(NotificationMetadata_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -NotificationMetadata dec__NotificationMetadata(const OCTETSTRING &stream) { - TTCN_Buffer buf; - NotificationMetadata msg; - buf.put_os(stream); - - msg.decode(NotificationMetadata_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -} diff --git a/library/euicc/RSPDefinitions_Types.ttcn b/library/euicc/RSPDefinitions_Types.ttcn index 8d33f17..5a33b45 100644 --- a/library/euicc/RSPDefinitions_Types.ttcn +++ b/library/euicc/RSPDefinitions_Types.ttcn @@ -3,76 +3,124 @@ import from RSPDefinitions all; import from Native_Functions all; -external function dec_GetEuiccChallengeResponse(in octetstring stream) return GetEuiccChallengeResponse; -external function enc_GetEuiccChallengeResponse(in GetEuiccChallengeResponse msg) return octetstring; +external function dec_GetEuiccChallengeResponse(in octetstring stream) return GetEuiccChallengeResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_GetEuiccChallengeResponse(in GetEuiccChallengeResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_EUICCInfo1(in octetstring stream) return EUICCInfo1; -external function enc_EUICCInfo1(in EUICCInfo1 msg) return octetstring; +external function dec_EUICCInfo1(in octetstring stream) return EUICCInfo1 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EUICCInfo1(in EUICCInfo1 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_EUICCInfo2(in octetstring stream) return EUICCInfo2; -external function enc_EUICCInfo2(in EUICCInfo2 msg) return octetstring; +external function dec_EUICCInfo2(in octetstring stream) return EUICCInfo2 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EUICCInfo2(in EUICCInfo2 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_AuthenticateServerResponse(in octetstring stream) return AuthenticateServerResponse; -external function enc_AuthenticateServerResponse(in AuthenticateServerResponse msg) return octetstring; +external function dec_AuthenticateServerResponse(in octetstring stream) return AuthenticateServerResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_AuthenticateServerResponse(in AuthenticateServerResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_CancelSessionResponse(in octetstring stream) return CancelSessionResponse; -external function enc_CancelSessionResponse(in CancelSessionResponse msg) return octetstring; +external function dec_CancelSessionResponse(in octetstring stream) return CancelSessionResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_CancelSessionResponse(in CancelSessionResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_PrepareDownloadResponse(in octetstring stream) return PrepareDownloadResponse; -external function enc_PrepareDownloadResponse(in PrepareDownloadResponse msg) return octetstring; +external function dec_PrepareDownloadResponse(in octetstring stream) return PrepareDownloadResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_PrepareDownloadResponse(in PrepareDownloadResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_ProfileInstallationResult(in octetstring stream) return ProfileInstallationResult; -external function enc_ProfileInstallationResult(in ProfileInstallationResult msg) return octetstring; +external function dec_ProfileInstallationResult(in octetstring stream) return ProfileInstallationResult +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ProfileInstallationResult(in ProfileInstallationResult msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_NotificationSentResponse(in octetstring stream) return NotificationSentResponse; -external function enc_NotificationSentResponse(in NotificationSentResponse msg) return octetstring; +external function dec_NotificationSentResponse(in octetstring stream) return NotificationSentResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_NotificationSentResponse(in NotificationSentResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_RetrieveNotificationsListResponse(in octetstring stream) return RetrieveNotificationsListResponse; -external function enc_RetrieveNotificationsListResponse(in RetrieveNotificationsListResponse msg) return octetstring; +external function dec_RetrieveNotificationsListResponse(in octetstring stream) return RetrieveNotificationsListResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_RetrieveNotificationsListResponse(in RetrieveNotificationsListResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_GetEuiccDataResponse(in octetstring stream) return GetEuiccDataResponse; -external function enc_GetEuiccDataResponse(in GetEuiccDataResponse msg) return octetstring; +external function dec_GetEuiccDataResponse(in octetstring stream) return GetEuiccDataResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_GetEuiccDataResponse(in GetEuiccDataResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_EuiccConfiguredAddressesResponse(in octetstring stream) return EuiccConfiguredAddressesResponse; -external function enc_EuiccConfiguredAddressesResponse(in EuiccConfiguredAddressesResponse msg) return octetstring; +external function dec_EuiccConfiguredAddressesResponse(in octetstring stream) return EuiccConfiguredAddressesResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EuiccConfiguredAddressesResponse(in EuiccConfiguredAddressesResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_PendingNotification(in octetstring stream) return PendingNotification; -external function enc_PendingNotification(in PendingNotification msg) return octetstring; +external function dec_PendingNotification(in octetstring stream) return PendingNotification +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_PendingNotification(in PendingNotification msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_ServerSigned1(in octetstring stream) return ServerSigned1; -external function enc_ServerSigned1(in ServerSigned1 msg) return octetstring; +external function dec_ServerSigned1(in octetstring stream) return ServerSigned1 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ServerSigned1(in ServerSigned1 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_EuiccSigned1(in octetstring stream) return EuiccSigned1; -external function enc_EuiccSigned1(in EuiccSigned1 msg) return octetstring; +external function dec_EuiccSigned1(in octetstring stream) return EuiccSigned1 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EuiccSigned1(in EuiccSigned1 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_EUICCSigned2(in octetstring stream) return EUICCSigned2; -external function enc_EUICCSigned2(in EUICCSigned2 msg) return octetstring; +external function dec_EUICCSigned2(in octetstring stream) return EUICCSigned2 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EUICCSigned2(in EUICCSigned2 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_ControlRefTemplate(in octetstring stream) return ControlRefTemplate; -external function enc_ControlRefTemplate(in ControlRefTemplate msg) return octetstring; +external function dec_ControlRefTemplate(in octetstring stream) return ControlRefTemplate +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ControlRefTemplate(in ControlRefTemplate msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_BoundProfilePackage(in octetstring stream) return BoundProfilePackage; -external function enc_BoundProfilePackage(in BoundProfilePackage msg) return octetstring; +external function dec_BoundProfilePackage(in octetstring stream) return BoundProfilePackage +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_BoundProfilePackage(in BoundProfilePackage msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_StoreMetadataRequest(in octetstring stream) return StoreMetadataRequest; -external function enc_StoreMetadataRequest(in StoreMetadataRequest msg) return octetstring; +external function dec_StoreMetadataRequest(in octetstring stream) return StoreMetadataRequest +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_StoreMetadataRequest(in StoreMetadataRequest msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_SmdpSigned2(in octetstring stream) return SmdpSigned2; -external function enc_SmdpSigned2(in SmdpSigned2 msg) return octetstring; +external function dec_SmdpSigned2(in octetstring stream) return SmdpSigned2 +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_SmdpSigned2(in SmdpSigned2 msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_RemoteProfileProvisioningResponse(in octetstring stream) return RemoteProfileProvisioningResponse; -external function enc_RemoteProfileProvisioningResponse(in RemoteProfileProvisioningResponse msg) return octetstring; +external function dec_RemoteProfileProvisioningResponse(in octetstring stream) return RemoteProfileProvisioningResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_RemoteProfileProvisioningResponse(in RemoteProfileProvisioningResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_RemoteProfileProvisioningRequest(in octetstring stream) return RemoteProfileProvisioningRequest; -external function enc_RemoteProfileProvisioningRequest(in RemoteProfileProvisioningRequest msg) return octetstring; +external function dec_RemoteProfileProvisioningRequest(in octetstring stream) return RemoteProfileProvisioningRequest +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_RemoteProfileProvisioningRequest(in RemoteProfileProvisioningRequest msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_EuiccCancelSessionSigned(in octetstring stream) return EuiccCancelSessionSigned; -external function enc_EuiccCancelSessionSigned(in EuiccCancelSessionSigned msg) return octetstring; +external function dec_EuiccCancelSessionSigned(in octetstring stream) return EuiccCancelSessionSigned +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EuiccCancelSessionSigned(in EuiccCancelSessionSigned msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_OtherSignedNotification(in octetstring stream) return OtherSignedNotification; -external function enc_OtherSignedNotification(in OtherSignedNotification msg) return octetstring; +external function dec_OtherSignedNotification(in octetstring stream) return OtherSignedNotification +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_OtherSignedNotification(in OtherSignedNotification msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_NotificationMetadata(in octetstring stream) return NotificationMetadata; -external function enc_NotificationMetadata(in NotificationMetadata msg) return octetstring; +external function dec_NotificationMetadata(in octetstring stream) return NotificationMetadata +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_NotificationMetadata(in NotificationMetadata msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; } diff --git a/library/euicc/SGP32Definitions_EncDec.cc b/library/euicc/SGP32Definitions_EncDec.cc deleted file mode 100644 index 3dbb4bf..0000000 --- a/library/euicc/SGP32Definitions_EncDec.cc +++ /dev/null @@ -1,164 +0,0 @@ -#include "SGP32Definitions.hh" - -namespace SGP32Definitions__Types { - -using namespace SGP32Definitions; -using namespace PKIX1Explicit88; - -TTCN_Module SGP32Definitions__EncDec("SGP32Definitions_EncDec", __DATE__, __TIME__); - -OCTETSTRING enc__EsipaMessageFromIpaToEim(const EsipaMessageFromIpaToEim &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EsipaMessageFromIpaToEim_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EsipaMessageFromIpaToEim dec__EsipaMessageFromIpaToEim(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EsipaMessageFromIpaToEim msg; - buf.put_os(stream); - - msg.decode(EsipaMessageFromIpaToEim_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EsipaMessageFromEimToIpa(const EsipaMessageFromEimToIpa &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EsipaMessageFromEimToIpa_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EsipaMessageFromEimToIpa dec__EsipaMessageFromEimToIpa(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EsipaMessageFromEimToIpa msg; - buf.put_os(stream); - - msg.decode(EsipaMessageFromEimToIpa_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EuiccPackageResult(const EuiccPackageResult &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EuiccPackageResult_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EuiccPackageResult dec__EuiccPackageResult(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EuiccPackageResult msg; - buf.put_os(stream); - - msg.decode(EuiccPackageResult_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__GetCertsResponse(const GetCertsResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(GetCertsResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -GetCertsResponse dec__GetCertsResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - GetCertsResponse msg; - buf.put_os(stream); - - msg.decode(GetCertsResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__GetEimConfigurationDataResponse(const GetEimConfigurationDataResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(GetEimConfigurationDataResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -GetEimConfigurationDataResponse dec__GetEimConfigurationDataResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - GetEimConfigurationDataResponse msg; - buf.put_os(stream); - - msg.decode(GetEimConfigurationDataResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__AddInitialEimResponse(const AddInitialEimResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(AddInitialEimResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -AddInitialEimResponse dec__AddInitialEimResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - AddInitialEimResponse msg; - buf.put_os(stream); - - msg.decode(AddInitialEimResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ProfileRollbackRequest(const ProfileRollbackRequest &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ProfileRollbackRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -EnableUsingDDResponse dec__EnableUsingDDResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - EnableUsingDDResponse msg; - buf.put_os(stream); - - msg.decode(EnableUsingDDResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__EnableUsingDDResponse(const EnableUsingDDResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(EnableUsingDDResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ProfileRollbackRequest dec__ProfileRollbackRequest(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ProfileRollbackRequest msg; - buf.put_os(stream); - - msg.decode(ProfileRollbackRequest_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - -OCTETSTRING enc__ProfileRollbackResponse(const ProfileRollbackResponse &msg) { - TTCN_Buffer buf; - - buf.clear(); - msg.encode(ProfileRollbackResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - return OCTETSTRING(buf.get_len(), buf.get_data()); -} - -ProfileRollbackResponse dec__ProfileRollbackResponse(const OCTETSTRING &stream) { - TTCN_Buffer buf; - ProfileRollbackResponse msg; - buf.put_os(stream); - - msg.decode(ProfileRollbackResponse_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - return msg; -} - - -} diff --git a/library/euicc/SGP32Definitions_Types.ttcn b/library/euicc/SGP32Definitions_Types.ttcn index 492daef..9fe2b7d 100644 --- a/library/euicc/SGP32Definitions_Types.ttcn +++ b/library/euicc/SGP32Definitions_Types.ttcn @@ -3,28 +3,44 @@ import from SGP32Definitions all; import from Native_Functions all; -external function dec_EsipaMessageFromIpaToEim(in octetstring stream) return EsipaMessageFromIpaToEim; -external function enc_EsipaMessageFromIpaToEim(in EsipaMessageFromIpaToEim msg) return octetstring; +external function dec_EsipaMessageFromIpaToEim(in octetstring stream) return EsipaMessageFromIpaToEim +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EsipaMessageFromIpaToEim(in EsipaMessageFromIpaToEim msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_EsipaMessageFromEimToIpa(in octetstring stream) return EsipaMessageFromEimToIpa; -external function enc_EsipaMessageFromEimToIpa(in EsipaMessageFromEimToIpa msg) return octetstring; +external function dec_EsipaMessageFromEimToIpa(in octetstring stream) return EsipaMessageFromEimToIpa +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EsipaMessageFromEimToIpa(in EsipaMessageFromEimToIpa msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_EuiccPackageResult(in octetstring stream) return EuiccPackageResult; -external function enc_EuiccPackageResult(in EuiccPackageResult msg) return octetstring; +external function dec_EuiccPackageResult(in octetstring stream) return EuiccPackageResult +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EuiccPackageResult(in EuiccPackageResult msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_GetCertsResponse(in octetstring stream) return GetCertsResponse; -external function enc_GetCertsResponse(in GetCertsResponse msg) return octetstring; +external function dec_GetCertsResponse(in octetstring stream) return GetCertsResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_GetCertsResponse(in GetCertsResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_GetEimConfigurationDataResponse(in octetstring stream) return GetEimConfigurationDataResponse; -external function enc_GetEimConfigurationDataResponse(in GetEimConfigurationDataResponse msg) return octetstring; +external function dec_GetEimConfigurationDataResponse(in octetstring stream) return GetEimConfigurationDataResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_GetEimConfigurationDataResponse(in GetEimConfigurationDataResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_EnableUsingDDResponse(in octetstring stream) return EnableUsingDDResponse; -external function enc_EnableUsingDDResponse(in EnableUsingDDResponse msg) return octetstring; +external function dec_EnableUsingDDResponse(in octetstring stream) return EnableUsingDDResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_EnableUsingDDResponse(in EnableUsingDDResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_ProfileRollbackRequest(in octetstring stream) return ProfileRollbackRequest; -external function enc_ProfileRollbackRequest(in ProfileRollbackRequest msg) return octetstring; +external function dec_ProfileRollbackRequest(in octetstring stream) return ProfileRollbackRequest +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ProfileRollbackRequest(in ProfileRollbackRequest msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; -external function dec_ProfileRollbackResponse(in octetstring stream) return ProfileRollbackResponse; -external function enc_ProfileRollbackResponse(in ProfileRollbackResponse msg) return octetstring; +external function dec_ProfileRollbackResponse(in octetstring stream) return ProfileRollbackResponse +with { extension "prototype(convert) decode(BER:BER_ACCEPT_ALL)" }; +external function enc_ProfileRollbackResponse(in ProfileRollbackResponse msg) return octetstring +with { extension "prototype(convert) encode(BER:BER_ENCODE_DER)" }; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40983?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: Ice4ab4328faf6ad34a060bc2004a44de10691cff Gerrit-Change-Number: 40983 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: 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: pespin <pespin(a)sysmocom.de>

1 day, 20 hours

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: euicc: changes and extensions to support es9p and es2p testing

by Hoernchen

Hoernchen has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40982?usp=email ) Change subject: euicc: changes and extensions to support es9p and es2p testing ...................................................................... euicc: changes and extensions to support es9p and es2p testing Change-Id: I9c622751e195d33f6f0a832265d6b10674d1c75c --- M library/euicc/RSPDefinitions.asn M library/euicc/RSPDefinitions_EncDec.cc M library/euicc/RSPDefinitions_Templates.ttcn M library/euicc/RSPDefinitions_Types.ttcn M library/euicc/es2p_Types_JSON.ttcn M library/euicc/es9p_Types_JSON.ttcn M library/euicc/esx_header_Types_JSON.ttcn 7 files changed, 206 insertions(+), 11 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/euicc/RSPDefinitions.asn b/library/euicc/RSPDefinitions.asn index 56dd1af..66da646 100644 --- a/library/euicc/RSPDefinitions.asn +++ b/library/euicc/RSPDefinitions.asn @@ -472,6 +472,15 @@ smdpSign [APPLICATION 55] OCTET STRING -- SM-DP's signature, tag '5F37' } +-- for verification, different structure, needs manual skipping of tag + tlv (first 4 bytes) +InitialiseSecureChannelRequest-ver ::= [35] SEQUENCE { -- Tag 'BF23' + remoteOpId RemoteOpId, -- Remote Operation Type Identifier (value SHALL be set to installBoundProfilePackage) + transactionId [0] TransactionId, -- The TransactionID generated by the SM-DP+ + controlRefTemplate[6] IMPLICIT ControlRefTemplate, -- Control Reference Template (Key Agreement). Current specification considers a subset of CRT specified in GlobalPlatform Card Specification [8], section 6.4.2.3 for the Mutual Authentication Data Field + smdpOtpk [APPLICATION 73] OCTET STRING, ---otPK.DP.ECKA as specified in GlobalPlatform Card Specification [8] section 6.4.2.3 for ePK.OCE.ECKA, tag '5F49' + euiccOtpk [APPLICATION 73] OCTET STRING -- otPK.EUICC.ECKA, tag '5F49' +} + ControlRefTemplate ::= SEQUENCE { keyType[0] Octet1, -- Key type according to GlobalPlatform Card Specification [8] Table 11-16, AES= '88', Tag '80' keyLen[1] Octet1, --Key length in number of bytes. For current specification key length SHALL by 0x10 bytes, Tag '81' diff --git a/library/euicc/RSPDefinitions_EncDec.cc b/library/euicc/RSPDefinitions_EncDec.cc index b46a73c..fe4b68d 100644 --- a/library/euicc/RSPDefinitions_EncDec.cc +++ b/library/euicc/RSPDefinitions_EncDec.cc @@ -57,6 +57,57 @@ return msg; } +OCTETSTRING enc__EuiccSigned1(const EuiccSigned1 &msg) { + TTCN_Buffer buf; + + buf.clear(); + msg.encode(EuiccSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +EuiccSigned1 dec__EuiccSigned1(const OCTETSTRING &stream) { + TTCN_Buffer buf; + EuiccSigned1 msg; + buf.put_os(stream); + + msg.decode(EuiccSigned1_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); + return msg; +} + +OCTETSTRING enc__EUICCSigned2(const EUICCSigned2 &msg) { + TTCN_Buffer buf; + + buf.clear(); + msg.encode(EUICCSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +EUICCSigned2 dec__EUICCSigned2(const OCTETSTRING &stream) { + TTCN_Buffer buf; + EUICCSigned2 msg; + buf.put_os(stream); + + msg.decode(EUICCSigned2_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); + return msg; +} + +OCTETSTRING enc__ControlRefTemplate(const ControlRefTemplate &msg) { + TTCN_Buffer buf; + + buf.clear(); + msg.encode(ControlRefTemplate_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +ControlRefTemplate dec__ControlRefTemplate(const OCTETSTRING &stream) { + TTCN_Buffer buf; + ControlRefTemplate msg; + buf.put_os(stream); + + msg.decode(ControlRefTemplate_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); + return msg; +} + OCTETSTRING enc__AuthenticateServerResponse(const AuthenticateServerResponse &msg) { TTCN_Buffer buf; @@ -312,4 +363,55 @@ return msg; } +OCTETSTRING enc__EuiccCancelSessionSigned(const EuiccCancelSessionSigned &msg) { + TTCN_Buffer buf; + + buf.clear(); + msg.encode(EuiccCancelSessionSigned_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +EuiccCancelSessionSigned dec__EuiccCancelSessionSigned(const OCTETSTRING &stream) { + TTCN_Buffer buf; + EuiccCancelSessionSigned msg; + buf.put_os(stream); + + msg.decode(EuiccCancelSessionSigned_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); + return msg; +} + +OCTETSTRING enc__OtherSignedNotification(const OtherSignedNotification &msg) { + TTCN_Buffer buf; + + buf.clear(); + msg.encode(OtherSignedNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +OtherSignedNotification dec__OtherSignedNotification(const OCTETSTRING &stream) { + TTCN_Buffer buf; + OtherSignedNotification msg; + buf.put_os(stream); + + msg.decode(OtherSignedNotification_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); + return msg; +} + +OCTETSTRING enc__NotificationMetadata(const NotificationMetadata &msg) { + TTCN_Buffer buf; + + buf.clear(); + msg.encode(NotificationMetadata_descr_, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); + return OCTETSTRING(buf.get_len(), buf.get_data()); +} + +NotificationMetadata dec__NotificationMetadata(const OCTETSTRING &stream) { + TTCN_Buffer buf; + NotificationMetadata msg; + buf.put_os(stream); + + msg.decode(NotificationMetadata_descr_, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); + return msg; +} + } diff --git a/library/euicc/RSPDefinitions_Templates.ttcn b/library/euicc/RSPDefinitions_Templates.ttcn index f717d6a..8c3886e 100644 --- a/library/euicc/RSPDefinitions_Templates.ttcn +++ b/library/euicc/RSPDefinitions_Templates.ttcn @@ -665,4 +665,48 @@ eidValue := eidValue } +/* NotificationMetadata templates */ +template (present) NotificationMetadata +tr_notificationMetadata(template (present) integer seqNumber := ?, + template (present) NotificationEvent profileManagementOperation := ?, + template (present) charstring notificationAddress := ?, + template octetstring iccid := *) := { + seqNumber := seqNumber, + profileManagementOperation := profileManagementOperation, + notificationAddress := notificationAddress, + iccid := iccid +} +template (value) NotificationMetadata +ts_notificationMetadata(template (value) integer seqNumber := 1, + template (value) NotificationEvent profileManagementOperation := '1000'B, + template (value) charstring notificationAddress := "smdp.example.com", + template (omit) octetstring iccid := omit) := { + seqNumber := seqNumber, + profileManagementOperation := profileManagementOperation, + notificationAddress := notificationAddress, + iccid := iccid +} + +/* OtherSignedNotification templates */ +template (present) OtherSignedNotification +tr_otherSignedNotification(template (present) NotificationMetadata tbsOtherNotification := ?, + template (present) octetstring euiccNotificationSignature := ?, + template (present) Certificate euiccCertificate := ?, + template (present) Certificate eumCertificate := ?) := { + tbsOtherNotification := tbsOtherNotification, + euiccNotificationSignature := euiccNotificationSignature, + euiccCertificate := euiccCertificate, + eumCertificate := eumCertificate +} +template (value) OtherSignedNotification +ts_otherSignedNotification(template (value) NotificationMetadata tbsOtherNotification := ts_notificationMetadata, + template (value) octetstring euiccNotificationSignature := '0123456789ABCDEF'O, + template (value) Certificate euiccCertificate, + template (value) Certificate eumCertificate) := { + tbsOtherNotification := tbsOtherNotification, + euiccNotificationSignature := euiccNotificationSignature, + euiccCertificate := euiccCertificate, + eumCertificate := eumCertificate +} + } diff --git a/library/euicc/RSPDefinitions_Types.ttcn b/library/euicc/RSPDefinitions_Types.ttcn index 5bb3925..8d33f17 100644 --- a/library/euicc/RSPDefinitions_Types.ttcn +++ b/library/euicc/RSPDefinitions_Types.ttcn @@ -42,6 +42,15 @@ external function dec_ServerSigned1(in octetstring stream) return ServerSigned1; external function enc_ServerSigned1(in ServerSigned1 msg) return octetstring; +external function dec_EuiccSigned1(in octetstring stream) return EuiccSigned1; +external function enc_EuiccSigned1(in EuiccSigned1 msg) return octetstring; + +external function dec_EUICCSigned2(in octetstring stream) return EUICCSigned2; +external function enc_EUICCSigned2(in EUICCSigned2 msg) return octetstring; + +external function dec_ControlRefTemplate(in octetstring stream) return ControlRefTemplate; +external function enc_ControlRefTemplate(in ControlRefTemplate msg) return octetstring; + external function dec_BoundProfilePackage(in octetstring stream) return BoundProfilePackage; external function enc_BoundProfilePackage(in BoundProfilePackage msg) return octetstring; @@ -57,4 +66,13 @@ external function dec_RemoteProfileProvisioningRequest(in octetstring stream) return RemoteProfileProvisioningRequest; external function enc_RemoteProfileProvisioningRequest(in RemoteProfileProvisioningRequest msg) return octetstring; +external function dec_EuiccCancelSessionSigned(in octetstring stream) return EuiccCancelSessionSigned; +external function enc_EuiccCancelSessionSigned(in EuiccCancelSessionSigned msg) return octetstring; + +external function dec_OtherSignedNotification(in octetstring stream) return OtherSignedNotification; +external function enc_OtherSignedNotification(in OtherSignedNotification msg) return octetstring; + +external function dec_NotificationMetadata(in octetstring stream) return NotificationMetadata; +external function enc_NotificationMetadata(in NotificationMetadata msg) return octetstring; + } diff --git a/library/euicc/es2p_Types_JSON.ttcn b/library/euicc/es2p_Types_JSON.ttcn index 6a29aed..e8ff74c 100644 --- a/library/euicc/es2p_Types_JSON.ttcn +++ b/library/euicc/es2p_Types_JSON.ttcn @@ -24,7 +24,7 @@ /* GSMA SGP.22, section 6.5.2.1 (SMDP+ to MNO) */ type record JSON_ES2p_DownloadOrderResponse { JSON_ESx_ResponseHeader header, - charstring iccid + charstring iccid optional }; private external function dec_JSON_ES2p_DownloadOrderRequest(in octetstring stream) return JSON_ES2p_DownloadOrderRequest @@ -86,7 +86,7 @@ /* GSMA SGP.22, section 6.5.2.3 (SMDP+ to MNO) */ type record JSON_ES2p_CancelOrderResponse { JSON_ESx_ResponseHeader header, - charstring iccid + charstring iccid optional }; private external function dec_JSON_ES2p_CancelOrderRequest(in octetstring stream) return JSON_ES2p_CancelOrderRequest diff --git a/library/euicc/es9p_Types_JSON.ttcn b/library/euicc/es9p_Types_JSON.ttcn index 601ea8f..3e13c42 100644 --- a/library/euicc/es9p_Types_JSON.ttcn +++ b/library/euicc/es9p_Types_JSON.ttcn @@ -209,8 +209,13 @@ } } with { extension "prototype(fast)" } +type record DecodedRPPReponse_Wrap { + RemoteProfileProvisioningResponse asn1_pdu optional, + JSON_ESx_FunctionExecutionStatusCodeData err optional +} + /* Converter function to decode a JSON formatted ES9+ response to its ASN.1 ES9+ record representation */ -function dec_RemoteProfileProvisioningResponse_from_JSON(in charstring json_pdu_enc, out RemoteProfileProvisioningResponse asn1_pdu_dec) { +function dec_RemoteProfileProvisioningResponse_from_JSON(in charstring json_pdu_enc, out DecodedRPPReponse_Wrap wrapped_resp) { var JSON_ES9p_RemoteProfileProvisioningResponse json_pdu; json_pdu := dec_JSON_ES9p_RemoteProfileProvisioningResponse(char2oct(json_pdu_enc)); @@ -218,7 +223,7 @@ if (not match(json_pdu.initiateAuthenticationResponse.header, ts_responseHeader)) { setverdict(fail, "unsuccessful request"); } - asn1_pdu_dec := valueof(ts_initiateAuthenticationResponse( + wrapped_resp.asn1_pdu := valueof(ts_initiateAuthenticationResponse( str2oct(json_pdu.initiateAuthenticationResponse.transactionId), dec_ServerSigned1(decode_base64(json_pdu.initiateAuthenticationResponse.serverSigned1)), decode_base64(json_pdu.initiateAuthenticationResponse.serverSignature1), @@ -228,14 +233,14 @@ if (not match(json_pdu.getBoundProfilePackageResponse.header, ts_responseHeader)) { setverdict(fail, "unsuccessful request"); } - asn1_pdu_dec := valueof(ts_getBoundProfilePackageResponse( + wrapped_resp.asn1_pdu := valueof(ts_getBoundProfilePackageResponse( str2oct(json_pdu.getBoundProfilePackageResponse.transactionId), dec_BoundProfilePackage(decode_base64(json_pdu.getBoundProfilePackageResponse.boundProfilePackage)))); } else if (ispresent(json_pdu.authenticateClientResponseEs9)) { if (not match(json_pdu.authenticateClientResponseEs9.header, ts_responseHeader)) { setverdict(fail, "unsuccessful request"); } - asn1_pdu_dec := valueof(ts_authenticateClientResponseEs9( + wrapped_resp.asn1_pdu := valueof(ts_authenticateClientResponseEs9( str2oct(json_pdu.authenticateClientResponseEs9.transactionId), dec_StoreMetadataRequest(decode_base64(json_pdu.authenticateClientResponseEs9.profileMetadata)), dec_SmdpSigned2(decode_base64(json_pdu.authenticateClientResponseEs9.smdpSigned2)), @@ -243,9 +248,12 @@ dec_Certificate(decode_base64(json_pdu.authenticateClientResponseEs9.smdpCertificate)))); } else if (ispresent(json_pdu.emptyResponse)) { if (not match(json_pdu.emptyResponse.header, ts_responseHeader)) { - setverdict(fail, "unsuccessful request"); + wrapped_resp.err := json_pdu.emptyResponse.header.functionExecutionStatus.statusCodeData; + } else { + /* Success case for empty response - initialize optional fields */ + wrapped_resp.asn1_pdu := omit; + wrapped_resp.err := omit; } - /* Empty response, do nothing? */ } else { setverdict(fail, "decoder path not implemented for JSON ES9+ message"); } diff --git a/library/euicc/esx_header_Types_JSON.ttcn b/library/euicc/esx_header_Types_JSON.ttcn index 4a4f4ca..1954341 100644 --- a/library/euicc/esx_header_Types_JSON.ttcn +++ b/library/euicc/esx_header_Types_JSON.ttcn @@ -17,8 +17,20 @@ }; /* GSMA SGP.22, section 6.5.1.4 */ + +type record JSON_ESx_FunctionExecutionStatusCodeData { + charstring subjectCode, + charstring reasonCode, + charstring subjectIdentifier optional, + charstring message_ optional +} with { + encode "JSON"; + variant (message_) "JSON:name as message" +}; + type record JSON_ESx_FunctionExecutionStatus { - charstring status + charstring status, + JSON_ESx_FunctionExecutionStatusCodeData statusCodeData optional }; type record JSON_ESx_ResponseHeader { JSON_ESx_FunctionExecutionStatus functionExecutionStatus @@ -27,13 +39,15 @@ template (value) JSON_ESx_ResponseHeader ts_responseHeader := { functionExecutionStatus := { - status := "Executed-Success" + status := "Executed-Success", + statusCodeData := omit } } template (present) JSON_ESx_ResponseHeader tr_responseHeader := { functionExecutionStatus := { - status := ? + status := ?, + statusCodeData := * } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/40982?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: I9c622751e195d33f6f0a832265d6b10674d1c75c Gerrit-Change-Number: 40982 Gerrit-PatchSet: 4 Gerrit-Owner: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: 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: pespin <pespin(a)sysmocom.de>

1 day, 20 hours

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2025