jolly has uploaded this change for review.
IPAd: Add eimTransactionId to TC_proc_indirect_prfle_dwnld
As we now have an optional transaction ID within
profileDownloadTriggerRequest, check if the same transaction ID is
received with the initiateAuthenticationRequestEsipa.
Related: SYS#8101
Change-Id: I1b6370188a909dd2315215b6eff23c80d2b26c30
---
M ipad/IPAd_Tests.ttcn
M library/euicc/SGP32Definitions_Templates.ttcn
2 files changed, 16 insertions(+), 10 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/43279/1
diff --git a/ipad/IPAd_Tests.ttcn b/ipad/IPAd_Tests.ttcn
index ec541fe..91f160f 100644
--- a/ipad/IPAd_Tests.ttcn
+++ b/ipad/IPAd_Tests.ttcn
@@ -435,7 +435,7 @@
f_vpcd_transceive(enc_GetEuiccChallengeResponse(valueof(ts_GetEuiccChallengeResponse)), 'bf2e00'O);
/* Step #5-#10 */
- esipa_req := f_esipa_receive(tr_initiateAuthenticationRequestEsipa);
+ esipa_req := f_esipa_receive(tr_initiateAuthenticationRequestEsipa(eimTransactionId := '42'O));
esipa_res := valueof(ts_initiateAuthenticationResponseEsipa(serverSigned1 := ts_serverSigned1(euiccChallenge := esipa_req.initiateAuthenticationRequestEsipa.euiccChallenge)));
f_esipa_send(esipa_res);
@@ -494,7 +494,8 @@
f_http_register();
/* Prepare indirect profile download by responding with a download trigger request */
- f_esipa_transceive(valueof(ts_getEimPackageResponse_dnlTrigReq), tr_getEimPackageRequest);
+ f_esipa_transceive(valueof(ts_getEimPackageResponse_dnlTrigReq(ts_profileDownloadTriggerRequest(eimTransactionId := '42'O))),
+ tr_getEimPackageRequest);
/* Expect the IPAd to query the eIM configuration data from the eUICC */
f_vpcd_transceive(enc_GetEimConfigurationDataResponse(valueof(ts_getEimConfigurationDataResponse(eim_fqdn))), 'BF5500'O);
diff --git a/library/euicc/SGP32Definitions_Templates.ttcn b/library/euicc/SGP32Definitions_Templates.ttcn
index faf97c8..da3ac16 100644
--- a/library/euicc/SGP32Definitions_Templates.ttcn
+++ b/library/euicc/SGP32Definitions_Templates.ttcn
@@ -126,12 +126,15 @@
/* GSMA SGP.32, section 6.3.2.1 */
template (present) EsipaMessageFromIpaToEim
-tr_initiateAuthenticationRequestEsipa(template (present) octetstring euiccChallenge := ?) := {
+tr_initiateAuthenticationRequestEsipa(template (present) octetstring euiccChallenge := ?,
+ template charstring smdpAddress := *,
+ template EUICCInfo1 euiccInfo1 := *,
+ template octetstring eimTransactionId := *) := {
initiateAuthenticationRequestEsipa := {
euiccChallenge := euiccChallenge,
- smdpAddress := *,
- euiccInfo1 := *,
- eimTransactionId := *
+ smdpAddress := smdpAddress,
+ euiccInfo1 := euiccInfo1,
+ eimTransactionId := eimTransactionId
}
}
template (value) EsipaMessageFromIpaToEim
@@ -302,18 +305,20 @@
/* GSMA SGP.32, section 6.3.2.6 and 2.11.1.3 */
template (present) ProfileDownloadTriggerRequest
-tr_profileDownloadTriggerRequest(template (present) charstring activationCode := ?) := {
+tr_profileDownloadTriggerRequest(template (present) charstring activationCode := ?,
+ template octetstring eimTransactionId := *) := {
profileDownloadData := {
activationCode := activationCode
},
- eimTransactionId := *
+ eimTransactionId := eimTransactionId
}
template (value) ProfileDownloadTriggerRequest
-ts_profileDownloadTriggerRequest(template (value) charstring activationCode := "1$SMDP.EXAMPLE.COM$$1.3.6.1.4.1.31746") := {
+ts_profileDownloadTriggerRequest(template (value) charstring activationCode := "1$SMDP.EXAMPLE.COM$$1.3.6.1.4.1.31746",
+ template (omit) octetstring eimTransactionId := omit) := {
profileDownloadData := {
activationCode := activationCode
},
- eimTransactionId := omit
+ eimTransactionId := eimTransactionId
}
template (present) EsipaMessageFromEimToIpa
tr_getEimPackageResponse_dnlTrigReq(template (present) ProfileDownloadTriggerRequest profileDownloadTriggerRequest := tr_profileDownloadTriggerRequest) := {
To view, visit change 43279. To unsubscribe, or for help writing mail filters, visit settings.