16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43062?usp=email )
Change subject: WIP: Change of IpaEuiccDataRequest
......................................................................
WIP: Change of IpaEuiccDataRequest
Section 2.11.1.2
* Changed tags
* Two search criteria: searchCriteriaNotification, searchCriteriaEuiccPackageResult
This patch is totally wrong. The filter cannot work, because it reads
from the wrong choice. If eIM asks for eUICC Package Results, we need to
return that result.
We have to generade the list in convert_notification_list() with the
correct choice. Do we have all the required information?
Change-Id: I411111c71787ce27615b6b66fc8b19488883d15b
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/IpaEuiccDataRequest.c
M src/ipa/libasn/IpaEuiccDataRequest.h
M src/ipa/libipa/es10b_retr_notif_from_lst.c
M src/ipa/libipa/es10b_retr_notif_from_lst.h
M src/ipa/libipa/proc_euicc_data_req.c
6 files changed, 205 insertions(+), 85 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/62/43062/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 0e210f0..b6cd8a5 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -117,8 +117,10 @@
euiccCiPKIdentifierToBeUsed OCTET STRING OPTIONAL, -- CI Public Key Identifier (possibly truncated) supported on the eUICC for signature creation
searchCriteriaNotification [1] CHOICE {
seqNumber [0] INTEGER,
- profileManagementOperation [1] NotificationEvent,
- euiccPackageResults [2] NULL
+ profileManagementOperation [1] NotificationEvent
+ } OPTIONAL,
+ searchCriteriaEuiccPackageResult [2] CHOICE {
+ seqNumber [0] INTEGER
} OPTIONAL,
eimTransactionId [3] TransactionId OPTIONAL -- Tag '83'
}
diff --git a/src/ipa/libasn/IpaEuiccDataRequest.c b/src/ipa/libasn/IpaEuiccDataRequest.c
index fa1924d..9e2852d 100644
--- a/src/ipa/libasn/IpaEuiccDataRequest.c
+++ b/src/ipa/libasn/IpaEuiccDataRequest.c
@@ -11,7 +11,15 @@
{ 0, 0 },
-1};
static asn_per_constraints_t asn_PER_type_searchCriteriaNotification_constr_4 CC_NOTUSED = {
- { APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */,
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 1, 1, 0, 1 } /* (0..1,...) */,
+ { APC_UNCONSTRAINED, -1, -1, 0, 0 },
+ 0, 0 /* No PER value map */
+};
+static asn_oer_constraints_t asn_OER_type_searchCriteriaEuiccPackageResult_constr_8 CC_NOTUSED = {
+ { 0, 0 },
+ -1};
+static asn_per_constraints_t asn_PER_type_searchCriteriaEuiccPackageResult_constr_8 CC_NOTUSED = {
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 0, 0, 0, 0 } /* (0..0,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
@@ -34,20 +42,10 @@
0, 0, /* No default value */
"profileManagementOperation"
},
- { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteriaNotification, choice.euiccPackageResults),
- (ASN_TAG_CLASS_CONTEXT | (2 << 2)),
- -1, /* IMPLICIT tag at current level */
- &asn_DEF_NULL,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "euiccPackageResults"
- },
};
static const asn_TYPE_tag2member_t asn_MAP_searchCriteriaNotification_tag2el_4[] = {
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* seqNumber */
- { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* profileManagementOperation */
- { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* euiccPackageResults */
+ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* profileManagementOperation */
};
static asn_CHOICE_specifics_t asn_SPC_searchCriteriaNotification_specs_4 = {
sizeof(struct IpaEuiccDataRequest__searchCriteriaNotification),
@@ -55,9 +53,9 @@
offsetof(struct IpaEuiccDataRequest__searchCriteriaNotification, present),
sizeof(((struct IpaEuiccDataRequest__searchCriteriaNotification *)0)->present),
asn_MAP_searchCriteriaNotification_tag2el_4,
- 3, /* Count of tags in the map */
+ 2, /* Count of tags in the map */
0, 0,
- 3 /* Extensions start */
+ 2 /* Extensions start */
};
static /* Use -fall-defs-global to expose */
asn_TYPE_descriptor_t asn_DEF_searchCriteriaNotification_4 = {
@@ -70,10 +68,49 @@
0, /* No tags (count) */
{ &asn_OER_type_searchCriteriaNotification_constr_4, &asn_PER_type_searchCriteriaNotification_constr_4, CHOICE_constraint },
asn_MBR_searchCriteriaNotification_4,
- 3, /* Elements count */
+ 2, /* Elements count */
&asn_SPC_searchCriteriaNotification_specs_4 /* Additional specs */
};
+static asn_TYPE_member_t asn_MBR_searchCriteriaEuiccPackageResult_8[] = {
+ { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteriaEuiccPackageResult, choice.seqNumber),
+ (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_NativeInteger,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "seqNumber"
+ },
+};
+static const asn_TYPE_tag2member_t asn_MAP_searchCriteriaEuiccPackageResult_tag2el_8[] = {
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* seqNumber */
+};
+static asn_CHOICE_specifics_t asn_SPC_searchCriteriaEuiccPackageResult_specs_8 = {
+ sizeof(struct IpaEuiccDataRequest__searchCriteriaEuiccPackageResult),
+ offsetof(struct IpaEuiccDataRequest__searchCriteriaEuiccPackageResult, _asn_ctx),
+ offsetof(struct IpaEuiccDataRequest__searchCriteriaEuiccPackageResult, present),
+ sizeof(((struct IpaEuiccDataRequest__searchCriteriaEuiccPackageResult *)0)->present),
+ asn_MAP_searchCriteriaEuiccPackageResult_tag2el_8,
+ 1, /* Count of tags in the map */
+ 0, 0,
+ 1 /* Extensions start */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_searchCriteriaEuiccPackageResult_8 = {
+ "searchCriteriaEuiccPackageResult",
+ "searchCriteriaEuiccPackageResult",
+ &asn_OP_CHOICE,
+ 0, /* No effective tags (pointer) */
+ 0, /* No effective tags (count) */
+ 0, /* No tags (pointer) */
+ 0, /* No tags (count) */
+ { &asn_OER_type_searchCriteriaEuiccPackageResult_constr_8, &asn_PER_type_searchCriteriaEuiccPackageResult_constr_8, CHOICE_constraint },
+ asn_MBR_searchCriteriaEuiccPackageResult_8,
+ 1, /* Elements count */
+ &asn_SPC_searchCriteriaEuiccPackageResult_specs_8 /* Additional specs */
+};
+
asn_TYPE_member_t asn_MBR_IpaEuiccDataRequest_1[] = {
{ ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest, tagList),
(ASN_TAG_CLASS_APPLICATION | (28 << 2)),
@@ -84,7 +121,7 @@
0, 0, /* No default value */
"tagList"
},
- { ATF_POINTER, 3, offsetof(struct IpaEuiccDataRequest, euiccCiPKIdentifierToBeUsed),
+ { ATF_POINTER, 4, offsetof(struct IpaEuiccDataRequest, euiccCiPKIdentifierToBeUsed),
(ASN_TAG_CLASS_UNIVERSAL | (4 << 2)),
0,
&asn_DEF_OCTET_STRING,
@@ -93,7 +130,7 @@
0, 0, /* No default value */
"euiccCiPKIdentifierToBeUsed"
},
- { ATF_POINTER, 2, offsetof(struct IpaEuiccDataRequest, searchCriteriaNotification),
+ { ATF_POINTER, 3, offsetof(struct IpaEuiccDataRequest, searchCriteriaNotification),
(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+1, /* EXPLICIT tag at current level */
&asn_DEF_searchCriteriaNotification_4,
@@ -102,6 +139,15 @@
0, 0, /* No default value */
"searchCriteriaNotification"
},
+ { ATF_POINTER, 2, offsetof(struct IpaEuiccDataRequest, searchCriteriaEuiccPackageResult),
+ (ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+ +1, /* EXPLICIT tag at current level */
+ &asn_DEF_searchCriteriaEuiccPackageResult_8,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "searchCriteriaEuiccPackageResult"
+ },
{ ATF_POINTER, 1, offsetof(struct IpaEuiccDataRequest, eimTransactionId),
(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
-1, /* IMPLICIT tag at current level */
@@ -112,7 +158,7 @@
"eimTransactionId"
},
};
-static const int asn_MAP_IpaEuiccDataRequest_oms_1[] = { 1, 2, 3 };
+static const int asn_MAP_IpaEuiccDataRequest_oms_1[] = { 1, 2, 3, 4 };
static const ber_tlv_tag_t asn_DEF_IpaEuiccDataRequest_tags_1[] = {
(ASN_TAG_CLASS_CONTEXT | (82 << 2)),
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
@@ -121,16 +167,17 @@
{ (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /* euiccCiPKIdentifierToBeUsed */
{ (ASN_TAG_CLASS_APPLICATION | (28 << 2)), 0, 0, 0 }, /* tagList */
{ (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 }, /* searchCriteriaNotification */
- { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* eimTransactionId */
+ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 3, 0, 0 }, /* searchCriteriaEuiccPackageResult */
+ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 4, 0, 0 } /* eimTransactionId */
};
asn_SEQUENCE_specifics_t asn_SPC_IpaEuiccDataRequest_specs_1 = {
sizeof(struct IpaEuiccDataRequest),
offsetof(struct IpaEuiccDataRequest, _asn_ctx),
asn_MAP_IpaEuiccDataRequest_tag2el_1,
- 4, /* Count of tags in the map */
+ 5, /* Count of tags in the map */
asn_MAP_IpaEuiccDataRequest_oms_1, /* Optional members */
- 3, 0, /* Root/Additions */
- 4, /* First extension addition */
+ 4, 0, /* Root/Additions */
+ 5, /* First extension addition */
};
asn_TYPE_descriptor_t asn_DEF_IpaEuiccDataRequest = {
"IpaEuiccDataRequest",
@@ -144,7 +191,7 @@
/sizeof(asn_DEF_IpaEuiccDataRequest_tags_1[0]), /* 2 */
{ 0, 0, SEQUENCE_constraint },
asn_MBR_IpaEuiccDataRequest_1,
- 4, /* Elements count */
+ 5, /* Elements count */
&asn_SPC_IpaEuiccDataRequest_specs_1 /* Additional specs */
};
diff --git a/src/ipa/libasn/IpaEuiccDataRequest.h b/src/ipa/libasn/IpaEuiccDataRequest.h
index c4f0a87..b3f0347 100644
--- a/src/ipa/libasn/IpaEuiccDataRequest.h
+++ b/src/ipa/libasn/IpaEuiccDataRequest.h
@@ -16,7 +16,6 @@
#include "TransactionId.h"
#include <NativeInteger.h>
#include "NotificationEvent.h"
-#include <NULL.h>
#include <constr_CHOICE.h>
#include <constr_SEQUENCE.h>
@@ -28,11 +27,16 @@
typedef enum IpaEuiccDataRequest__searchCriteriaNotification_PR {
IpaEuiccDataRequest__searchCriteriaNotification_PR_NOTHING, /* No components present */
IpaEuiccDataRequest__searchCriteriaNotification_PR_seqNumber,
- IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation,
- IpaEuiccDataRequest__searchCriteriaNotification_PR_euiccPackageResults
+ IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation
/* Extensions may appear below */
} IpaEuiccDataRequest__searchCriteriaNotification_PR;
+typedef enum IpaEuiccDataRequest__searchCriteriaEuiccPackageResult_PR {
+ IpaEuiccDataRequest__searchCriteriaEuiccPackageResult_PR_NOTHING, /* No components present */
+ IpaEuiccDataRequest__searchCriteriaEuiccPackageResult_PR_seqNumber
+ /* Extensions may appear below */
+
+} IpaEuiccDataRequest__searchCriteriaEuiccPackageResult_PR;
/* IpaEuiccDataRequest */
typedef struct IpaEuiccDataRequest {
@@ -43,7 +47,6 @@
union IpaEuiccDataRequest__searchCriteriaNotification_u {
long seqNumber;
NotificationEvent_t profileManagementOperation;
- NULL_t euiccPackageResults;
/*
* This type is extensible,
* possible extensions are below.
@@ -53,6 +56,19 @@
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t _asn_ctx;
} *searchCriteriaNotification;
+ struct IpaEuiccDataRequest__searchCriteriaEuiccPackageResult {
+ IpaEuiccDataRequest__searchCriteriaEuiccPackageResult_PR present;
+ union IpaEuiccDataRequest__searchCriteriaEuiccPackageResult_u {
+ long seqNumber;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+ } choice;
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+ } *searchCriteriaEuiccPackageResult;
TransactionId_t *eimTransactionId /* OPTIONAL */;
/*
* This type is extensible,
@@ -66,7 +82,7 @@
/* Implementation */
extern asn_TYPE_descriptor_t asn_DEF_IpaEuiccDataRequest;
extern asn_SEQUENCE_specifics_t asn_SPC_IpaEuiccDataRequest_specs_1;
-extern asn_TYPE_member_t asn_MBR_IpaEuiccDataRequest_1[4];
+extern asn_TYPE_member_t asn_MBR_IpaEuiccDataRequest_1[5];
#ifdef __cplusplus
}
diff --git a/src/ipa/libipa/es10b_retr_notif_from_lst.c b/src/ipa/libipa/es10b_retr_notif_from_lst.c
index bd90b3a..9096884 100644
--- a/src/ipa/libipa/es10b_retr_notif_from_lst.c
+++ b/src/ipa/libipa/es10b_retr_notif_from_lst.c
@@ -155,31 +155,34 @@
struct RetrieveNotificationsListRequest__searchCriteria search_criteria = { 0 };
struct ipa_buf *es10b_req = NULL;
- if (req->dr_search_criteria) {
- /* Convert from foreigen searchCriteria (see comment in header file) */
- switch (req->dr_search_criteria->present) {
- case IpaEuiccDataRequest__searchCriteriaNotification_PR_seqNumber:
- search_criteria.present = RetrieveNotificationsListRequest__searchCriteria_PR_seqNumber;
- search_criteria.choice.seqNumber = req->dr_search_criteria->choice.seqNumber;
- break;
- case IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation:
- search_criteria.present =
- RetrieveNotificationsListRequest__searchCriteria_PR_profileManagementOperation;
- search_criteria.choice.profileManagementOperation =
- req->dr_search_criteria->choice.profileManagementOperation;
- break;
- case IpaEuiccDataRequest__searchCriteriaNotification_PR_euiccPackageResults:
- IPA_LOGP_ES10X("RetrieveNotificationsList", LERROR,
- "unsupported euiccPackageResults searchCriteria in IpaEuiccDataRequest!\n");
+ switch (req->dr_tag) {
+ case 0xA0:
+ if (req->dr_search_criteria_notification) {
+ switch (req->dr_search_criteria_notification->present) {
+ case IpaEuiccDataRequest__searchCriteriaNotification_PR_seqNumber:
+ search_criteria.choice.seqNumber = req->search_criteria.choice.seqNumber;
+ break;
+ case IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation:
+ search_criteria.choice.profileManagementOperation =
+ req->search_criteria.choice.profileManagementOperation;
+ break;
+ default:
+ IPA_LOGP_ES10X("RetrieveNotificationsList", LERROR,
+ "unsupported euiccPackageResults searchCriteria!\n");
+ search_criteria.present = RetrieveNotificationsListRequest__searchCriteria_PR_NOTHING;
+ break;
+ }
+ } else {
search_criteria.present = RetrieveNotificationsListRequest__searchCriteria_PR_NOTHING;
- break;
- default:
- IPA_LOGP_ES10X("RetrieveNotificationsList", LERROR,
- "empty searchCriteria in IpaEuiccDataRequest!\n");
- search_criteria.present = RetrieveNotificationsListRequest__searchCriteria_PR_NOTHING;
- break;
}
- } else {
+ break;
+ case 0xA2:
+ /* There is not support for searchCriteria in IpaEuiccDataRequest.
+ * We emulate it by filtering the response.
+ */
+ search_criteria.present = RetrieveNotificationsListRequest__searchCriteria_PR_NOTHING;
+ break;
+ default:
/* Use native search_criteria as provided by caller */
search_criteria.present = req->search_criteria.present;
switch (req->search_criteria.present) {
@@ -215,32 +218,36 @@
struct SGP32_RetrieveNotificationsListRequest__searchCriteria search_criteria = { 0 };
struct ipa_buf *es10b_req = NULL;
- if (req->dr_search_criteria) {
- /* Convert from foreigen searchCriteria (see comment in header file) */
- switch (req->dr_search_criteria->present) {
- case IpaEuiccDataRequest__searchCriteriaNotification_PR_seqNumber:
- search_criteria.present = SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_seqNumber;
- search_criteria.choice.seqNumber = req->dr_search_criteria->choice.seqNumber;
- break;
- case IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation:
- search_criteria.present =
- SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_profileManagementOperation;
- search_criteria.choice.profileManagementOperation =
- req->dr_search_criteria->choice.profileManagementOperation;
- break;
- case IpaEuiccDataRequest__searchCriteriaNotification_PR_euiccPackageResults:
- search_criteria.present =
- SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_euiccPackageResults;
- search_criteria.choice.euiccPackageResults =
- req->dr_search_criteria->choice.euiccPackageResults;
- break;
- default:
- IPA_LOGP_ES10X("RetrieveNotificationsList", LERROR,
- "empty searchCriteria in IpaEuiccDataRequest!\n");
- search_criteria.present = RetrieveNotificationsListRequest__searchCriteria_PR_NOTHING;
- break;
+ switch (req->dr_tag) {
+ case 0xA0:
+ if (req->dr_search_criteria_notification) {
+ switch (req->dr_search_criteria_notification->present) {
+ case IpaEuiccDataRequest__searchCriteriaNotification_PR_seqNumber:
+ search_criteria.present =
+ SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_seqNumber;
+ search_criteria.choice.seqNumber =
+ req->dr_search_criteria_notification->choice.seqNumber;
+ break;
+ case IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation:
+ search_criteria.present =
+ SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_profileManagementOperation;
+ search_criteria.choice.profileManagementOperation =
+ req->dr_search_criteria_notification->choice.profileManagementOperation;
+ break;
+ default:
+ IPA_LOGP_ES10X("RetrieveNotificationsList", LERROR,
+ "empty searchCriteria in IpaEuiccDataRequest!\n");
+ search_criteria.present = RetrieveNotificationsListRequest__searchCriteria_PR_NOTHING;
+ break;
+ }
+ } else {
+ search_criteria.present = RetrieveNotificationsListRequest__searchCriteria_PR_NOTHING;
}
- } else {
+ break;
+ case 0xA2:
+ search_criteria.present = SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_euiccPackageResults;
+ break;
+ default:
/* Use native search_criteria as provided by caller */
search_criteria = req->search_criteria;
}
@@ -253,6 +260,35 @@
return es10b_req;
}
+void ipa_es10b_retr_notif_from_lst_filter(struct SGP32_RetrieveNotificationsListResponse *sgp32_res,
+ const struct ipa_es10b_retr_notif_from_lst_req *req)
+{
+ long seq_number;
+ struct EuiccPackageResult *euicc_package_result_item;
+ int i;
+
+ /* No list to filter. */
+ if (sgp32_res->present != SGP32_RetrieveNotificationsListResponse_PR_euiccPackageResultList)
+ return;
+
+ /* No search criteria with sequence number given. */
+ if (!req->dr_search_criteria_epr ||
+ req->dr_search_criteria_epr->present != IpaEuiccDataRequest__searchCriteriaEuiccPackageResult_PR_seqNumber)
+ return;
+
+ seq_number = req->dr_search_criteria_epr->choice.seqNumber;
+
+ /* Remove all items that do not have the requested sequence number. */
+ for (i = 0; i < sgp32_res->choice.euiccPackageResultList.list.count;) {
+ euicc_package_result_item = sgp32_res->choice.euiccPackageResultList.list.array[i];
+ if (euicc_package_result_item->present == EuiccPackageResult_PR_euiccPackageResultSigned &&
+ euicc_package_result_item->choice.euiccPackageResultSigned.euiccPackageResultDataSigned.seqNumber == seq_number)
+ i++;
+ else
+ asn_sequence_del(&sgp32_res->choice.euiccPackageResultList.list, i, 1);
+ }
+}
+
/*! Function (ES10b): RetrieveNotificationsList.
* \param[inout] ctx pointer to ipa_context.
* \param[in] req pointer to struct that holds the function parameters.
@@ -290,6 +326,9 @@
if (rc < 0)
goto error;
+ if (req->dr_tag == 0xA2)
+ ipa_es10b_retr_notif_from_lst_filter(res->sgp32_res, req);
+
IPA_FREE(es10b_req);
IPA_FREE(es10b_res);
return res;
diff --git a/src/ipa/libipa/es10b_retr_notif_from_lst.h b/src/ipa/libipa/es10b_retr_notif_from_lst.h
index 2773356..33aaf5d 100644
--- a/src/ipa/libipa/es10b_retr_notif_from_lst.h
+++ b/src/ipa/libipa/es10b_retr_notif_from_lst.h
@@ -19,7 +19,9 @@
/* When the caller has access to a search searchCriteria that originates from an IpaEuiccDataRequest, the
* pointer to it may be passed here. The function will then atomatically convert the searchCriteria into
* the native RetrieveNotificationsListRequest format. */
- const struct IpaEuiccDataRequest__searchCriteriaNotification *dr_search_criteria;
+ const struct IpaEuiccDataRequest__searchCriteriaNotification *dr_search_criteria_notification;
+ const struct IpaEuiccDataRequest__searchCriteriaEuiccPackageResult *dr_search_criteria_epr;
+ uint16_t dr_tag;
};
struct ipa_es10b_retr_notif_from_lst_res {
diff --git a/src/ipa/libipa/proc_euicc_data_req.c b/src/ipa/libipa/proc_euicc_data_req.c
index 0fa8ad0..2a9417d 100644
--- a/src/ipa/libipa/proc_euicc_data_req.c
+++ b/src/ipa/libipa/proc_euicc_data_req.c
@@ -114,7 +114,7 @@
/* Collect requested data */
tag_list = IPA_BUF_FROM_ASN(&pars->ipa_euicc_data_request->tagList);
- if (ipa_tag_in_taglist(0x80, tag_list)) {
+ if (ipa_tag_in_taglist(0x81, tag_list)) {
IPA_LOGP(SIPA, LINFO, "eIM asks for Default SM-DP+ address\n");
euicc_cfg_addr = ipa_es10a_get_euicc_cfg_addr(ctx);
if (euicc_cfg_addr && euicc_cfg_addr->res->defaultDpAddress)
@@ -180,7 +180,7 @@
}
}
- if (ipa_tag_in_taglist(0x88, tag_list)) {
+ if (ipa_tag_in_taglist(0xA8, tag_list)) {
IPA_LOGP(SIPA, LINFO, "eIM asks for IPA Capabilities\n");
ipa_euicc_data_response.choice.ipaEuiccData.ipaCapabilities = make_ipa_capabilties();
} else {
@@ -194,15 +194,29 @@
ipa_euicc_data_response.choice.ipaEuiccData.deviceInfo = NULL;
}
- if (ipa_tag_in_taglist(0xBF2B, tag_list)) {
- IPA_LOGP(SIPA, LINFO, "eIM asks for List of Notifications and/or eUICC Package Results\n");
+ if (ipa_tag_in_taglist(0xA0, tag_list)) {
+ IPA_LOGP(SIPA, LINFO, "eIM asks for List of Notifications\n");
- retr_notif_from_lst_req.dr_search_criteria = pars->ipa_euicc_data_request->searchCriteriaNotification;
+ retr_notif_from_lst_req.dr_search_criteria_notification = pars->ipa_euicc_data_request->searchCriteriaNotification;
+ retr_notif_from_lst_req.dr_tag = 0xA0;
retr_notif_from_lst_res = ipa_es10b_retr_notif_from_lst(ctx, &retr_notif_from_lst_req);
if (retr_notif_from_lst_res && retr_notif_from_lst_res->sgp32_res &&
retr_notif_from_lst_res->sgp32_res->present == SGP32_RetrieveNotificationsListResponse_PR_notificationList) {
ipa_euicc_data_response.choice.ipaEuiccData.notificationsList =
- (struct PendingNotificationList *)&retr_notif_from_lst_res->sgp32_res->choice.notificationList;
+ &retr_notif_from_lst_res->sgp32_res->choice.notificationList;
+ }
+ }
+
+ if (ipa_tag_in_taglist(0xA2, tag_list)) {
+ IPA_LOGP(SIPA, LINFO, "eIM asks for eUICC Package Results\n");
+
+ retr_notif_from_lst_req.dr_search_criteria_epr = pars->ipa_euicc_data_request->searchCriteriaEuiccPackageResult;
+ retr_notif_from_lst_req.dr_tag = 0xA2;
+ retr_notif_from_lst_res = ipa_es10b_retr_notif_from_lst(ctx, &retr_notif_from_lst_req);
+ if (retr_notif_from_lst_res && retr_notif_from_lst_res->sgp32_res &&
+ retr_notif_from_lst_res->sgp32_res->present == SGP32_RetrieveNotificationsListResponse_PR_euiccPackageResultList) {
+ ipa_euicc_data_response.choice.ipaEuiccData.euiccPackageResultList =
+ &retr_notif_from_lst_res->sgp32_res->choice.euiccPackageResultList;
}
}
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43062?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I411111c71787ce27615b6b66fc8b19488883d15b
Gerrit-Change-Number: 43062
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
[L] Change in onomondo-ipa[master]: V1.2: Add AuthenticateResponseOk and EuiccSigned1
by jolly 16 Jul '26
by jolly 16 Jul '26
16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43061?usp=email )
Change subject: V1.2: Add AuthenticateResponseOk and EuiccSigned1
......................................................................
V1.2: Add AuthenticateResponseOk and EuiccSigned1
Both structures are taken from SGP.22 but do not change. The IPA process uses these new structures, because the may be expanded in the future.
Reference: SGP.23 Section 5.14.3
Related: SYS#8101
Change-Id: I501247132de30618a2b1ace44c7c3772ab42eb09
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/CMakeLists.txt
A src/ipa/libasn/SGP32-AuthenticateResponseOk.c
A src/ipa/libasn/SGP32-AuthenticateResponseOk.h
M src/ipa/libasn/SGP32-AuthenticateServerResponse.c
M src/ipa/libasn/SGP32-AuthenticateServerResponse.h
A src/ipa/libasn/SGP32-EuiccSigned1.c
A src/ipa/libasn/SGP32-EuiccSigned1.h
M src/ipa/libipa/es10b_auth_serv.c
M src/ipa/libipa/es10b_auth_serv.h
10 files changed, 301 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/61/43061/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 83fcf91..0e210f0 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -771,8 +771,21 @@
-- Section 5.14.3
-- ASN1START
+SGP32-EuiccSigned1 ::= SEQUENCE {
+ transactionId [0] TransactionId,
+ serverAddress [3] UTF8String,
+ serverChallenge [4] Octet16,
+ euiccInfo2 [34] EUICCInfo2,
+ ctxParams1 CtxParams1 -- The RSP Server Challenge
+}
+SGP32-AuthenticateResponseOk ::= SEQUENCE {
+ euiccSigned1 SGP32-EuiccSigned1, -- Signed information
+ euiccSignature1 [APPLICATION 55] OCTET STRING, --EUICC_Sign1, tag 5F37
+ euiccCertificate Certificate, -- eUICC Certificate (CERT.EUICC.ECDSA) signed by the EUM
+ eumCertificate Certificate -- EUM Certificate (CERT.EUM.ECDSA) signed by the requested CI
+}
SGP32-AuthenticateServerResponse ::= [56] CHOICE { -- Tag 'BF38'
- authenticateResponseOk AuthenticateResponseOk,
+ authenticateResponseOk SGP32-AuthenticateResponseOk,
authenticateResponseError AuthenticateResponseError,
compactAuthenticateResponseOk CompactAuthenticateResponseOk
}
diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt
index 3ab0559..a767352 100644
--- a/src/ipa/libasn/CMakeLists.txt
+++ b/src/ipa/libasn/CMakeLists.txt
@@ -840,6 +840,8 @@
SetNicknameResponse.h
SGP32-AuthenticateClientRequest.c
SGP32-AuthenticateClientRequest.h
+SGP32-AuthenticateResponseOk.c
+SGP32-AuthenticateResponseOk.h
SGP32-AuthenticateServerResponse.c
SGP32-AuthenticateServerResponse.h
SGP32-CancelSessionOk.c
@@ -852,6 +854,8 @@
SGP32-EuiccMemoryResetRequest.h
SGP32-EuiccMemoryResetResponse.c
SGP32-EuiccMemoryResetResponse.h
+SGP32-EuiccSigned1.c
+SGP32-EuiccSigned1.h
SGP32-PendingNotification.c
SGP32-PendingNotification.h
SGP32-PrepareDownloadResponse.c
diff --git a/src/ipa/libasn/SGP32-AuthenticateResponseOk.c b/src/ipa/libasn/SGP32-AuthenticateResponseOk.c
new file mode 100644
index 0000000..abc2eeb
--- /dev/null
+++ b/src/ipa/libasn/SGP32-AuthenticateResponseOk.c
@@ -0,0 +1,80 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "SGP32-AuthenticateResponseOk.h"
+
+asn_TYPE_member_t asn_MBR_SGP32_AuthenticateResponseOk_1[] = {
+ { ATF_NOFLAGS, 0, offsetof(struct SGP32_AuthenticateResponseOk, euiccSigned1),
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+ 0,
+ &asn_DEF_SGP32_EuiccSigned1,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "euiccSigned1"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct SGP32_AuthenticateResponseOk, euiccSignature1),
+ (ASN_TAG_CLASS_APPLICATION | (55 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_OCTET_STRING,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "euiccSignature1"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct SGP32_AuthenticateResponseOk, euiccCertificate),
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+ 0,
+ &asn_DEF_Certificate,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "euiccCertificate"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct SGP32_AuthenticateResponseOk, eumCertificate),
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+ 0,
+ &asn_DEF_Certificate,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "eumCertificate"
+ },
+};
+static const ber_tlv_tag_t asn_DEF_SGP32_AuthenticateResponseOk_tags_1[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_SGP32_AuthenticateResponseOk_tag2el_1[] = {
+ { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 0, 0, 2 }, /* euiccSigned1 */
+ { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 2, -1, 1 }, /* euiccCertificate */
+ { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 3, -2, 0 }, /* eumCertificate */
+ { (ASN_TAG_CLASS_APPLICATION | (55 << 2)), 1, 0, 0 } /* euiccSignature1 */
+};
+asn_SEQUENCE_specifics_t asn_SPC_SGP32_AuthenticateResponseOk_specs_1 = {
+ sizeof(struct SGP32_AuthenticateResponseOk),
+ offsetof(struct SGP32_AuthenticateResponseOk, _asn_ctx),
+ asn_MAP_SGP32_AuthenticateResponseOk_tag2el_1,
+ 4, /* Count of tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
+ 4, /* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_SGP32_AuthenticateResponseOk = {
+ "SGP32-AuthenticateResponseOk",
+ "SGP32-AuthenticateResponseOk",
+ &asn_OP_SEQUENCE,
+ asn_DEF_SGP32_AuthenticateResponseOk_tags_1,
+ sizeof(asn_DEF_SGP32_AuthenticateResponseOk_tags_1)
+ /sizeof(asn_DEF_SGP32_AuthenticateResponseOk_tags_1[0]), /* 1 */
+ asn_DEF_SGP32_AuthenticateResponseOk_tags_1, /* Same as above */
+ sizeof(asn_DEF_SGP32_AuthenticateResponseOk_tags_1)
+ /sizeof(asn_DEF_SGP32_AuthenticateResponseOk_tags_1[0]), /* 1 */
+ { 0, 0, SEQUENCE_constraint },
+ asn_MBR_SGP32_AuthenticateResponseOk_1,
+ 4, /* Elements count */
+ &asn_SPC_SGP32_AuthenticateResponseOk_specs_1 /* Additional specs */
+};
+
diff --git a/src/ipa/libasn/SGP32-AuthenticateResponseOk.h b/src/ipa/libasn/SGP32-AuthenticateResponseOk.h
new file mode 100644
index 0000000..a8a4d41
--- /dev/null
+++ b/src/ipa/libasn/SGP32-AuthenticateResponseOk.h
@@ -0,0 +1,49 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _SGP32_AuthenticateResponseOk_H_
+#define _SGP32_AuthenticateResponseOk_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include "SGP32-EuiccSigned1.h"
+#include <OCTET_STRING.h>
+#include "Certificate.h"
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SGP32-AuthenticateResponseOk */
+typedef struct SGP32_AuthenticateResponseOk {
+ SGP32_EuiccSigned1_t euiccSigned1;
+ OCTET_STRING_t euiccSignature1;
+ Certificate_t euiccCertificate;
+ Certificate_t eumCertificate;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+} SGP32_AuthenticateResponseOk_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SGP32_AuthenticateResponseOk;
+extern asn_SEQUENCE_specifics_t asn_SPC_SGP32_AuthenticateResponseOk_specs_1;
+extern asn_TYPE_member_t asn_MBR_SGP32_AuthenticateResponseOk_1[4];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SGP32_AuthenticateResponseOk_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libasn/SGP32-AuthenticateServerResponse.c b/src/ipa/libasn/SGP32-AuthenticateServerResponse.c
index 2162c0c..0dccd91 100644
--- a/src/ipa/libasn/SGP32-AuthenticateServerResponse.c
+++ b/src/ipa/libasn/SGP32-AuthenticateServerResponse.c
@@ -19,7 +19,7 @@
{ ATF_NOFLAGS, 0, offsetof(struct SGP32_AuthenticateServerResponse, choice.authenticateResponseOk),
(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-1, /* IMPLICIT tag at current level */
- &asn_DEF_AuthenticateResponseOk,
+ &asn_DEF_SGP32_AuthenticateResponseOk,
0,
{ 0, 0, 0 },
0, 0, /* No default value */
diff --git a/src/ipa/libasn/SGP32-AuthenticateServerResponse.h b/src/ipa/libasn/SGP32-AuthenticateServerResponse.h
index 7fef589..ffd0ba3 100644
--- a/src/ipa/libasn/SGP32-AuthenticateServerResponse.h
+++ b/src/ipa/libasn/SGP32-AuthenticateServerResponse.h
@@ -12,7 +12,7 @@
#include <asn_application.h>
/* Including external dependencies */
-#include "AuthenticateResponseOk.h"
+#include "SGP32-AuthenticateResponseOk.h"
#include "AuthenticateResponseError.h"
#include "CompactAuthenticateResponseOk.h"
#include <constr_CHOICE.h>
@@ -35,7 +35,7 @@
typedef struct SGP32_AuthenticateServerResponse {
SGP32_AuthenticateServerResponse_PR present;
union SGP32_AuthenticateServerResponse_u {
- AuthenticateResponseOk_t authenticateResponseOk;
+ SGP32_AuthenticateResponseOk_t authenticateResponseOk;
AuthenticateResponseError_t authenticateResponseError;
CompactAuthenticateResponseOk_t compactAuthenticateResponseOk;
/*
diff --git a/src/ipa/libasn/SGP32-EuiccSigned1.c b/src/ipa/libasn/SGP32-EuiccSigned1.c
new file mode 100644
index 0000000..1f47d61
--- /dev/null
+++ b/src/ipa/libasn/SGP32-EuiccSigned1.c
@@ -0,0 +1,90 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "SGP32-EuiccSigned1.h"
+
+asn_TYPE_member_t asn_MBR_SGP32_EuiccSigned1_1[] = {
+ { ATF_NOFLAGS, 0, offsetof(struct SGP32_EuiccSigned1, transactionId),
+ (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_TransactionId,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "transactionId"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct SGP32_EuiccSigned1, serverAddress),
+ (ASN_TAG_CLASS_CONTEXT | (3 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_UTF8String,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "serverAddress"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct SGP32_EuiccSigned1, serverChallenge),
+ (ASN_TAG_CLASS_CONTEXT | (4 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_Octet16,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "serverChallenge"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct SGP32_EuiccSigned1, euiccInfo2),
+ (ASN_TAG_CLASS_CONTEXT | (34 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_EUICCInfo2,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "euiccInfo2"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct SGP32_EuiccSigned1, ctxParams1),
+ -1 /* Ambiguous tag (CHOICE?) */,
+ 0,
+ &asn_DEF_CtxParams1,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "ctxParams1"
+ },
+};
+static const ber_tlv_tag_t asn_DEF_SGP32_EuiccSigned1_tags_1[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_SGP32_EuiccSigned1_tag2el_1[] = {
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 1 }, /* transactionId */
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 4, -1, 0 }, /* ctxParamsForCommonAuthentication */
+ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 }, /* serverAddress */
+ { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 2, 0, 0 }, /* serverChallenge */
+ { (ASN_TAG_CLASS_CONTEXT | (34 << 2)), 3, 0, 0 } /* euiccInfo2 */
+};
+asn_SEQUENCE_specifics_t asn_SPC_SGP32_EuiccSigned1_specs_1 = {
+ sizeof(struct SGP32_EuiccSigned1),
+ offsetof(struct SGP32_EuiccSigned1, _asn_ctx),
+ asn_MAP_SGP32_EuiccSigned1_tag2el_1,
+ 5, /* Count of tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
+ 5, /* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_SGP32_EuiccSigned1 = {
+ "SGP32-EuiccSigned1",
+ "SGP32-EuiccSigned1",
+ &asn_OP_SEQUENCE,
+ asn_DEF_SGP32_EuiccSigned1_tags_1,
+ sizeof(asn_DEF_SGP32_EuiccSigned1_tags_1)
+ /sizeof(asn_DEF_SGP32_EuiccSigned1_tags_1[0]), /* 1 */
+ asn_DEF_SGP32_EuiccSigned1_tags_1, /* Same as above */
+ sizeof(asn_DEF_SGP32_EuiccSigned1_tags_1)
+ /sizeof(asn_DEF_SGP32_EuiccSigned1_tags_1[0]), /* 1 */
+ { 0, 0, SEQUENCE_constraint },
+ asn_MBR_SGP32_EuiccSigned1_1,
+ 5, /* Elements count */
+ &asn_SPC_SGP32_EuiccSigned1_specs_1 /* Additional specs */
+};
+
diff --git a/src/ipa/libasn/SGP32-EuiccSigned1.h b/src/ipa/libasn/SGP32-EuiccSigned1.h
new file mode 100644
index 0000000..0d8f7cb
--- /dev/null
+++ b/src/ipa/libasn/SGP32-EuiccSigned1.h
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _SGP32_EuiccSigned1_H_
+#define _SGP32_EuiccSigned1_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include "TransactionId.h"
+#include <UTF8String.h>
+#include "Octet16.h"
+#include "EUICCInfo2.h"
+#include "CtxParams1.h"
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* SGP32-EuiccSigned1 */
+typedef struct SGP32_EuiccSigned1 {
+ TransactionId_t transactionId;
+ UTF8String_t serverAddress;
+ Octet16_t serverChallenge;
+ EUICCInfo2_t euiccInfo2;
+ CtxParams1_t ctxParams1;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+} SGP32_EuiccSigned1_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_SGP32_EuiccSigned1;
+extern asn_SEQUENCE_specifics_t asn_SPC_SGP32_EuiccSigned1_specs_1;
+extern asn_TYPE_member_t asn_MBR_SGP32_EuiccSigned1_1[5];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _SGP32_EuiccSigned1_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libipa/es10b_auth_serv.c b/src/ipa/libipa/es10b_auth_serv.c
index a6d7c77..681f158 100644
--- a/src/ipa/libipa/es10b_auth_serv.c
+++ b/src/ipa/libipa/es10b_auth_serv.c
@@ -36,17 +36,17 @@
static int dec_auth_serv_res(struct ipa_es10b_auth_serv_res *res, const struct ipa_buf *es10b_res)
{
- struct AuthenticateServerResponse *asn = NULL;
+ struct SGP32_AuthenticateServerResponse *asn = NULL;
- asn = ipa_es10x_res_dec(&asn_DEF_AuthenticateServerResponse, es10b_res, "AuthenticateServer");
+ asn = ipa_es10x_res_dec(&asn_DEF_SGP32_AuthenticateServerResponse, es10b_res, "AuthenticateServer");
if (!asn)
return -EINVAL;
switch (asn->present) {
- case AuthenticateServerResponse_PR_authenticateResponseOk:
+ case SGP32_AuthenticateServerResponse_PR_authenticateResponseOk:
res->auth_serv_ok = &asn->choice.authenticateResponseOk;
break;
- case AuthenticateServerResponse_PR_authenticateResponseError:
+ case SGP32_AuthenticateServerResponse_PR_authenticateResponseError:
res->auth_serv_err = asn->choice.authenticateResponseError.authenticateErrorCode;
IPA_LOGP_ES10X("AuthenticateServer", LERROR, "function failed with error code %ld=%s!\n",
res->auth_serv_err, ipa_str_from_num(error_code_strings, res->auth_serv_err,
@@ -102,5 +102,5 @@
* \param[in] res pointer to function result. */
void ipa_es10b_auth_serv_res_free(struct ipa_es10b_auth_serv_res *res)
{
- IPA_ES10X_RES_FREE(asn_DEF_AuthenticateServerResponse, res);
+ IPA_ES10X_RES_FREE(asn_DEF_SGP32_AuthenticateServerResponse, res);
}
diff --git a/src/ipa/libipa/es10b_auth_serv.h b/src/ipa/libipa/es10b_auth_serv.h
index 9e8eef1..2f005e3 100644
--- a/src/ipa/libipa/es10b_auth_serv.h
+++ b/src/ipa/libipa/es10b_auth_serv.h
@@ -7,8 +7,8 @@
#pragma once
#include <AuthenticateServerRequest.h>
-#include <AuthenticateServerResponse.h>
-#include <AuthenticateResponseOk.h>
+#include <SGP32-AuthenticateServerResponse.h>
+#include <SGP32-AuthenticateResponseOk.h>
struct ipa_context;
/* GSMA SGP.22, section 5.7.13 */
@@ -17,8 +17,8 @@
};
struct ipa_es10b_auth_serv_res {
- struct AuthenticateServerResponse *res;
- struct AuthenticateResponseOk *auth_serv_ok;
+ struct SGP32_AuthenticateServerResponse *res;
+ struct SGP32_AuthenticateResponseOk *auth_serv_ok;
long auth_serv_err;
};
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43061?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I501247132de30618a2b1ace44c7c3772ab42eb09
Gerrit-Change-Number: 43061
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
[S] Change in onomondo-ipa[master]: V1.2: Add function to set Device Capabilities
by jolly 16 Jul '26
by jolly 16 Jul '26
16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43060?usp=email )
Change subject: V1.2: Add function to set Device Capabilities
......................................................................
V1.2: Add function to set Device Capabilities
Add new library function to set the SGP.22 Device Capabilities. Also
add an option to the command line interface to call the library
function.
The IoT device (modem) may and the IPA must set Device Capabilities.
They cannot be set independently. The IoT device would overwrite what
IPA has set and vice versa. Therefore add a library function for the
IoT device that takes care about setting the required capabilities for
IPA.
Reference: SGP.22 Section 3.4.2
Related: SYS#8101
Change-Id: I866787b8cda9a87a9f2e0db4965fbb554d339a6c
---
M include/onomondo/ipa/ipad.h
M src/ipa/libipa/euicc.c
M src/ipa/main.c
3 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/60/43060/1
diff --git a/include/onomondo/ipa/ipad.h b/include/onomondo/ipa/ipad.h
index ff3bd68..d5d4b58 100644
--- a/include/onomondo/ipa/ipad.h
+++ b/include/onomondo/ipa/ipad.h
@@ -86,6 +86,12 @@
* function here to handle the consent request. In case no callback function is provided onomondo-eim will
* automatically consent to any profile installation. */
ipa_prfle_inst_consent_cb prfle_inst_consent_cb;
+
+ /*! Set the Device Capabilites.
+ * As IPAd need to set the device capabilities, it overwrites any other capabilities that might have set by
+ * the modem or IoT device. The upper 5 bits can be set according to section 3.4.2 of SGG.22. The lower 3
+ * bit are set automatically by this IPAd. */
+ uint8_t device_capabilities;
};
struct ipa_context *ipa_new_ctx(struct ipa_config *cfg, struct ipa_buf *nvstate);
diff --git a/src/ipa/libipa/euicc.c b/src/ipa/libipa/euicc.c
index efda3c7..ac03d0f 100644
--- a/src/ipa/libipa/euicc.c
+++ b/src/ipa/libipa/euicc.c
@@ -532,11 +532,12 @@
* \returns 0 on success, negative on error. */
int ipa_euicc_init_es10x(struct ipa_context *ctx)
{
- const uint8_t termcap_euicc[] = { 0xA9, 0x03, 0x83, 0x01, 0x07 };
+ uint8_t termcap_euicc[] = { 0xA9, 0x03, 0x83, 0x01, 0x07 };
const uint8_t termcap_iot[] = { 0xA9, 0x03, 0x84, 0x01, 0x01 };
int rc;
/* Set capabilites to enable support for eUICC functions. */
+ termcap_euicc[4] |= ctx->cfg->device_capabilities;
rc = send_termcap(ctx, termcap_euicc, sizeof(termcap_euicc));
if (rc < 0)
return rc;
diff --git a/src/ipa/main.c b/src/ipa/main.c
index 3e7b7a7..840aaba 100644
--- a/src/ipa/main.c
+++ b/src/ipa/main.c
@@ -64,6 +64,7 @@
printf(" -I ......................... disable SSL certificate verification (insecure)\n");
printf(" -E ......................... emulate IoT eUICC (compatibility mode to use consumer eUICCs)\n");
printf(" -1 ......................... force the IPAd to process only one eUICC package (debug, use with caution)\n");
+ printf(" -D ......................... set SGP.22 device capabilites other than the 3 that are required by this IPAd\n");
}
struct ipa_buf *load_ber_from_file(char *dir, char *file)
@@ -260,6 +261,9 @@
case '1':
getopt_one_euicc_pkg_only = true;
break;
+ case 'D':
+ cfg.device_capabilities = atoi(optarg);
+ break;
default:
printf("unhandled option: %c!\n", opt);
break;
@@ -280,6 +284,7 @@
printf(" iot_euicc_emu_enabled = %u\n", cfg.iot_euicc_emu_enabled);
printf(" esipa_req_retries = %u\n", cfg.esipa_req_retries);
printf(" refresh_flag = %u\n", cfg.refresh_flag);
+ printf(" device_capabilities = %u\n", cfg.device_capabilities);
printf("\n");
if (cfg.eim_cabundle) {
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43060?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I866787b8cda9a87a9f2e0db4965fbb554d339a6c
Gerrit-Change-Number: 43060
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
[S] Change in onomondo-ipa[master]: V1.2: Add new causes to initiateAuthenticationErrorEsipa
by jolly 16 Jul '26
by jolly 16 Jul '26
16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43059?usp=email )
Change subject: V1.2: Add new causes to initiateAuthenticationErrorEsipa
......................................................................
V1.2: Add new causes to initiateAuthenticationErrorEsipa
Reference: SGP.32 Section 6.3.2.1
Related: SYS#8101
Change-Id: I0a9acaba7b706f68bc89bae3dff7d2d0e380e797
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/InitiateAuthenticationResponseEsipa.h
M src/ipa/libipa/esipa_init_auth.c
3 files changed, 13 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/59/43059/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 0f6b892..83fcf91 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -876,12 +876,14 @@
InitiateAuthenticationResponseEsipa ::= [57] CHOICE { -- Tag 'BF39'
initiateAuthenticationOkEsipa InitiateAuthenticationOkEsipa,
initiateAuthenticationErrorEsipa INTEGER {
- invalidDpAddress(1),
- euiccVersionNotSupportedByDp(2),
- ciPKIdNotSupported(3),
- smdpAddressMismatch(50),
- smdpOidMismatch(51)
-}
+ invalidDpAddress(1),
+ euiccVersionNotSupportedByDp(2),
+ ciPKIdNotSupported(3),
+ smdpAddressMismatch(50),
+ smdpOidMismatch(51),
+ invalidEimTransactionId(52),
+ undefinedError(127)
+ }
}
InitiateAuthenticationOkEsipa ::= SEQUENCE {
transactionId [0] TransactionId OPTIONAL, -- The TransactionID generated by the SM-DP+
diff --git a/src/ipa/libasn/InitiateAuthenticationResponseEsipa.h b/src/ipa/libasn/InitiateAuthenticationResponseEsipa.h
index 2e56766..c3da3ef 100644
--- a/src/ipa/libasn/InitiateAuthenticationResponseEsipa.h
+++ b/src/ipa/libasn/InitiateAuthenticationResponseEsipa.h
@@ -33,7 +33,9 @@
InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_euiccVersionNotSupportedByDp = 2,
InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_ciPKIdNotSupported = 3,
InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_smdpAddressMismatch = 50,
- InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_smdpOidMismatch = 51
+ InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_smdpOidMismatch = 51,
+ InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_invalidEimTransactionId = 52,
+ InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_undefinedError = 127
} e_InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa;
/* InitiateAuthenticationResponseEsipa */
diff --git a/src/ipa/libipa/esipa_init_auth.c b/src/ipa/libipa/esipa_init_auth.c
index 2e8532c..2ce2d2f 100644
--- a/src/ipa/libipa/esipa_init_auth.c
+++ b/src/ipa/libipa/esipa_init_auth.c
@@ -32,6 +32,8 @@
{ InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_smdpAddressMismatch,
"smdpAddressMismatch" },
{ InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_smdpOidMismatch, "smdpOidMismatch" },
+ { InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_invalidEimTransactionId, "invalidEimTransactionId" },
+ { InitiateAuthenticationResponseEsipa__initiateAuthenticationErrorEsipa_undefinedError, "undefinedError" },
{ 0, NULL }
};
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43059?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I0a9acaba7b706f68bc89bae3dff7d2d0e380e797
Gerrit-Change-Number: 43059
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
[S] Change in onomondo-ipa[master]: V1.2: Change field name in InitiateAuthenticationOkEsipa
by jolly 16 Jul '26
by jolly 16 Jul '26
16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43058?usp=email )
Change subject: V1.2: Change field name in InitiateAuthenticationOkEsipa
......................................................................
V1.2: Change field name in InitiateAuthenticationOkEsipa
Change the fiel name euiccCiPKIdToBeUsed in
InitiateAuthenticationOkEsipa to euiccCiPKIdentifierToBeUsed.
Reference: SGP.32 Section 6.3.2.1
Related: SYS#8101
Change-Id: I68d59b44bd8b5dd23ae070d42dab9727c0da5272
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/InitiateAuthenticationOkEsipa.c
M src/ipa/libasn/InitiateAuthenticationOkEsipa.h
M src/ipa/libipa/proc_cmn_mtl_auth.c
4 files changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/58/43058/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 3bc2398..0f6b892 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -887,7 +887,7 @@
transactionId [0] TransactionId OPTIONAL, -- The TransactionID generated by the SM-DP+
serverSigned1 ServerSigned1, -- Signed information
serverSignature1 [APPLICATION 55] OCTET STRING, -- Server Sign1, Tag '5F37'
- euiccCiPKIdToBeUsed OCTET STRING, -- Key identifier (possibly truncated) of the CI Public Key to be used as required by ES10b.AuthenticateServer
+ euiccCiPKIdentifierToBeUsed OCTET STRING, -- Key identifier (possibly truncated) of the CI Public Key to be used as required by ES10b.AuthenticateServer
serverCertificate Certificate,
matchingId UTF8String OPTIONAL,
ctxParams1 [2] CtxParams1 OPTIONAL
diff --git a/src/ipa/libasn/InitiateAuthenticationOkEsipa.c b/src/ipa/libasn/InitiateAuthenticationOkEsipa.c
index 0a208dd..3f2a065 100644
--- a/src/ipa/libasn/InitiateAuthenticationOkEsipa.c
+++ b/src/ipa/libasn/InitiateAuthenticationOkEsipa.c
@@ -35,14 +35,14 @@
0, 0, /* No default value */
"serverSignature1"
},
- { ATF_NOFLAGS, 0, offsetof(struct InitiateAuthenticationOkEsipa, euiccCiPKIdToBeUsed),
+ { ATF_NOFLAGS, 0, offsetof(struct InitiateAuthenticationOkEsipa, euiccCiPKIdentifierToBeUsed),
(ASN_TAG_CLASS_UNIVERSAL | (4 << 2)),
0,
&asn_DEF_OCTET_STRING,
0,
{ 0, 0, 0 },
0, 0, /* No default value */
- "euiccCiPKIdToBeUsed"
+ "euiccCiPKIdentifierToBeUsed"
},
{ ATF_NOFLAGS, 0, offsetof(struct InitiateAuthenticationOkEsipa, serverCertificate),
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
@@ -77,7 +77,7 @@
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
static const asn_TYPE_tag2member_t asn_MAP_InitiateAuthenticationOkEsipa_tag2el_1[] = {
- { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 3, 0, 0 }, /* euiccCiPKIdToBeUsed */
+ { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 3, 0, 0 }, /* euiccCiPKIdentifierToBeUsed */
{ (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 5, 0, 0 }, /* matchingId */
{ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 1 }, /* serverSigned1 */
{ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 4, -1, 0 }, /* serverCertificate */
diff --git a/src/ipa/libasn/InitiateAuthenticationOkEsipa.h b/src/ipa/libasn/InitiateAuthenticationOkEsipa.h
index 90af2bf..7880a03 100644
--- a/src/ipa/libasn/InitiateAuthenticationOkEsipa.h
+++ b/src/ipa/libasn/InitiateAuthenticationOkEsipa.h
@@ -31,7 +31,7 @@
TransactionId_t *transactionId /* OPTIONAL */;
ServerSigned1_t serverSigned1;
OCTET_STRING_t serverSignature1;
- OCTET_STRING_t euiccCiPKIdToBeUsed;
+ OCTET_STRING_t euiccCiPKIdentifierToBeUsed;
Certificate_t serverCertificate;
UTF8String_t *matchingId /* OPTIONAL */;
struct CtxParams1 *ctxParams1 /* OPTIONAL */;
diff --git a/src/ipa/libipa/proc_cmn_mtl_auth.c b/src/ipa/libipa/proc_cmn_mtl_auth.c
index a8670ae..53ad401 100644
--- a/src/ipa/libipa/proc_cmn_mtl_auth.c
+++ b/src/ipa/libipa/proc_cmn_mtl_auth.c
@@ -205,7 +205,7 @@
auth_serv_req.req.serverSignature1.size =
ipa_strip_tlv_envelope(auth_serv_req.req.serverSignature1.buf, auth_serv_req.req.serverSignature1.size,
0x5f37);
- auth_serv_req.req.euiccCiPKIdToBeUsed = init_auth_res->init_auth_ok->euiccCiPKIdToBeUsed;
+ auth_serv_req.req.euiccCiPKIdToBeUsed = init_auth_res->init_auth_ok->euiccCiPKIdentifierToBeUsed;
auth_serv_req.req.euiccCiPKIdToBeUsed.size =
ipa_strip_tlv_envelope(auth_serv_req.req.euiccCiPKIdToBeUsed.buf,
auth_serv_req.req.euiccCiPKIdToBeUsed.size, 0x04);
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43058?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I68d59b44bd8b5dd23ae070d42dab9727c0da5272
Gerrit-Change-Number: 43058
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
[M] Change in onomondo-ipa[master]: V1.2: Add StateChangeCause to GetEimPackageRequest
by jolly 16 Jul '26
by jolly 16 Jul '26
16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43057?usp=email )
Change subject: V1.2: Add StateChangeCause to GetEimPackageRequest
......................................................................
V1.2: Add StateChangeCause to GetEimPackageRequest
State change notification is optional and currently not supported by
IPA.
Reference: SGP.32 Section 6.3.2.6
Related: SYS#8101
Change-Id: I1ae561f6709a9eb490fa7a53420c332ff20bd058
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/CMakeLists.txt
M src/ipa/libasn/GetEimPackageRequest.c
M src/ipa/libasn/GetEimPackageRequest.h
A src/ipa/libasn/StateChangeCause.c
A src/ipa/libasn/StateChangeCause.h
6 files changed, 124 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/57/43057/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index b99168b..3bc2398 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -989,10 +989,21 @@
-- Section 6.3.2.6
-- ASN1START
+StateChangeCause ::= INTEGER {
+ otherEim(0), -- for change(s) requested by another registered eIM
+ fallback(1), -- for change(s) following fallback requested by IPA
+ emergencyProfile(2), -- for change(s) following Emergency Profile swap requested by IPA
+ local(3), -- for change(s) applied locally (RFU, not supported in this version)
+ reset(4), -- for change(s) following an euicc reset
+ immediateEnableProfile(5), -- for change(s) following immediate Profile enabling requested by IPA
+ deviceChange(6), -- for change(s) detected by IPAe following a IoT Device change (removable eSIMs)
+ undefined(127) -- unknown cause
+}
GetEimPackageRequest ::= [79] SEQUENCE { -- Tag 'BF4F'
eidValue [APPLICATION 26] Octet16, -- Tag '5A'
notifyStateChange [0] NULL OPTIONAL, -- Notification to the eIM that it should update its information about the eUICC (e.g. list of profiles, profile states...)
- rPLMN [1] OCTET STRING (SIZE(3)) OPTIONAL -- MCC and MNC of the last registered PLMN, coded as defined in 3GPP TS 24.008 [22]
+ stateChangeCause [1] StateChangeCause OPTIONAL, -- Provide the cause of the notified state change(s)
+ rPLMN [2] OCTET STRING (SIZE(3)) OPTIONAL -- MCC and MNC of the last registered PLMN, coded as defined in 3GPP TS 24.008 [22]
}
GetEimPackageResponse ::= [79] CHOICE { -- Tag 'BF4F'
euiccPackageRequest [81] EuiccPackageRequest, -- Tag 'BF51'
diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt
index 3d5d649..3ab0559 100644
--- a/src/ipa/libasn/CMakeLists.txt
+++ b/src/ipa/libasn/CMakeLists.txt
@@ -880,6 +880,8 @@
SkipCerts.h
SmdpSigned2.c
SmdpSigned2.h
+StateChangeCause.c
+StateChangeCause.h
StoreMetadataRequest.c
StoreMetadataRequest.h
StreetAddress.c
diff --git a/src/ipa/libasn/GetEimPackageRequest.c b/src/ipa/libasn/GetEimPackageRequest.c
index 1d58a9d..8528351 100644
--- a/src/ipa/libasn/GetEimPackageRequest.c
+++ b/src/ipa/libasn/GetEimPackageRequest.c
@@ -33,10 +33,10 @@
}
}
-static asn_oer_constraints_t asn_OER_memb_rPLMN_constr_4 CC_NOTUSED = {
+static asn_oer_constraints_t asn_OER_memb_rPLMN_constr_5 CC_NOTUSED = {
{ 0, 0 },
3 /* (SIZE(3..3)) */};
-static asn_per_constraints_t asn_PER_memb_rPLMN_constr_4 CC_NOTUSED = {
+static asn_per_constraints_t asn_PER_memb_rPLMN_constr_5 CC_NOTUSED = {
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
{ APC_CONSTRAINED, 0, 0, 3, 3 } /* (SIZE(3..3)) */,
0, 0 /* No PER value map */
@@ -51,7 +51,7 @@
0, 0, /* No default value */
"eidValue"
},
- { ATF_POINTER, 2, offsetof(struct GetEimPackageRequest, notifyStateChange),
+ { ATF_POINTER, 3, offsetof(struct GetEimPackageRequest, notifyStateChange),
(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
-1, /* IMPLICIT tag at current level */
&asn_DEF_NULL,
@@ -60,17 +60,26 @@
0, 0, /* No default value */
"notifyStateChange"
},
- { ATF_POINTER, 1, offsetof(struct GetEimPackageRequest, rPLMN),
+ { ATF_POINTER, 2, offsetof(struct GetEimPackageRequest, stateChangeCause),
(ASN_TAG_CLASS_CONTEXT | (1 << 2)),
-1, /* IMPLICIT tag at current level */
+ &asn_DEF_StateChangeCause,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "stateChangeCause"
+ },
+ { ATF_POINTER, 1, offsetof(struct GetEimPackageRequest, rPLMN),
+ (ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+ -1, /* IMPLICIT tag at current level */
&asn_DEF_OCTET_STRING,
0,
- { &asn_OER_memb_rPLMN_constr_4, &asn_PER_memb_rPLMN_constr_4, memb_rPLMN_constraint_1 },
+ { &asn_OER_memb_rPLMN_constr_5, &asn_PER_memb_rPLMN_constr_5, memb_rPLMN_constraint_1 },
0, 0, /* No default value */
"rPLMN"
},
};
-static const int asn_MAP_GetEimPackageRequest_oms_1[] = { 1, 2 };
+static const int asn_MAP_GetEimPackageRequest_oms_1[] = { 1, 2, 3 };
static const ber_tlv_tag_t asn_DEF_GetEimPackageRequest_tags_1[] = {
(ASN_TAG_CLASS_CONTEXT | (79 << 2)),
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
@@ -78,16 +87,17 @@
static const asn_TYPE_tag2member_t asn_MAP_GetEimPackageRequest_tag2el_1[] = {
{ (ASN_TAG_CLASS_APPLICATION | (26 << 2)), 0, 0, 0 }, /* eidValue */
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* notifyStateChange */
- { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /* rPLMN */
+ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 }, /* stateChangeCause */
+ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 3, 0, 0 } /* rPLMN */
};
asn_SEQUENCE_specifics_t asn_SPC_GetEimPackageRequest_specs_1 = {
sizeof(struct GetEimPackageRequest),
offsetof(struct GetEimPackageRequest, _asn_ctx),
asn_MAP_GetEimPackageRequest_tag2el_1,
- 3, /* Count of tags in the map */
+ 4, /* Count of tags in the map */
asn_MAP_GetEimPackageRequest_oms_1, /* Optional members */
- 2, 0, /* Root/Additions */
- 3, /* First extension addition */
+ 3, 0, /* Root/Additions */
+ 4, /* First extension addition */
};
asn_TYPE_descriptor_t asn_DEF_GetEimPackageRequest = {
"GetEimPackageRequest",
@@ -101,7 +111,7 @@
/sizeof(asn_DEF_GetEimPackageRequest_tags_1[0]), /* 2 */
{ 0, 0, SEQUENCE_constraint },
asn_MBR_GetEimPackageRequest_1,
- 3, /* Elements count */
+ 4, /* Elements count */
&asn_SPC_GetEimPackageRequest_specs_1 /* Additional specs */
};
diff --git a/src/ipa/libasn/GetEimPackageRequest.h b/src/ipa/libasn/GetEimPackageRequest.h
index 3075bd9..994c28f 100644
--- a/src/ipa/libasn/GetEimPackageRequest.h
+++ b/src/ipa/libasn/GetEimPackageRequest.h
@@ -14,6 +14,7 @@
/* Including external dependencies */
#include "Octet16.h"
#include <NULL.h>
+#include "StateChangeCause.h"
#include <OCTET_STRING.h>
#include <constr_SEQUENCE.h>
@@ -25,6 +26,7 @@
typedef struct GetEimPackageRequest {
Octet16_t eidValue;
NULL_t *notifyStateChange /* OPTIONAL */;
+ StateChangeCause_t *stateChangeCause /* OPTIONAL */;
OCTET_STRING_t *rPLMN /* OPTIONAL */;
/*
* This type is extensible,
@@ -38,7 +40,7 @@
/* Implementation */
extern asn_TYPE_descriptor_t asn_DEF_GetEimPackageRequest;
extern asn_SEQUENCE_specifics_t asn_SPC_GetEimPackageRequest_specs_1;
-extern asn_TYPE_member_t asn_MBR_GetEimPackageRequest_1[3];
+extern asn_TYPE_member_t asn_MBR_GetEimPackageRequest_1[4];
#ifdef __cplusplus
}
diff --git a/src/ipa/libasn/StateChangeCause.c b/src/ipa/libasn/StateChangeCause.c
new file mode 100644
index 0000000..64e6e29
--- /dev/null
+++ b/src/ipa/libasn/StateChangeCause.c
@@ -0,0 +1,31 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "StateChangeCause.h"
+
+/*
+ * This type is implemented using NativeInteger,
+ * so here we adjust the DEF accordingly.
+ */
+static const ber_tlv_tag_t asn_DEF_StateChangeCause_tags_1[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_StateChangeCause = {
+ "StateChangeCause",
+ "StateChangeCause",
+ &asn_OP_NativeInteger,
+ asn_DEF_StateChangeCause_tags_1,
+ sizeof(asn_DEF_StateChangeCause_tags_1)
+ /sizeof(asn_DEF_StateChangeCause_tags_1[0]), /* 1 */
+ asn_DEF_StateChangeCause_tags_1, /* Same as above */
+ sizeof(asn_DEF_StateChangeCause_tags_1)
+ /sizeof(asn_DEF_StateChangeCause_tags_1[0]), /* 1 */
+ { 0, 0, NativeInteger_constraint },
+ 0, 0, /* Defined elsewhere */
+ 0 /* No specifics */
+};
+
diff --git a/src/ipa/libasn/StateChangeCause.h b/src/ipa/libasn/StateChangeCause.h
new file mode 100644
index 0000000..db0e315
--- /dev/null
+++ b/src/ipa/libasn/StateChangeCause.h
@@ -0,0 +1,55 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _StateChangeCause_H_
+#define _StateChangeCause_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeInteger.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum StateChangeCause {
+ StateChangeCause_otherEim = 0,
+ StateChangeCause_fallback = 1,
+ StateChangeCause_emergencyProfile = 2,
+ StateChangeCause_local = 3,
+ StateChangeCause_reset = 4,
+ StateChangeCause_immediateEnableProfile = 5,
+ StateChangeCause_deviceChange = 6,
+ StateChangeCause_undefined = 127
+} e_StateChangeCause;
+
+/* StateChangeCause */
+typedef long StateChangeCause_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_StateChangeCause;
+asn_struct_free_f StateChangeCause_free;
+asn_struct_print_f StateChangeCause_print;
+asn_constr_check_f StateChangeCause_constraint;
+ber_type_decoder_f StateChangeCause_decode_ber;
+der_type_encoder_f StateChangeCause_encode_der;
+xer_type_decoder_f StateChangeCause_decode_xer;
+xer_type_encoder_f StateChangeCause_encode_xer;
+oer_type_decoder_f StateChangeCause_decode_oer;
+oer_type_encoder_f StateChangeCause_encode_oer;
+per_type_decoder_f StateChangeCause_decode_uper;
+per_type_encoder_f StateChangeCause_encode_uper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _StateChangeCause_H_ */
+#include <asn_internal.h>
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43057?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I1ae561f6709a9eb490fa7a53420c332ff20bd058
Gerrit-Change-Number: 43057
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
[L] Change in onomondo-ipa[master]: V1.2: Change fields in ProvideEimPackage(Result)
by jolly 16 Jul '26
by jolly 16 Jul '26
16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43055?usp=email )
Change subject: V1.2: Change fields in ProvideEimPackage(Result)
......................................................................
V1.2: Change fields in ProvideEimPackage(Result)
Change parameters in ProvideEimPackage and ProvideEimPackageResult. The
structure is changed in IPA too. The new field eimTransactionId of
EimPackageResultResponseError is filled with the eimTransactionId of
IpaEuiccDataRequest, if exists.
Reference: SGP.32 Section 5.14.6
Related: SYS#8101
Change-Id: I24baab4f9351aec27c58403b94974cba4b274c34
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/CMakeLists.txt
A src/ipa/libasn/EimPackageResult.c
A src/ipa/libasn/EimPackageResult.h
A src/ipa/libasn/EimPackageResultErrorCode.c
A src/ipa/libasn/EimPackageResultErrorCode.h
A src/ipa/libasn/EimPackageResultResponseError.c
A src/ipa/libasn/EimPackageResultResponseError.h
M src/ipa/libasn/ProvideEimPackageResult.c
M src/ipa/libasn/ProvideEimPackageResult.h
M src/ipa/libasn/ProvideEimPackageResultResponse.c
M src/ipa/libasn/ProvideEimPackageResultResponse.h
M src/ipa/libipa/esipa_prvde_eim_pkg_rslt.c
M src/ipa/libipa/esipa_prvde_eim_pkg_rslt.h
M src/ipa/libipa/proc_euicc_data_req.c
M src/ipa/libipa/proc_euicc_pkg_dwnld_exec.c
16 files changed, 625 insertions(+), 220 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/55/43055/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 1f0edb7..14ee3cb 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -1006,23 +1006,39 @@
-- Section 6.3.2.7
-- ASN1START
-ProvideEimPackageResult ::= [80] CHOICE { -- Tag 'BF50'
+EimPackageResultErrorCode ::= INTEGER {
+ invalidPackageFormat(1),
+ unknownPackage(2),
+ undefinedError(127)
+}
+EimPackageResultResponseError ::= SEQUENCE {
+ eimTransactionId [0] TransactionId OPTIONAL,
+ eimPackageResultErrorCode EimPackageResultErrorCode
+}
+EimPackageResult ::= CHOICE {
euiccPackageResult [81] EuiccPackageResult, -- Tag 'BF51'
ePRAndNotifications SEQUENCE {
euiccPackageResult [81] EuiccPackageResult, -- Tag 'BF51'
- notificationList [43] SGP32-RetrieveNotificationsListResponse -- Tag 'BF2B'
+ notificationList [0] PendingNotificationList -- Tag 'A0'
},
ipaEuiccDataResponse [82] IpaEuiccDataResponse, -- Tag 'BF52'
profileDownloadTriggerResult [84] ProfileDownloadTriggerResult, -- Tag 'BF54'
- eimPackageError INTEGER {
- invalidPackageFormat(1),
- unknownPackage(2),
+ eimPackageResultResponseError [0] EimPackageResultResponseError
+}
+ProvideEimPackageResult ::= [80] SEQUENCE { -- Tag 'BF50'
+ eidValue [APPLICATION 26] Octet16 OPTIONAL, -- Tag '5A'
+ eimPackageResult EimPackageResult
+}
+ProvideEimPackageResultResponse ::= [80] CHOICE { -- Tag 'BF50'
+ eimAcknowledgements [83] EimAcknowledgements, -- Tag 'BF53'
+ emptyResponse SEQUENCE {}, -- because EimAcknowledgements was OPTIONAL
+ provideEimPackageResultError INTEGER {
+ eidNotFound(2),
+ invalidEid(3),
+ missingEid(4),
undefinedError(127)
}
}
-ProvideEimPackageResultResponse ::= [80] SEQUENCE { -- Tag 'BF50'
- eimAcknowledgements [83] EimAcknowledgements OPTIONAL -- Tag 'BF53'
-}
-- ASN1STOP
-- Section 6.3.3.1
diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt
index b1f9d8a..3d5d649 100644
--- a/src/ipa/libasn/CMakeLists.txt
+++ b/src/ipa/libasn/CMakeLists.txt
@@ -287,6 +287,12 @@
EimIdInfo.h
EimIdType.c
EimIdType.h
+EimPackageResult.c
+EimPackageResultErrorCode.c
+EimPackageResultErrorCode.h
+EimPackageResult.h
+EimPackageResultResponseError.c
+EimPackageResultResponseError.h
EimSupportedProtocol.c
EimSupportedProtocol.h
EmailAddress.c
diff --git a/src/ipa/libasn/EimPackageResult.c b/src/ipa/libasn/EimPackageResult.c
new file mode 100644
index 0000000..8963e6a
--- /dev/null
+++ b/src/ipa/libasn/EimPackageResult.c
@@ -0,0 +1,150 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "EimPackageResult.h"
+
+static asn_oer_constraints_t asn_OER_type_EimPackageResult_constr_1 CC_NOTUSED = {
+ { 0, 0 },
+ -1};
+asn_per_constraints_t asn_PER_type_EimPackageResult_constr_1 CC_NOTUSED = {
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 4 } /* (0..4,...) */,
+ { APC_UNCONSTRAINED, -1, -1, 0, 0 },
+ 0, 0 /* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_ePRAndNotifications_3[] = {
+ { ATF_NOFLAGS, 0, offsetof(struct EimPackageResult__ePRAndNotifications, euiccPackageResult),
+ (ASN_TAG_CLASS_CONTEXT | (81 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_EuiccPackageResult,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "euiccPackageResult"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct EimPackageResult__ePRAndNotifications, notificationList),
+ (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_PendingNotificationList,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "notificationList"
+ },
+};
+static const ber_tlv_tag_t asn_DEF_ePRAndNotifications_tags_3[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_ePRAndNotifications_tag2el_3[] = {
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* notificationList */
+ { (ASN_TAG_CLASS_CONTEXT | (81 << 2)), 0, 0, 0 } /* euiccPackageResult */
+};
+static asn_SEQUENCE_specifics_t asn_SPC_ePRAndNotifications_specs_3 = {
+ sizeof(struct EimPackageResult__ePRAndNotifications),
+ offsetof(struct EimPackageResult__ePRAndNotifications, _asn_ctx),
+ asn_MAP_ePRAndNotifications_tag2el_3,
+ 2, /* Count of tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
+ 2, /* First extension addition */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_ePRAndNotifications_3 = {
+ "ePRAndNotifications",
+ "ePRAndNotifications",
+ &asn_OP_SEQUENCE,
+ asn_DEF_ePRAndNotifications_tags_3,
+ sizeof(asn_DEF_ePRAndNotifications_tags_3)
+ /sizeof(asn_DEF_ePRAndNotifications_tags_3[0]), /* 1 */
+ asn_DEF_ePRAndNotifications_tags_3, /* Same as above */
+ sizeof(asn_DEF_ePRAndNotifications_tags_3)
+ /sizeof(asn_DEF_ePRAndNotifications_tags_3[0]), /* 1 */
+ { 0, 0, SEQUENCE_constraint },
+ asn_MBR_ePRAndNotifications_3,
+ 2, /* Elements count */
+ &asn_SPC_ePRAndNotifications_specs_3 /* Additional specs */
+};
+
+asn_TYPE_member_t asn_MBR_EimPackageResult_1[] = {
+ { ATF_NOFLAGS, 0, offsetof(struct EimPackageResult, choice.euiccPackageResult),
+ (ASN_TAG_CLASS_CONTEXT | (81 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_EuiccPackageResult,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "euiccPackageResult"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct EimPackageResult, choice.ePRAndNotifications),
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+ 0,
+ &asn_DEF_ePRAndNotifications_3,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "ePRAndNotifications"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct EimPackageResult, choice.ipaEuiccDataResponse),
+ (ASN_TAG_CLASS_CONTEXT | (82 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_IpaEuiccDataResponse,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "ipaEuiccDataResponse"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct EimPackageResult, choice.profileDownloadTriggerResult),
+ (ASN_TAG_CLASS_CONTEXT | (84 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_ProfileDownloadTriggerResult,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "profileDownloadTriggerResult"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct EimPackageResult, choice.eimPackageResultResponseError),
+ (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_EimPackageResultResponseError,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "eimPackageResultResponseError"
+ },
+};
+static const unsigned asn_MAP_EimPackageResult_to_canonical_1[] = { 1, 4, 0, 2, 3 };
+static const unsigned asn_MAP_EimPackageResult_from_canonical_1[] = { 2, 0, 3, 4, 1 };
+static const asn_TYPE_tag2member_t asn_MAP_EimPackageResult_tag2el_1[] = {
+ { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 }, /* ePRAndNotifications */
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 4, 0, 0 }, /* eimPackageResultResponseError */
+ { (ASN_TAG_CLASS_CONTEXT | (81 << 2)), 0, 0, 0 }, /* euiccPackageResult */
+ { (ASN_TAG_CLASS_CONTEXT | (82 << 2)), 2, 0, 0 }, /* ipaEuiccDataResponse */
+ { (ASN_TAG_CLASS_CONTEXT | (84 << 2)), 3, 0, 0 } /* profileDownloadTriggerResult */
+};
+asn_CHOICE_specifics_t asn_SPC_EimPackageResult_specs_1 = {
+ sizeof(struct EimPackageResult),
+ offsetof(struct EimPackageResult, _asn_ctx),
+ offsetof(struct EimPackageResult, present),
+ sizeof(((struct EimPackageResult *)0)->present),
+ asn_MAP_EimPackageResult_tag2el_1,
+ 5, /* Count of tags in the map */
+ asn_MAP_EimPackageResult_to_canonical_1,
+ asn_MAP_EimPackageResult_from_canonical_1,
+ 5 /* Extensions start */
+};
+asn_TYPE_descriptor_t asn_DEF_EimPackageResult = {
+ "EimPackageResult",
+ "EimPackageResult",
+ &asn_OP_CHOICE,
+ 0, /* No effective tags (pointer) */
+ 0, /* No effective tags (count) */
+ 0, /* No tags (pointer) */
+ 0, /* No tags (count) */
+ { &asn_OER_type_EimPackageResult_constr_1, &asn_PER_type_EimPackageResult_constr_1, CHOICE_constraint },
+ asn_MBR_EimPackageResult_1,
+ 5, /* Elements count */
+ &asn_SPC_EimPackageResult_specs_1 /* Additional specs */
+};
+
diff --git a/src/ipa/libasn/EimPackageResult.h b/src/ipa/libasn/EimPackageResult.h
new file mode 100644
index 0000000..5ece031
--- /dev/null
+++ b/src/ipa/libasn/EimPackageResult.h
@@ -0,0 +1,79 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _EimPackageResult_H_
+#define _EimPackageResult_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include "EuiccPackageResult.h"
+#include "IpaEuiccDataResponse.h"
+#include "ProfileDownloadTriggerResult.h"
+#include "EimPackageResultResponseError.h"
+#include "PendingNotificationList.h"
+#include <constr_SEQUENCE.h>
+#include <constr_CHOICE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum EimPackageResult_PR {
+ EimPackageResult_PR_NOTHING, /* No components present */
+ EimPackageResult_PR_euiccPackageResult,
+ EimPackageResult_PR_ePRAndNotifications,
+ EimPackageResult_PR_ipaEuiccDataResponse,
+ EimPackageResult_PR_profileDownloadTriggerResult,
+ EimPackageResult_PR_eimPackageResultResponseError
+ /* Extensions may appear below */
+
+} EimPackageResult_PR;
+
+/* EimPackageResult */
+typedef struct EimPackageResult {
+ EimPackageResult_PR present;
+ union EimPackageResult_u {
+ EuiccPackageResult_t euiccPackageResult;
+ struct EimPackageResult__ePRAndNotifications {
+ EuiccPackageResult_t euiccPackageResult;
+ PendingNotificationList_t notificationList;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+ } ePRAndNotifications;
+ IpaEuiccDataResponse_t ipaEuiccDataResponse;
+ ProfileDownloadTriggerResult_t profileDownloadTriggerResult;
+ EimPackageResultResponseError_t eimPackageResultResponseError;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+ } choice;
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+} EimPackageResult_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_EimPackageResult;
+extern asn_CHOICE_specifics_t asn_SPC_EimPackageResult_specs_1;
+extern asn_TYPE_member_t asn_MBR_EimPackageResult_1[5];
+extern asn_per_constraints_t asn_PER_type_EimPackageResult_constr_1;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _EimPackageResult_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libasn/EimPackageResultErrorCode.c b/src/ipa/libasn/EimPackageResultErrorCode.c
new file mode 100644
index 0000000..5261785
--- /dev/null
+++ b/src/ipa/libasn/EimPackageResultErrorCode.c
@@ -0,0 +1,31 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "EimPackageResultErrorCode.h"
+
+/*
+ * This type is implemented using NativeInteger,
+ * so here we adjust the DEF accordingly.
+ */
+static const ber_tlv_tag_t asn_DEF_EimPackageResultErrorCode_tags_1[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_EimPackageResultErrorCode = {
+ "EimPackageResultErrorCode",
+ "EimPackageResultErrorCode",
+ &asn_OP_NativeInteger,
+ asn_DEF_EimPackageResultErrorCode_tags_1,
+ sizeof(asn_DEF_EimPackageResultErrorCode_tags_1)
+ /sizeof(asn_DEF_EimPackageResultErrorCode_tags_1[0]), /* 1 */
+ asn_DEF_EimPackageResultErrorCode_tags_1, /* Same as above */
+ sizeof(asn_DEF_EimPackageResultErrorCode_tags_1)
+ /sizeof(asn_DEF_EimPackageResultErrorCode_tags_1[0]), /* 1 */
+ { 0, 0, NativeInteger_constraint },
+ 0, 0, /* Defined elsewhere */
+ 0 /* No specifics */
+};
+
diff --git a/src/ipa/libasn/EimPackageResultErrorCode.h b/src/ipa/libasn/EimPackageResultErrorCode.h
new file mode 100644
index 0000000..f98ff33
--- /dev/null
+++ b/src/ipa/libasn/EimPackageResultErrorCode.h
@@ -0,0 +1,50 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _EimPackageResultErrorCode_H_
+#define _EimPackageResultErrorCode_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeInteger.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum EimPackageResultErrorCode {
+ EimPackageResultErrorCode_invalidPackageFormat = 1,
+ EimPackageResultErrorCode_unknownPackage = 2,
+ EimPackageResultErrorCode_undefinedError = 127
+} e_EimPackageResultErrorCode;
+
+/* EimPackageResultErrorCode */
+typedef long EimPackageResultErrorCode_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_EimPackageResultErrorCode;
+asn_struct_free_f EimPackageResultErrorCode_free;
+asn_struct_print_f EimPackageResultErrorCode_print;
+asn_constr_check_f EimPackageResultErrorCode_constraint;
+ber_type_decoder_f EimPackageResultErrorCode_decode_ber;
+der_type_encoder_f EimPackageResultErrorCode_encode_der;
+xer_type_decoder_f EimPackageResultErrorCode_decode_xer;
+xer_type_encoder_f EimPackageResultErrorCode_encode_xer;
+oer_type_decoder_f EimPackageResultErrorCode_decode_oer;
+oer_type_encoder_f EimPackageResultErrorCode_encode_oer;
+per_type_decoder_f EimPackageResultErrorCode_decode_uper;
+per_type_encoder_f EimPackageResultErrorCode_encode_uper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _EimPackageResultErrorCode_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libasn/EimPackageResultResponseError.c b/src/ipa/libasn/EimPackageResultResponseError.c
new file mode 100644
index 0000000..ee2ecae
--- /dev/null
+++ b/src/ipa/libasn/EimPackageResultResponseError.c
@@ -0,0 +1,62 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "EimPackageResultResponseError.h"
+
+asn_TYPE_member_t asn_MBR_EimPackageResultResponseError_1[] = {
+ { ATF_POINTER, 1, offsetof(struct EimPackageResultResponseError, eimTransactionId),
+ (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_TransactionId,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "eimTransactionId"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct EimPackageResultResponseError, eimPackageResultErrorCode),
+ (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
+ 0,
+ &asn_DEF_EimPackageResultErrorCode,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "eimPackageResultErrorCode"
+ },
+};
+static const int asn_MAP_EimPackageResultResponseError_oms_1[] = { 0 };
+static const ber_tlv_tag_t asn_DEF_EimPackageResultResponseError_tags_1[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_EimPackageResultResponseError_tag2el_1[] = {
+ { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 1, 0, 0 }, /* eimPackageResultErrorCode */
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* eimTransactionId */
+};
+asn_SEQUENCE_specifics_t asn_SPC_EimPackageResultResponseError_specs_1 = {
+ sizeof(struct EimPackageResultResponseError),
+ offsetof(struct EimPackageResultResponseError, _asn_ctx),
+ asn_MAP_EimPackageResultResponseError_tag2el_1,
+ 2, /* Count of tags in the map */
+ asn_MAP_EimPackageResultResponseError_oms_1, /* Optional members */
+ 1, 0, /* Root/Additions */
+ 2, /* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_EimPackageResultResponseError = {
+ "EimPackageResultResponseError",
+ "EimPackageResultResponseError",
+ &asn_OP_SEQUENCE,
+ asn_DEF_EimPackageResultResponseError_tags_1,
+ sizeof(asn_DEF_EimPackageResultResponseError_tags_1)
+ /sizeof(asn_DEF_EimPackageResultResponseError_tags_1[0]), /* 1 */
+ asn_DEF_EimPackageResultResponseError_tags_1, /* Same as above */
+ sizeof(asn_DEF_EimPackageResultResponseError_tags_1)
+ /sizeof(asn_DEF_EimPackageResultResponseError_tags_1[0]), /* 1 */
+ { 0, 0, SEQUENCE_constraint },
+ asn_MBR_EimPackageResultResponseError_1,
+ 2, /* Elements count */
+ &asn_SPC_EimPackageResultResponseError_specs_1 /* Additional specs */
+};
+
diff --git a/src/ipa/libasn/EimPackageResultResponseError.h b/src/ipa/libasn/EimPackageResultResponseError.h
new file mode 100644
index 0000000..e68419a
--- /dev/null
+++ b/src/ipa/libasn/EimPackageResultResponseError.h
@@ -0,0 +1,46 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _EimPackageResultResponseError_H_
+#define _EimPackageResultResponseError_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include "TransactionId.h"
+#include "EimPackageResultErrorCode.h"
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* EimPackageResultResponseError */
+typedef struct EimPackageResultResponseError {
+ TransactionId_t *eimTransactionId /* OPTIONAL */;
+ EimPackageResultErrorCode_t eimPackageResultErrorCode;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+} EimPackageResultResponseError_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_EimPackageResultResponseError;
+extern asn_SEQUENCE_specifics_t asn_SPC_EimPackageResultResponseError_specs_1;
+extern asn_TYPE_member_t asn_MBR_EimPackageResultResponseError_1[2];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _EimPackageResultResponseError_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libasn/ProvideEimPackageResult.c b/src/ipa/libasn/ProvideEimPackageResult.c
index 2e82ac6..2176d1b 100644
--- a/src/ipa/libasn/ProvideEimPackageResult.c
+++ b/src/ipa/libasn/ProvideEimPackageResult.c
@@ -7,149 +7,61 @@
#include "ProvideEimPackageResult.h"
-static asn_oer_constraints_t asn_OER_type_ProvideEimPackageResult_constr_1 CC_NOTUSED = {
- { 0, 0 },
- -1};
-asn_per_constraints_t asn_PER_type_ProvideEimPackageResult_constr_1 CC_NOTUSED = {
- { APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 4 } /* (0..4,...) */,
- { APC_UNCONSTRAINED, -1, -1, 0, 0 },
- 0, 0 /* No PER value map */
-};
-static asn_TYPE_member_t asn_MBR_ePRAndNotifications_3[] = {
- { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResult__ePRAndNotifications, euiccPackageResult),
- (ASN_TAG_CLASS_CONTEXT | (81 << 2)),
+asn_TYPE_member_t asn_MBR_ProvideEimPackageResult_1[] = {
+ { ATF_POINTER, 1, offsetof(struct ProvideEimPackageResult, eidValue),
+ (ASN_TAG_CLASS_APPLICATION | (26 << 2)),
-1, /* IMPLICIT tag at current level */
- &asn_DEF_EuiccPackageResult,
+ &asn_DEF_Octet16,
0,
{ 0, 0, 0 },
0, 0, /* No default value */
- "euiccPackageResult"
+ "eidValue"
},
- { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResult__ePRAndNotifications, notificationList),
- (ASN_TAG_CLASS_CONTEXT | (43 << 2)),
- -1, /* IMPLICIT tag at current level */
- &asn_DEF_SGP32_RetrieveNotificationsListResponse,
+ { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResult, eimPackageResult),
+ -1 /* Ambiguous tag (CHOICE?) */,
+ 0,
+ &asn_DEF_EimPackageResult,
0,
{ 0, 0, 0 },
0, 0, /* No default value */
- "notificationList"
+ "eimPackageResult"
},
};
-static const ber_tlv_tag_t asn_DEF_ePRAndNotifications_tags_3[] = {
+static const int asn_MAP_ProvideEimPackageResult_oms_1[] = { 0 };
+static const ber_tlv_tag_t asn_DEF_ProvideEimPackageResult_tags_1[] = {
+ (ASN_TAG_CLASS_CONTEXT | (80 << 2)),
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
-static const asn_TYPE_tag2member_t asn_MAP_ePRAndNotifications_tag2el_3[] = {
- { (ASN_TAG_CLASS_CONTEXT | (43 << 2)), 1, 0, 0 }, /* notificationList */
- { (ASN_TAG_CLASS_CONTEXT | (81 << 2)), 0, 0, 0 } /* euiccPackageResult */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_ePRAndNotifications_specs_3 = {
- sizeof(struct ProvideEimPackageResult__ePRAndNotifications),
- offsetof(struct ProvideEimPackageResult__ePRAndNotifications, _asn_ctx),
- asn_MAP_ePRAndNotifications_tag2el_3,
- 2, /* Count of tags in the map */
- 0, 0, 0, /* Optional elements (not needed) */
- 2, /* First extension addition */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_ePRAndNotifications_3 = {
- "ePRAndNotifications",
- "ePRAndNotifications",
- &asn_OP_SEQUENCE,
- asn_DEF_ePRAndNotifications_tags_3,
- sizeof(asn_DEF_ePRAndNotifications_tags_3)
- /sizeof(asn_DEF_ePRAndNotifications_tags_3[0]), /* 1 */
- asn_DEF_ePRAndNotifications_tags_3, /* Same as above */
- sizeof(asn_DEF_ePRAndNotifications_tags_3)
- /sizeof(asn_DEF_ePRAndNotifications_tags_3[0]), /* 1 */
- { 0, 0, SEQUENCE_constraint },
- asn_MBR_ePRAndNotifications_3,
- 2, /* Elements count */
- &asn_SPC_ePRAndNotifications_specs_3 /* Additional specs */
-};
-
-asn_TYPE_member_t asn_MBR_ProvideEimPackageResult_1[] = {
- { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResult, choice.euiccPackageResult),
- (ASN_TAG_CLASS_CONTEXT | (81 << 2)),
- -1, /* IMPLICIT tag at current level */
- &asn_DEF_EuiccPackageResult,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "euiccPackageResult"
- },
- { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResult, choice.ePRAndNotifications),
- (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
- 0,
- &asn_DEF_ePRAndNotifications_3,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "ePRAndNotifications"
- },
- { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResult, choice.ipaEuiccDataResponse),
- (ASN_TAG_CLASS_CONTEXT | (82 << 2)),
- -1, /* IMPLICIT tag at current level */
- &asn_DEF_IpaEuiccDataResponse,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "ipaEuiccDataResponse"
- },
- { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResult, choice.profileDownloadTriggerResult),
- (ASN_TAG_CLASS_CONTEXT | (84 << 2)),
- -1, /* IMPLICIT tag at current level */
- &asn_DEF_ProfileDownloadTriggerResult,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "profileDownloadTriggerResult"
- },
- { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResult, choice.eimPackageError),
- (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
- 0,
- &asn_DEF_NativeInteger,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "eimPackageError"
- },
-};
-static const unsigned asn_MAP_ProvideEimPackageResult_to_canonical_1[] = { 4, 1, 0, 2, 3 };
-static const unsigned asn_MAP_ProvideEimPackageResult_from_canonical_1[] = { 2, 1, 3, 4, 0 };
-static const ber_tlv_tag_t asn_DEF_ProvideEimPackageResult_tags_1[] = {
- (ASN_TAG_CLASS_CONTEXT | (80 << 2))
-};
static const asn_TYPE_tag2member_t asn_MAP_ProvideEimPackageResult_tag2el_1[] = {
- { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 4, 0, 0 }, /* eimPackageError */
{ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 }, /* ePRAndNotifications */
- { (ASN_TAG_CLASS_CONTEXT | (81 << 2)), 0, 0, 0 }, /* euiccPackageResult */
- { (ASN_TAG_CLASS_CONTEXT | (82 << 2)), 2, 0, 0 }, /* ipaEuiccDataResponse */
- { (ASN_TAG_CLASS_CONTEXT | (84 << 2)), 3, 0, 0 } /* profileDownloadTriggerResult */
+ { (ASN_TAG_CLASS_APPLICATION | (26 << 2)), 0, 0, 0 }, /* eidValue */
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 1, 0, 0 }, /* eimPackageResultResponseError */
+ { (ASN_TAG_CLASS_CONTEXT | (81 << 2)), 1, 0, 0 }, /* euiccPackageResult */
+ { (ASN_TAG_CLASS_CONTEXT | (82 << 2)), 1, 0, 0 }, /* ipaEuiccDataResponse */
+ { (ASN_TAG_CLASS_CONTEXT | (84 << 2)), 1, 0, 0 } /* profileDownloadTriggerResult */
};
-asn_CHOICE_specifics_t asn_SPC_ProvideEimPackageResult_specs_1 = {
+asn_SEQUENCE_specifics_t asn_SPC_ProvideEimPackageResult_specs_1 = {
sizeof(struct ProvideEimPackageResult),
offsetof(struct ProvideEimPackageResult, _asn_ctx),
- offsetof(struct ProvideEimPackageResult, present),
- sizeof(((struct ProvideEimPackageResult *)0)->present),
asn_MAP_ProvideEimPackageResult_tag2el_1,
- 5, /* Count of tags in the map */
- asn_MAP_ProvideEimPackageResult_to_canonical_1,
- asn_MAP_ProvideEimPackageResult_from_canonical_1,
- 5 /* Extensions start */
+ 6, /* Count of tags in the map */
+ asn_MAP_ProvideEimPackageResult_oms_1, /* Optional members */
+ 1, 0, /* Root/Additions */
+ 2, /* First extension addition */
};
asn_TYPE_descriptor_t asn_DEF_ProvideEimPackageResult = {
"ProvideEimPackageResult",
"ProvideEimPackageResult",
- &asn_OP_CHOICE,
+ &asn_OP_SEQUENCE,
asn_DEF_ProvideEimPackageResult_tags_1,
sizeof(asn_DEF_ProvideEimPackageResult_tags_1)
- /sizeof(asn_DEF_ProvideEimPackageResult_tags_1[0]), /* 1 */
+ /sizeof(asn_DEF_ProvideEimPackageResult_tags_1[0]) - 1, /* 1 */
asn_DEF_ProvideEimPackageResult_tags_1, /* Same as above */
sizeof(asn_DEF_ProvideEimPackageResult_tags_1)
- /sizeof(asn_DEF_ProvideEimPackageResult_tags_1[0]), /* 1 */
- { &asn_OER_type_ProvideEimPackageResult_constr_1, &asn_PER_type_ProvideEimPackageResult_constr_1, CHOICE_constraint },
+ /sizeof(asn_DEF_ProvideEimPackageResult_tags_1[0]), /* 2 */
+ { 0, 0, SEQUENCE_constraint },
asn_MBR_ProvideEimPackageResult_1,
- 5, /* Elements count */
+ 2, /* Elements count */
&asn_SPC_ProvideEimPackageResult_specs_1 /* Additional specs */
};
diff --git a/src/ipa/libasn/ProvideEimPackageResult.h b/src/ipa/libasn/ProvideEimPackageResult.h
index 2b7fd91..e2f7a3f 100644
--- a/src/ipa/libasn/ProvideEimPackageResult.h
+++ b/src/ipa/libasn/ProvideEimPackageResult.h
@@ -12,59 +12,22 @@
#include <asn_application.h>
/* Including external dependencies */
-#include "EuiccPackageResult.h"
-#include "IpaEuiccDataResponse.h"
-#include "ProfileDownloadTriggerResult.h"
-#include <NativeInteger.h>
-#include "SGP32-RetrieveNotificationsListResponse.h"
+#include "Octet16.h"
+#include "EimPackageResult.h"
#include <constr_SEQUENCE.h>
-#include <constr_CHOICE.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* Dependencies */
-typedef enum ProvideEimPackageResult_PR {
- ProvideEimPackageResult_PR_NOTHING, /* No components present */
- ProvideEimPackageResult_PR_euiccPackageResult,
- ProvideEimPackageResult_PR_ePRAndNotifications,
- ProvideEimPackageResult_PR_ipaEuiccDataResponse,
- ProvideEimPackageResult_PR_profileDownloadTriggerResult,
- ProvideEimPackageResult_PR_eimPackageError
- /* Extensions may appear below */
-
-} ProvideEimPackageResult_PR;
-typedef enum ProvideEimPackageResult__eimPackageError {
- ProvideEimPackageResult__eimPackageError_invalidPackageFormat = 1,
- ProvideEimPackageResult__eimPackageError_unknownPackage = 2,
- ProvideEimPackageResult__eimPackageError_undefinedError = 127
-} e_ProvideEimPackageResult__eimPackageError;
-
/* ProvideEimPackageResult */
typedef struct ProvideEimPackageResult {
- ProvideEimPackageResult_PR present;
- union ProvideEimPackageResult_u {
- EuiccPackageResult_t euiccPackageResult;
- struct ProvideEimPackageResult__ePRAndNotifications {
- EuiccPackageResult_t euiccPackageResult;
- SGP32_RetrieveNotificationsListResponse_t notificationList;
- /*
- * This type is extensible,
- * possible extensions are below.
- */
-
- /* Context for parsing across buffer boundaries */
- asn_struct_ctx_t _asn_ctx;
- } ePRAndNotifications;
- IpaEuiccDataResponse_t ipaEuiccDataResponse;
- ProfileDownloadTriggerResult_t profileDownloadTriggerResult;
- long eimPackageError;
- /*
- * This type is extensible,
- * possible extensions are below.
- */
- } choice;
+ Octet16_t *eidValue /* OPTIONAL */;
+ EimPackageResult_t eimPackageResult;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t _asn_ctx;
@@ -72,9 +35,8 @@
/* Implementation */
extern asn_TYPE_descriptor_t asn_DEF_ProvideEimPackageResult;
-extern asn_CHOICE_specifics_t asn_SPC_ProvideEimPackageResult_specs_1;
-extern asn_TYPE_member_t asn_MBR_ProvideEimPackageResult_1[5];
-extern asn_per_constraints_t asn_PER_type_ProvideEimPackageResult_constr_1;
+extern asn_SEQUENCE_specifics_t asn_SPC_ProvideEimPackageResult_specs_1;
+extern asn_TYPE_member_t asn_MBR_ProvideEimPackageResult_1[2];
#ifdef __cplusplus
}
diff --git a/src/ipa/libasn/ProvideEimPackageResultResponse.c b/src/ipa/libasn/ProvideEimPackageResultResponse.c
index ddc8964..f7eb2dc 100644
--- a/src/ipa/libasn/ProvideEimPackageResultResponse.c
+++ b/src/ipa/libasn/ProvideEimPackageResultResponse.c
@@ -7,8 +7,43 @@
#include "ProvideEimPackageResultResponse.h"
+static asn_oer_constraints_t asn_OER_type_ProvideEimPackageResultResponse_constr_1 CC_NOTUSED = {
+ { 0, 0 },
+ -1};
+asn_per_constraints_t asn_PER_type_ProvideEimPackageResultResponse_constr_1 CC_NOTUSED = {
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */,
+ { APC_UNCONSTRAINED, -1, -1, 0, 0 },
+ 0, 0 /* No PER value map */
+};
+static const ber_tlv_tag_t asn_DEF_emptyResponse_tags_3[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SEQUENCE_specifics_t asn_SPC_emptyResponse_specs_3 = {
+ sizeof(struct ProvideEimPackageResultResponse__emptyResponse),
+ offsetof(struct ProvideEimPackageResultResponse__emptyResponse, _asn_ctx),
+ 0, /* No top level tags */
+ 0, /* No tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
+ -1, /* First extension addition */
+};
+static /* Use -fall-defs-global to expose */
+asn_TYPE_descriptor_t asn_DEF_emptyResponse_3 = {
+ "emptyResponse",
+ "emptyResponse",
+ &asn_OP_SEQUENCE,
+ asn_DEF_emptyResponse_tags_3,
+ sizeof(asn_DEF_emptyResponse_tags_3)
+ /sizeof(asn_DEF_emptyResponse_tags_3[0]), /* 1 */
+ asn_DEF_emptyResponse_tags_3, /* Same as above */
+ sizeof(asn_DEF_emptyResponse_tags_3)
+ /sizeof(asn_DEF_emptyResponse_tags_3[0]), /* 1 */
+ { 0, 0, SEQUENCE_constraint },
+ 0, 0, /* No members */
+ &asn_SPC_emptyResponse_specs_3 /* Additional specs */
+};
+
asn_TYPE_member_t asn_MBR_ProvideEimPackageResultResponse_1[] = {
- { ATF_POINTER, 1, offsetof(struct ProvideEimPackageResultResponse, eimAcknowledgements),
+ { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResultResponse, choice.eimAcknowledgements),
(ASN_TAG_CLASS_CONTEXT | (83 << 2)),
-1, /* IMPLICIT tag at current level */
&asn_DEF_EimAcknowledgements,
@@ -17,37 +52,59 @@
0, 0, /* No default value */
"eimAcknowledgements"
},
+ { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResultResponse, choice.emptyResponse),
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
+ 0,
+ &asn_DEF_emptyResponse_3,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "emptyResponse"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct ProvideEimPackageResultResponse, choice.provideEimPackageResultError),
+ (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)),
+ 0,
+ &asn_DEF_NativeInteger,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "provideEimPackageResultError"
+ },
};
-static const int asn_MAP_ProvideEimPackageResultResponse_oms_1[] = { 0 };
+static const unsigned asn_MAP_ProvideEimPackageResultResponse_to_canonical_1[] = { 2, 1, 0 };
+static const unsigned asn_MAP_ProvideEimPackageResultResponse_from_canonical_1[] = { 2, 1, 0 };
static const ber_tlv_tag_t asn_DEF_ProvideEimPackageResultResponse_tags_1[] = {
- (ASN_TAG_CLASS_CONTEXT | (80 << 2)),
- (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+ (ASN_TAG_CLASS_CONTEXT | (80 << 2))
};
static const asn_TYPE_tag2member_t asn_MAP_ProvideEimPackageResultResponse_tag2el_1[] = {
+ { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 2, 0, 0 }, /* provideEimPackageResultError */
+ { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 0 }, /* emptyResponse */
{ (ASN_TAG_CLASS_CONTEXT | (83 << 2)), 0, 0, 0 } /* eimAcknowledgements */
};
-asn_SEQUENCE_specifics_t asn_SPC_ProvideEimPackageResultResponse_specs_1 = {
+asn_CHOICE_specifics_t asn_SPC_ProvideEimPackageResultResponse_specs_1 = {
sizeof(struct ProvideEimPackageResultResponse),
offsetof(struct ProvideEimPackageResultResponse, _asn_ctx),
+ offsetof(struct ProvideEimPackageResultResponse, present),
+ sizeof(((struct ProvideEimPackageResultResponse *)0)->present),
asn_MAP_ProvideEimPackageResultResponse_tag2el_1,
- 1, /* Count of tags in the map */
- asn_MAP_ProvideEimPackageResultResponse_oms_1, /* Optional members */
- 1, 0, /* Root/Additions */
- 1, /* First extension addition */
+ 3, /* Count of tags in the map */
+ asn_MAP_ProvideEimPackageResultResponse_to_canonical_1,
+ asn_MAP_ProvideEimPackageResultResponse_from_canonical_1,
+ 3 /* Extensions start */
};
asn_TYPE_descriptor_t asn_DEF_ProvideEimPackageResultResponse = {
"ProvideEimPackageResultResponse",
"ProvideEimPackageResultResponse",
- &asn_OP_SEQUENCE,
+ &asn_OP_CHOICE,
asn_DEF_ProvideEimPackageResultResponse_tags_1,
sizeof(asn_DEF_ProvideEimPackageResultResponse_tags_1)
- /sizeof(asn_DEF_ProvideEimPackageResultResponse_tags_1[0]) - 1, /* 1 */
+ /sizeof(asn_DEF_ProvideEimPackageResultResponse_tags_1[0]), /* 1 */
asn_DEF_ProvideEimPackageResultResponse_tags_1, /* Same as above */
sizeof(asn_DEF_ProvideEimPackageResultResponse_tags_1)
- /sizeof(asn_DEF_ProvideEimPackageResultResponse_tags_1[0]), /* 2 */
- { 0, 0, SEQUENCE_constraint },
+ /sizeof(asn_DEF_ProvideEimPackageResultResponse_tags_1[0]), /* 1 */
+ { &asn_OER_type_ProvideEimPackageResultResponse_constr_1, &asn_PER_type_ProvideEimPackageResultResponse_constr_1, CHOICE_constraint },
asn_MBR_ProvideEimPackageResultResponse_1,
- 1, /* Elements count */
+ 3, /* Elements count */
&asn_SPC_ProvideEimPackageResultResponse_specs_1 /* Additional specs */
};
diff --git a/src/ipa/libasn/ProvideEimPackageResultResponse.h b/src/ipa/libasn/ProvideEimPackageResultResponse.h
index 071c82d..a71703b 100644
--- a/src/ipa/libasn/ProvideEimPackageResultResponse.h
+++ b/src/ipa/libasn/ProvideEimPackageResultResponse.h
@@ -12,22 +12,51 @@
#include <asn_application.h>
/* Including external dependencies */
+#include "EimAcknowledgements.h"
+#include <NativeInteger.h>
#include <constr_SEQUENCE.h>
+#include <constr_CHOICE.h>
#ifdef __cplusplus
extern "C" {
#endif
-/* Forward declarations */
-struct EimAcknowledgements;
+/* Dependencies */
+typedef enum ProvideEimPackageResultResponse_PR {
+ ProvideEimPackageResultResponse_PR_NOTHING, /* No components present */
+ ProvideEimPackageResultResponse_PR_eimAcknowledgements,
+ ProvideEimPackageResultResponse_PR_emptyResponse,
+ ProvideEimPackageResultResponse_PR_provideEimPackageResultError
+ /* Extensions may appear below */
+
+} ProvideEimPackageResultResponse_PR;
+typedef enum ProvideEimPackageResultResponse__provideEimPackageResultError {
+ ProvideEimPackageResultResponse__provideEimPackageResultError_eidNotFound = 2,
+ ProvideEimPackageResultResponse__provideEimPackageResultError_invalidEid = 3,
+ ProvideEimPackageResultResponse__provideEimPackageResultError_missingEid = 4,
+ ProvideEimPackageResultResponse__provideEimPackageResultError_undefinedError = 127
+} e_ProvideEimPackageResultResponse__provideEimPackageResultError;
/* ProvideEimPackageResultResponse */
typedef struct ProvideEimPackageResultResponse {
- struct EimAcknowledgements *eimAcknowledgements /* OPTIONAL */;
- /*
- * This type is extensible,
- * possible extensions are below.
- */
+ ProvideEimPackageResultResponse_PR present;
+ union ProvideEimPackageResultResponse_u {
+ EimAcknowledgements_t eimAcknowledgements;
+ struct ProvideEimPackageResultResponse__emptyResponse {
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+ } emptyResponse;
+ long provideEimPackageResultError;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+ } choice;
/* Context for parsing across buffer boundaries */
asn_struct_ctx_t _asn_ctx;
@@ -35,15 +64,13 @@
/* Implementation */
extern asn_TYPE_descriptor_t asn_DEF_ProvideEimPackageResultResponse;
-extern asn_SEQUENCE_specifics_t asn_SPC_ProvideEimPackageResultResponse_specs_1;
-extern asn_TYPE_member_t asn_MBR_ProvideEimPackageResultResponse_1[1];
+extern asn_CHOICE_specifics_t asn_SPC_ProvideEimPackageResultResponse_specs_1;
+extern asn_TYPE_member_t asn_MBR_ProvideEimPackageResultResponse_1[3];
+extern asn_per_constraints_t asn_PER_type_ProvideEimPackageResultResponse_constr_1;
#ifdef __cplusplus
}
#endif
-/* Referred external types */
-#include "EimAcknowledgements.h"
-
#endif /* _ProvideEimPackageResultResponse_H_ */
#include <asn_internal.h>
diff --git a/src/ipa/libipa/esipa_prvde_eim_pkg_rslt.c b/src/ipa/libipa/esipa_prvde_eim_pkg_rslt.c
index 2d5a31b..a94690e 100644
--- a/src/ipa/libipa/esipa_prvde_eim_pkg_rslt.c
+++ b/src/ipa/libipa/esipa_prvde_eim_pkg_rslt.c
@@ -14,7 +14,7 @@
#include <onomondo/ipa/ipad.h>
#include <EsipaMessageFromIpaToEim.h>
#include <ProvideEimPackageResult.h>
-#include <SGP32-RetrieveNotificationsListResponse.h>
+#include <PendingNotificationList.h>
#include "utils.h"
#include "length.h"
#include "context.h"
@@ -29,24 +29,27 @@
msg_to_eim.present = EsipaMessageFromIpaToEim_PR_provideEimPackageResult;
if (req->eim_pkg_err != 0) {
- msg_to_eim.choice.provideEimPackageResult.present = ProvideEimPackageResult_PR_eimPackageError;
- msg_to_eim.choice.provideEimPackageResult.choice.eimPackageError = req->eim_pkg_err;
- } else if (req->euicc_package_result && req->sgp32_notification_list) {
- msg_to_eim.choice.provideEimPackageResult.present = ProvideEimPackageResult_PR_ePRAndNotifications;
- msg_to_eim.choice.provideEimPackageResult.choice.ePRAndNotifications.euiccPackageResult =
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.present = EimPackageResult_PR_eimPackageResultResponseError;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.choice.eimPackageResultResponseError.eimPackageResultErrorCode =
+ req->eim_pkg_err;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.choice.eimPackageResultResponseError.eimTransactionId =
+ req->eim_trans_id;
+ } else if (req->euicc_package_result && req->pending_notification_list) {
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.present = EimPackageResult_PR_ePRAndNotifications;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.choice.ePRAndNotifications.euiccPackageResult =
*req->euicc_package_result;
- msg_to_eim.choice.provideEimPackageResult.choice.ePRAndNotifications.notificationList =
- *req->sgp32_notification_list;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.choice.ePRAndNotifications.notificationList =
+ *req->pending_notification_list;
} else if (req->euicc_package_result) {
- msg_to_eim.choice.provideEimPackageResult.present = ProvideEimPackageResult_PR_euiccPackageResult;
- msg_to_eim.choice.provideEimPackageResult.choice.euiccPackageResult = *req->euicc_package_result;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.present = EimPackageResult_PR_euiccPackageResult;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.choice.euiccPackageResult = *req->euicc_package_result;
} else if (req->ipa_euicc_data_resp) {
- msg_to_eim.choice.provideEimPackageResult.present = ProvideEimPackageResult_PR_ipaEuiccDataResponse;
- msg_to_eim.choice.provideEimPackageResult.choice.ipaEuiccDataResponse = *req->ipa_euicc_data_resp;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.present = EimPackageResult_PR_ipaEuiccDataResponse;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.choice.ipaEuiccDataResponse = *req->ipa_euicc_data_resp;
} else if (req->prfle_dwnld_trig_req_rslt) {
- msg_to_eim.choice.provideEimPackageResult.present =
- ProvideEimPackageResult_PR_profileDownloadTriggerResult;
- msg_to_eim.choice.provideEimPackageResult.choice.profileDownloadTriggerResult =
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.present =
+ EimPackageResult_PR_profileDownloadTriggerResult;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.choice.profileDownloadTriggerResult =
*req->prfle_dwnld_trig_req_rslt;
} else {
/* The struct should at least contain one of the above information element. In case the caller fails
@@ -54,9 +57,9 @@
* tell the eIM that something is wrong. */
IPA_LOGP_ESIPA("ProvideEimPackageResult", LERROR,
"empty provideEimPackageResult request, setting eimPackageError to undefined\n");
- msg_to_eim.choice.provideEimPackageResult.present = ProvideEimPackageResult_PR_eimPackageError;
- msg_to_eim.choice.provideEimPackageResult.choice.eimPackageError =
- ProvideEimPackageResult__eimPackageError_undefinedError;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.present = EimPackageResult_PR_eimPackageResultResponseError;
+ msg_to_eim.choice.provideEimPackageResult.eimPackageResult.choice.eimPackageResultResponseError.eimPackageResultErrorCode =
+ EimPackageResultErrorCode_undefinedError;
}
enc = ipa_esipa_msg_to_eim_enc(&msg_to_eim, "ProvideEimPackageResult");
@@ -78,8 +81,9 @@
res = IPA_ALLOC_ZERO(struct ipa_esipa_prvde_eim_pkg_rslt_res);
res->msg_to_ipa = msg_to_ipa;
- /* Optional, may be NULL */
- res->eim_acknowledgements = msg_to_ipa->choice.provideEimPackageResultResponse.eimAcknowledgements;
+ /* Optional, may be an "emptyResponse" */
+ if (msg_to_ipa->choice.provideEimPackageResultResponse.present == ProvideEimPackageResultResponse_PR_eimAcknowledgements)
+ res->eim_acknowledgements = &msg_to_ipa->choice.provideEimPackageResultResponse.choice.eimAcknowledgements;
return res;
}
diff --git a/src/ipa/libipa/esipa_prvde_eim_pkg_rslt.h b/src/ipa/libipa/esipa_prvde_eim_pkg_rslt.h
index e1bf87a..3d0cce6 100644
--- a/src/ipa/libipa/esipa_prvde_eim_pkg_rslt.h
+++ b/src/ipa/libipa/esipa_prvde_eim_pkg_rslt.h
@@ -17,8 +17,9 @@
struct ipa_esipa_prvde_eim_pkg_rslt_req {
long eim_pkg_err;
+ struct OCTET_STRING *eim_trans_id;
const struct EuiccPackageResult *euicc_package_result;
- struct SGP32_RetrieveNotificationsListResponse *sgp32_notification_list;
+ struct PendingNotificationList *pending_notification_list;
const struct IpaEuiccDataResponse *ipa_euicc_data_resp;
const struct ProfileDownloadTriggerResult *prfle_dwnld_trig_req_rslt;
};
diff --git a/src/ipa/libipa/proc_euicc_data_req.c b/src/ipa/libipa/proc_euicc_data_req.c
index d084ed6..0fa8ad0 100644
--- a/src/ipa/libipa/proc_euicc_data_req.c
+++ b/src/ipa/libipa/proc_euicc_data_req.c
@@ -208,6 +208,7 @@
ipa_euicc_data_response.present = IpaEuiccDataResponse_PR_ipaEuiccData;
prvde_eim_pkg_rslt_req.ipa_euicc_data_resp = &ipa_euicc_data_response;
+ prvde_eim_pkg_rslt_req.eim_trans_id = pars->ipa_euicc_data_request->eimTransactionId;
prvde_eim_pkg_rslt_res = ipa_esipa_prvde_eim_pkg_rslt(ctx, &prvde_eim_pkg_rslt_req);
if (!prvde_eim_pkg_rslt_res)
goto error;
diff --git a/src/ipa/libipa/proc_euicc_pkg_dwnld_exec.c b/src/ipa/libipa/proc_euicc_pkg_dwnld_exec.c
index b05b944..3ae2f15 100644
--- a/src/ipa/libipa/proc_euicc_pkg_dwnld_exec.c
+++ b/src/ipa/libipa/proc_euicc_pkg_dwnld_exec.c
@@ -87,7 +87,8 @@
prvde_eim_pkg_rslt_req.euicc_package_result = res->prfle_rollback_res->res->eUICCPackageResult;
else
prvde_eim_pkg_rslt_req.euicc_package_result = res->load_euicc_pkg_res->res;
- prvde_eim_pkg_rslt_req.sgp32_notification_list = retr_notif_from_lst_res->sgp32_res;
+ if (retr_notif_from_lst_res->sgp32_res->present == SGP32_RetrieveNotificationsListResponse_PR_notificationList)
+ prvde_eim_pkg_rslt_req.pending_notification_list = &retr_notif_from_lst_res->sgp32_res->choice.notificationList;
prvde_eim_pkg_rslt_res = ipa_esipa_prvde_eim_pkg_rslt(ctx, &prvde_eim_pkg_rslt_req);
if (!prvde_eim_pkg_rslt_res) {
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43055?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I24baab4f9351aec27c58403b94974cba4b274c34
Gerrit-Change-Number: 43055
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
[S] Change in onomondo-ipa[master]: V1.2: Add eimTransactionId to InitiateAuthenticationRequestEsipa
by jolly 16 Jul '26
by jolly 16 Jul '26
16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43056?usp=email )
Change subject: V1.2: Add eimTransactionId to InitiateAuthenticationRequestEsipa
......................................................................
V1.2: Add eimTransactionId to InitiateAuthenticationRequestEsipa
Add new eimTransactionId field to InitiateAuthenticationRequestEsipa.
The eimTransactionId walks through the IPA process like this:
* The eimTransactionId is retrieved from ProfileDownloadTriggerRequest
at proc_eim_pkg_retr.c.
* Then it is handed to the Common Mutual Authentication Procedure at
proc_indirect_prfle_dwnld.c.
* There it is handed to the InitiateAuthentication function at
proc_cmn_mtl_auth.c.
* There it is stored in initiateAuthenticationRequestEsipa at
esipa_init_auth.c.
Reference: SGP.32 Section 5.14.1
Related: SYS#8101
Change-Id: I1c8ef6fc0a3f7ab5735e401597fc8c6b2021fc09
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/InitiateAuthenticationRequestEsipa.c
M src/ipa/libasn/InitiateAuthenticationRequestEsipa.h
M src/ipa/libipa/esipa_init_auth.c
M src/ipa/libipa/esipa_init_auth.h
M src/ipa/libipa/proc_cmn_mtl_auth.c
M src/ipa/libipa/proc_cmn_mtl_auth.h
M src/ipa/libipa/proc_eim_pkg_retr.c
M src/ipa/libipa/proc_indirect_prfle_dwnld.c
M src/ipa/libipa/proc_indirect_prfle_dwnld.h
10 files changed, 31 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/56/43056/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 14ee3cb..b99168b 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -870,7 +870,8 @@
InitiateAuthenticationRequestEsipa ::= [57] SEQUENCE { -- Tag 'BF39'
euiccChallenge [1] Octet16, -- random eUICC challenge
smdpAddress [3] UTF8String OPTIONAL,
- euiccInfo1 EUICCInfo1 OPTIONAL
+ euiccInfo1 EUICCInfo1 OPTIONAL,
+ eimTransactionId [2] TransactionId OPTIONAL
}
InitiateAuthenticationResponseEsipa ::= [57] CHOICE { -- Tag 'BF39'
initiateAuthenticationOkEsipa InitiateAuthenticationOkEsipa,
diff --git a/src/ipa/libasn/InitiateAuthenticationRequestEsipa.c b/src/ipa/libasn/InitiateAuthenticationRequestEsipa.c
index 1366a8d..f148fca 100644
--- a/src/ipa/libasn/InitiateAuthenticationRequestEsipa.c
+++ b/src/ipa/libasn/InitiateAuthenticationRequestEsipa.c
@@ -17,7 +17,7 @@
0, 0, /* No default value */
"euiccChallenge"
},
- { ATF_POINTER, 2, offsetof(struct InitiateAuthenticationRequestEsipa, smdpAddress),
+ { ATF_POINTER, 3, offsetof(struct InitiateAuthenticationRequestEsipa, smdpAddress),
(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
-1, /* IMPLICIT tag at current level */
&asn_DEF_UTF8String,
@@ -26,7 +26,7 @@
0, 0, /* No default value */
"smdpAddress"
},
- { ATF_POINTER, 1, offsetof(struct InitiateAuthenticationRequestEsipa, euiccInfo1),
+ { ATF_POINTER, 2, offsetof(struct InitiateAuthenticationRequestEsipa, euiccInfo1),
(ASN_TAG_CLASS_CONTEXT | (32 << 2)),
0,
&asn_DEF_EUICCInfo1,
@@ -35,14 +35,24 @@
0, 0, /* No default value */
"euiccInfo1"
},
+ { ATF_POINTER, 1, offsetof(struct InitiateAuthenticationRequestEsipa, eimTransactionId),
+ (ASN_TAG_CLASS_CONTEXT | (2 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_TransactionId,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "eimTransactionId"
+ },
};
-static const int asn_MAP_InitiateAuthenticationRequestEsipa_oms_1[] = { 1, 2 };
+static const int asn_MAP_InitiateAuthenticationRequestEsipa_oms_1[] = { 1, 2, 3 };
static const ber_tlv_tag_t asn_DEF_InitiateAuthenticationRequestEsipa_tags_1[] = {
(ASN_TAG_CLASS_CONTEXT | (57 << 2)),
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
static const asn_TYPE_tag2member_t asn_MAP_InitiateAuthenticationRequestEsipa_tag2el_1[] = {
{ (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* euiccChallenge */
+ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 3, 0, 0 }, /* eimTransactionId */
{ (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 1, 0, 0 }, /* smdpAddress */
{ (ASN_TAG_CLASS_CONTEXT | (32 << 2)), 2, 0, 0 } /* euiccInfo1 */
};
@@ -50,10 +60,10 @@
sizeof(struct InitiateAuthenticationRequestEsipa),
offsetof(struct InitiateAuthenticationRequestEsipa, _asn_ctx),
asn_MAP_InitiateAuthenticationRequestEsipa_tag2el_1,
- 3, /* Count of tags in the map */
+ 4, /* Count of tags in the map */
asn_MAP_InitiateAuthenticationRequestEsipa_oms_1, /* Optional members */
- 2, 0, /* Root/Additions */
- 3, /* First extension addition */
+ 3, 0, /* Root/Additions */
+ 4, /* First extension addition */
};
asn_TYPE_descriptor_t asn_DEF_InitiateAuthenticationRequestEsipa = {
"InitiateAuthenticationRequestEsipa",
@@ -67,7 +77,7 @@
/sizeof(asn_DEF_InitiateAuthenticationRequestEsipa_tags_1[0]), /* 2 */
{ 0, 0, SEQUENCE_constraint },
asn_MBR_InitiateAuthenticationRequestEsipa_1,
- 3, /* Elements count */
+ 4, /* Elements count */
&asn_SPC_InitiateAuthenticationRequestEsipa_specs_1 /* Additional specs */
};
diff --git a/src/ipa/libasn/InitiateAuthenticationRequestEsipa.h b/src/ipa/libasn/InitiateAuthenticationRequestEsipa.h
index e043267..886081a 100644
--- a/src/ipa/libasn/InitiateAuthenticationRequestEsipa.h
+++ b/src/ipa/libasn/InitiateAuthenticationRequestEsipa.h
@@ -14,6 +14,7 @@
/* Including external dependencies */
#include "Octet16.h"
#include <UTF8String.h>
+#include "TransactionId.h"
#include <constr_SEQUENCE.h>
#ifdef __cplusplus
@@ -28,6 +29,7 @@
Octet16_t euiccChallenge;
UTF8String_t *smdpAddress /* OPTIONAL */;
struct EUICCInfo1 *euiccInfo1 /* OPTIONAL */;
+ TransactionId_t *eimTransactionId /* OPTIONAL */;
/*
* This type is extensible,
* possible extensions are below.
@@ -40,7 +42,7 @@
/* Implementation */
extern asn_TYPE_descriptor_t asn_DEF_InitiateAuthenticationRequestEsipa;
extern asn_SEQUENCE_specifics_t asn_SPC_InitiateAuthenticationRequestEsipa_specs_1;
-extern asn_TYPE_member_t asn_MBR_InitiateAuthenticationRequestEsipa_1[3];
+extern asn_TYPE_member_t asn_MBR_InitiateAuthenticationRequestEsipa_1[4];
#ifdef __cplusplus
}
diff --git a/src/ipa/libipa/esipa_init_auth.c b/src/ipa/libipa/esipa_init_auth.c
index 89a3e58..2e8532c 100644
--- a/src/ipa/libipa/esipa_init_auth.c
+++ b/src/ipa/libipa/esipa_init_auth.c
@@ -55,6 +55,9 @@
/* eUICC info */
msg_to_eim.choice.initiateAuthenticationRequestEsipa.euiccInfo1 = (EUICCInfo1_t *) req->euicc_info_1;
+ /* eIM transaction ID */
+ msg_to_eim.choice.initiateAuthenticationRequestEsipa.eimTransactionId = req->eim_transaction_id;
+
/* Encode */
return ipa_esipa_msg_to_eim_enc(&msg_to_eim, "InitiateAuthentication");
}
diff --git a/src/ipa/libipa/esipa_init_auth.h b/src/ipa/libipa/esipa_init_auth.h
index 1f91c1c..06147bf 100644
--- a/src/ipa/libipa/esipa_init_auth.h
+++ b/src/ipa/libipa/esipa_init_auth.h
@@ -16,6 +16,7 @@
const uint8_t *euicc_challenge;
const char *smdp_addr;
const EUICCInfo1_t *euicc_info_1;
+ TransactionId_t *eim_transaction_id;
};
struct ipa_esipa_init_auth_res {
diff --git a/src/ipa/libipa/proc_cmn_mtl_auth.c b/src/ipa/libipa/proc_cmn_mtl_auth.c
index df9fcc9..a8670ae 100644
--- a/src/ipa/libipa/proc_cmn_mtl_auth.c
+++ b/src/ipa/libipa/proc_cmn_mtl_auth.c
@@ -176,6 +176,7 @@
init_auth_req.euicc_challenge = euicc_challenge;
init_auth_req.smdp_addr = (char *)pars->smdp_addr;
init_auth_req.euicc_info_1 = euicc_info->euicc_info_1;
+ init_auth_req.eim_transaction_id = pars->eim_transaction_id;
init_auth_res = ipa_esipa_init_auth(ctx, &init_auth_req);
if (!init_auth_res)
goto error;
diff --git a/src/ipa/libipa/proc_cmn_mtl_auth.h b/src/ipa/libipa/proc_cmn_mtl_auth.h
index a74fb69..a806735 100644
--- a/src/ipa/libipa/proc_cmn_mtl_auth.h
+++ b/src/ipa/libipa/proc_cmn_mtl_auth.h
@@ -16,6 +16,7 @@
const struct ipa_buf *allowed_ca;
const char *smdp_addr;
const char *ac_token;
+ TransactionId_t *eim_transaction_id;
};
struct ipa_esipa_auth_clnt_res *ipa_proc_cmn_mtl_auth(struct ipa_context *ctx,
diff --git a/src/ipa/libipa/proc_eim_pkg_retr.c b/src/ipa/libipa/proc_eim_pkg_retr.c
index 59b6f99..b95eb4e 100644
--- a/src/ipa/libipa/proc_eim_pkg_retr.c
+++ b/src/ipa/libipa/proc_eim_pkg_retr.c
@@ -129,6 +129,7 @@
indirect_prfle_dwnlod_pars.ac =
IPA_STR_FROM_ASN(&get_eim_pkg_res->dwnld_trigger_request->profileDownloadData->
choice.activationCode);
+ indirect_prfle_dwnlod_pars.eim_transaction_id = get_eim_pkg_res->dwnld_trigger_request->eimTransactionId;
rc = ipa_proc_indirect_prfle_dwnlod(ctx, &indirect_prfle_dwnlod_pars);
IPA_FREE((void *)indirect_prfle_dwnlod_pars.ac);
if (rc < 0)
diff --git a/src/ipa/libipa/proc_indirect_prfle_dwnld.c b/src/ipa/libipa/proc_indirect_prfle_dwnld.c
index 045796a..9bc1467 100644
--- a/src/ipa/libipa/proc_indirect_prfle_dwnld.c
+++ b/src/ipa/libipa/proc_indirect_prfle_dwnld.c
@@ -55,6 +55,7 @@
cmn_mtl_auth_pars.allowed_ca = pars->allowed_ca;
cmn_mtl_auth_pars.smdp_addr = activation_code->sm_dp_plus_address;
cmn_mtl_auth_pars.ac_token = activation_code->ac_token;
+ cmn_mtl_auth_pars.eim_transaction_id = pars->eim_transaction_id;
auth_clnt_res = ipa_proc_cmn_mtl_auth(ctx, &cmn_mtl_auth_pars);
if (!auth_clnt_res) {
IPA_LOGP(SIPA, LERROR, "cannot continue, mutual authentication failed!\n");
diff --git a/src/ipa/libipa/proc_indirect_prfle_dwnld.h b/src/ipa/libipa/proc_indirect_prfle_dwnld.h
index a856b3d..15fb91c 100644
--- a/src/ipa/libipa/proc_indirect_prfle_dwnld.h
+++ b/src/ipa/libipa/proc_indirect_prfle_dwnld.h
@@ -15,6 +15,7 @@
const char *ac;
const uint8_t *tac;
const struct ipa_buf *allowed_ca;
+ TransactionId_t *eim_transaction_id;
};
int ipa_proc_indirect_prfle_dwnlod(struct ipa_context *ctx, const struct ipa_proc_indirect_prfle_dwnlod_pars *pars);
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43056?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I1c8ef6fc0a3f7ab5735e401597fc8c6b2021fc09
Gerrit-Change-Number: 43056
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
[L] Change in onomondo-ipa[master]: V1.2: Add function ES10b.GetConnectivityParameters
by jolly 16 Jul '26
by jolly 16 Jul '26
16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43054?usp=email )
Change subject: V1.2: Add function ES10b.GetConnectivityParameters
......................................................................
V1.2: Add function ES10b.GetConnectivityParameters
Add new library function to get connectivity parameters from IoT eUICC.
Also add an option to the command line interface to call the library
function.
The function cannot be emulated with non-IoT eUICC.
Reference: SGP.32 Section 5.9.24
Related: SYS#8101
Change-Id: I075590e095dbbe05fa6cdb0a96d5b38c7a17ff78
---
M asn1/SGP32Definitions.asn
M include/onomondo/ipa/ipad.h
M src/ipa/libasn/CMakeLists.txt
A src/ipa/libasn/ConnectivityParameters.c
A src/ipa/libasn/ConnectivityParameters.h
A src/ipa/libasn/ConnectivityParametersError.c
A src/ipa/libasn/ConnectivityParametersError.h
A src/ipa/libasn/GetConnectivityParametersRequest.c
A src/ipa/libasn/GetConnectivityParametersRequest.h
A src/ipa/libasn/GetConnectivityParametersResponse.c
A src/ipa/libasn/GetConnectivityParametersResponse.h
M src/ipa/libipa/CMakeLists.txt
A src/ipa/libipa/es10b_get_conn_params.c
A src/ipa/libipa/es10b_get_conn_params.h
M src/ipa/libipa/ipad.c
M src/ipa/main.c
16 files changed, 564 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/54/43054/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 09fda46..1f0edb7 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -723,6 +723,25 @@
}
-- ASN1STOP
+-- Section 5.9.24
+-- ASN1START
+GetConnectivityParametersRequest ::= [95] SEQUENCE { -- Tag 'BF5F'
+}
+-- ASN1STOP
+-- ASN1START
+GetConnectivityParametersResponse ::= [95] CHOICE { -- Tag 'BF5F'
+ connectivityParameters ConnectivityParameters,
+ connectivityParametersError ConnectivityParametersError
+}
+ConnectivityParameters ::= SEQUENCE {
+ httpParams [1] OCTET STRING OPTIONAL -- Also used for CoAP
+}
+ConnectivityParametersError ::= INTEGER {
+ parametersNotAvailable(1),
+ undefinedError(127)
+}
+-- ASN1STOP
+
-- Section 5.9.25
-- ASN1START
SGP32-SetDefaultDpAddressRequest ::= [101] SEQUENCE { -- Tag 'BF65'
diff --git a/include/onomondo/ipa/ipad.h b/include/onomondo/ipa/ipad.h
index defa530..ff3bd68 100644
--- a/include/onomondo/ipa/ipad.h
+++ b/include/onomondo/ipa/ipad.h
@@ -98,6 +98,7 @@
int ipa_return_from_fallback(struct ipa_context *ctx, bool refresh_flag);
int ipa_enable_emergency_profile(struct ipa_context *ctx, bool refresh_flag);
int ipa_disable_emergency_profile(struct ipa_context *ctx, bool refresh_flag);
+int ipa_get_connnectivity_parameters(struct ipa_context *ctx, struct ipa_buf **http_params);
int ipa_poll(struct ipa_context *ctx);
void ipa_close(struct ipa_context *ctx);
struct ipa_buf *ipa_free_ctx(struct ipa_context *ctx);
diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt
index 82328de..b1f9d8a 100644
--- a/src/ipa/libasn/CMakeLists.txt
+++ b/src/ipa/libasn/CMakeLists.txt
@@ -194,6 +194,10 @@
ConfigureImmediateProfileEnablingResponse.h
ConfigureISDPRequest.c
ConfigureISDPRequest.h
+ConnectivityParameters.c
+ConnectivityParametersError.c
+ConnectivityParametersError.h
+ConnectivityParameters.h
constraints.c
constraints.h
constr_CHOICE.c
@@ -411,6 +415,10 @@
GetCertsRequest.h
GetCertsResponse.c
GetCertsResponse.h
+GetConnectivityParametersRequest.c
+GetConnectivityParametersRequest.h
+GetConnectivityParametersResponse.c
+GetConnectivityParametersResponse.h
GetEimConfigurationDataRequest.c
GetEimConfigurationDataRequest.h
GetEimConfigurationDataResponse.c
diff --git a/src/ipa/libasn/ConnectivityParameters.c b/src/ipa/libasn/ConnectivityParameters.c
new file mode 100644
index 0000000..37c2e43
--- /dev/null
+++ b/src/ipa/libasn/ConnectivityParameters.c
@@ -0,0 +1,52 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "ConnectivityParameters.h"
+
+asn_TYPE_member_t asn_MBR_ConnectivityParameters_1[] = {
+ { ATF_POINTER, 1, offsetof(struct ConnectivityParameters, httpParams),
+ (ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_OCTET_STRING,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "httpParams"
+ },
+};
+static const int asn_MAP_ConnectivityParameters_oms_1[] = { 0 };
+static const ber_tlv_tag_t asn_DEF_ConnectivityParameters_tags_1[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_ConnectivityParameters_tag2el_1[] = {
+ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 } /* httpParams */
+};
+asn_SEQUENCE_specifics_t asn_SPC_ConnectivityParameters_specs_1 = {
+ sizeof(struct ConnectivityParameters),
+ offsetof(struct ConnectivityParameters, _asn_ctx),
+ asn_MAP_ConnectivityParameters_tag2el_1,
+ 1, /* Count of tags in the map */
+ asn_MAP_ConnectivityParameters_oms_1, /* Optional members */
+ 1, 0, /* Root/Additions */
+ 1, /* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_ConnectivityParameters = {
+ "ConnectivityParameters",
+ "ConnectivityParameters",
+ &asn_OP_SEQUENCE,
+ asn_DEF_ConnectivityParameters_tags_1,
+ sizeof(asn_DEF_ConnectivityParameters_tags_1)
+ /sizeof(asn_DEF_ConnectivityParameters_tags_1[0]), /* 1 */
+ asn_DEF_ConnectivityParameters_tags_1, /* Same as above */
+ sizeof(asn_DEF_ConnectivityParameters_tags_1)
+ /sizeof(asn_DEF_ConnectivityParameters_tags_1[0]), /* 1 */
+ { 0, 0, SEQUENCE_constraint },
+ asn_MBR_ConnectivityParameters_1,
+ 1, /* Elements count */
+ &asn_SPC_ConnectivityParameters_specs_1 /* Additional specs */
+};
+
diff --git a/src/ipa/libasn/ConnectivityParameters.h b/src/ipa/libasn/ConnectivityParameters.h
new file mode 100644
index 0000000..7174cea
--- /dev/null
+++ b/src/ipa/libasn/ConnectivityParameters.h
@@ -0,0 +1,44 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _ConnectivityParameters_H_
+#define _ConnectivityParameters_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <OCTET_STRING.h>
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* ConnectivityParameters */
+typedef struct ConnectivityParameters {
+ OCTET_STRING_t *httpParams /* OPTIONAL */;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+} ConnectivityParameters_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_ConnectivityParameters;
+extern asn_SEQUENCE_specifics_t asn_SPC_ConnectivityParameters_specs_1;
+extern asn_TYPE_member_t asn_MBR_ConnectivityParameters_1[1];
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ConnectivityParameters_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libasn/ConnectivityParametersError.c b/src/ipa/libasn/ConnectivityParametersError.c
new file mode 100644
index 0000000..c42280c
--- /dev/null
+++ b/src/ipa/libasn/ConnectivityParametersError.c
@@ -0,0 +1,31 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "ConnectivityParametersError.h"
+
+/*
+ * This type is implemented using NativeInteger,
+ * so here we adjust the DEF accordingly.
+ */
+static const ber_tlv_tag_t asn_DEF_ConnectivityParametersError_tags_1[] = {
+ (ASN_TAG_CLASS_UNIVERSAL | (2 << 2))
+};
+asn_TYPE_descriptor_t asn_DEF_ConnectivityParametersError = {
+ "ConnectivityParametersError",
+ "ConnectivityParametersError",
+ &asn_OP_NativeInteger,
+ asn_DEF_ConnectivityParametersError_tags_1,
+ sizeof(asn_DEF_ConnectivityParametersError_tags_1)
+ /sizeof(asn_DEF_ConnectivityParametersError_tags_1[0]), /* 1 */
+ asn_DEF_ConnectivityParametersError_tags_1, /* Same as above */
+ sizeof(asn_DEF_ConnectivityParametersError_tags_1)
+ /sizeof(asn_DEF_ConnectivityParametersError_tags_1[0]), /* 1 */
+ { 0, 0, NativeInteger_constraint },
+ 0, 0, /* Defined elsewhere */
+ 0 /* No specifics */
+};
+
diff --git a/src/ipa/libasn/ConnectivityParametersError.h b/src/ipa/libasn/ConnectivityParametersError.h
new file mode 100644
index 0000000..92f24b5
--- /dev/null
+++ b/src/ipa/libasn/ConnectivityParametersError.h
@@ -0,0 +1,49 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _ConnectivityParametersError_H_
+#define _ConnectivityParametersError_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <NativeInteger.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum ConnectivityParametersError {
+ ConnectivityParametersError_parametersNotAvailable = 1,
+ ConnectivityParametersError_undefinedError = 127
+} e_ConnectivityParametersError;
+
+/* ConnectivityParametersError */
+typedef long ConnectivityParametersError_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_ConnectivityParametersError;
+asn_struct_free_f ConnectivityParametersError_free;
+asn_struct_print_f ConnectivityParametersError_print;
+asn_constr_check_f ConnectivityParametersError_constraint;
+ber_type_decoder_f ConnectivityParametersError_decode_ber;
+der_type_encoder_f ConnectivityParametersError_encode_der;
+xer_type_decoder_f ConnectivityParametersError_decode_xer;
+xer_type_encoder_f ConnectivityParametersError_encode_xer;
+oer_type_decoder_f ConnectivityParametersError_decode_oer;
+oer_type_encoder_f ConnectivityParametersError_encode_oer;
+per_type_decoder_f ConnectivityParametersError_decode_uper;
+per_type_encoder_f ConnectivityParametersError_encode_uper;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _ConnectivityParametersError_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libasn/GetConnectivityParametersRequest.c b/src/ipa/libasn/GetConnectivityParametersRequest.c
new file mode 100644
index 0000000..2abebd7
--- /dev/null
+++ b/src/ipa/libasn/GetConnectivityParametersRequest.c
@@ -0,0 +1,36 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "GetConnectivityParametersRequest.h"
+
+static const ber_tlv_tag_t asn_DEF_GetConnectivityParametersRequest_tags_1[] = {
+ (ASN_TAG_CLASS_CONTEXT | (95 << 2)),
+ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
+};
+static asn_SEQUENCE_specifics_t asn_SPC_GetConnectivityParametersRequest_specs_1 = {
+ sizeof(struct GetConnectivityParametersRequest),
+ offsetof(struct GetConnectivityParametersRequest, _asn_ctx),
+ 0, /* No top level tags */
+ 0, /* No tags in the map */
+ 0, 0, 0, /* Optional elements (not needed) */
+ -1, /* First extension addition */
+};
+asn_TYPE_descriptor_t asn_DEF_GetConnectivityParametersRequest = {
+ "GetConnectivityParametersRequest",
+ "GetConnectivityParametersRequest",
+ &asn_OP_SEQUENCE,
+ asn_DEF_GetConnectivityParametersRequest_tags_1,
+ sizeof(asn_DEF_GetConnectivityParametersRequest_tags_1)
+ /sizeof(asn_DEF_GetConnectivityParametersRequest_tags_1[0]) - 1, /* 1 */
+ asn_DEF_GetConnectivityParametersRequest_tags_1, /* Same as above */
+ sizeof(asn_DEF_GetConnectivityParametersRequest_tags_1)
+ /sizeof(asn_DEF_GetConnectivityParametersRequest_tags_1[0]), /* 2 */
+ { 0, 0, SEQUENCE_constraint },
+ 0, 0, /* No members */
+ &asn_SPC_GetConnectivityParametersRequest_specs_1 /* Additional specs */
+};
+
diff --git a/src/ipa/libasn/GetConnectivityParametersRequest.h b/src/ipa/libasn/GetConnectivityParametersRequest.h
new file mode 100644
index 0000000..70c4c8f
--- /dev/null
+++ b/src/ipa/libasn/GetConnectivityParametersRequest.h
@@ -0,0 +1,40 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _GetConnectivityParametersRequest_H_
+#define _GetConnectivityParametersRequest_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include <constr_SEQUENCE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* GetConnectivityParametersRequest */
+typedef struct GetConnectivityParametersRequest {
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+} GetConnectivityParametersRequest_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_GetConnectivityParametersRequest;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GetConnectivityParametersRequest_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libasn/GetConnectivityParametersResponse.c b/src/ipa/libasn/GetConnectivityParametersResponse.c
new file mode 100644
index 0000000..a7b547a
--- /dev/null
+++ b/src/ipa/libasn/GetConnectivityParametersResponse.c
@@ -0,0 +1,70 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#include "GetConnectivityParametersResponse.h"
+
+static asn_oer_constraints_t asn_OER_type_GetConnectivityParametersResponse_constr_1 CC_NOTUSED = {
+ { 0, 0 },
+ -1};
+static asn_per_constraints_t asn_PER_type_GetConnectivityParametersResponse_constr_1 CC_NOTUSED = {
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 1, 1, 0, 1 } /* (0..1,...) */,
+ { APC_UNCONSTRAINED, -1, -1, 0, 0 },
+ 0, 0 /* No PER value map */
+};
+static asn_TYPE_member_t asn_MBR_GetConnectivityParametersResponse_1[] = {
+ { ATF_NOFLAGS, 0, offsetof(struct GetConnectivityParametersResponse, choice.connectivityParameters),
+ (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_ConnectivityParameters,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "connectivityParameters"
+ },
+ { ATF_NOFLAGS, 0, offsetof(struct GetConnectivityParametersResponse, choice.connectivityParametersError),
+ (ASN_TAG_CLASS_CONTEXT | (1 << 2)),
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_ConnectivityParametersError,
+ 0,
+ { 0, 0, 0 },
+ 0, 0, /* No default value */
+ "connectivityParametersError"
+ },
+};
+static const ber_tlv_tag_t asn_DEF_GetConnectivityParametersResponse_tags_1[] = {
+ (ASN_TAG_CLASS_CONTEXT | (95 << 2))
+};
+static const asn_TYPE_tag2member_t asn_MAP_GetConnectivityParametersResponse_tag2el_1[] = {
+ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* connectivityParameters */
+ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* connectivityParametersError */
+};
+static asn_CHOICE_specifics_t asn_SPC_GetConnectivityParametersResponse_specs_1 = {
+ sizeof(struct GetConnectivityParametersResponse),
+ offsetof(struct GetConnectivityParametersResponse, _asn_ctx),
+ offsetof(struct GetConnectivityParametersResponse, present),
+ sizeof(((struct GetConnectivityParametersResponse *)0)->present),
+ asn_MAP_GetConnectivityParametersResponse_tag2el_1,
+ 2, /* Count of tags in the map */
+ 0, 0,
+ 2 /* Extensions start */
+};
+asn_TYPE_descriptor_t asn_DEF_GetConnectivityParametersResponse = {
+ "GetConnectivityParametersResponse",
+ "GetConnectivityParametersResponse",
+ &asn_OP_CHOICE,
+ asn_DEF_GetConnectivityParametersResponse_tags_1,
+ sizeof(asn_DEF_GetConnectivityParametersResponse_tags_1)
+ /sizeof(asn_DEF_GetConnectivityParametersResponse_tags_1[0]), /* 1 */
+ asn_DEF_GetConnectivityParametersResponse_tags_1, /* Same as above */
+ sizeof(asn_DEF_GetConnectivityParametersResponse_tags_1)
+ /sizeof(asn_DEF_GetConnectivityParametersResponse_tags_1[0]), /* 1 */
+ { &asn_OER_type_GetConnectivityParametersResponse_constr_1, &asn_PER_type_GetConnectivityParametersResponse_constr_1, CHOICE_constraint },
+ asn_MBR_GetConnectivityParametersResponse_1,
+ 2, /* Elements count */
+ &asn_SPC_GetConnectivityParametersResponse_specs_1 /* Additional specs */
+};
+
diff --git a/src/ipa/libasn/GetConnectivityParametersResponse.h b/src/ipa/libasn/GetConnectivityParametersResponse.h
new file mode 100644
index 0000000..940a2bc
--- /dev/null
+++ b/src/ipa/libasn/GetConnectivityParametersResponse.h
@@ -0,0 +1,56 @@
+/*
+ * Generated by asn1c-0.9.29 (http://lionet.info/asn1c)
+ * From ASN.1 module "SGP32Definitions"
+ * found in "../../../asn1/SGP32Definitions.asn"
+ * `asn1c -fcompound-names -no-gen-example`
+ */
+
+#ifndef _GetConnectivityParametersResponse_H_
+#define _GetConnectivityParametersResponse_H_
+
+
+#include <asn_application.h>
+
+/* Including external dependencies */
+#include "ConnectivityParameters.h"
+#include "ConnectivityParametersError.h"
+#include <constr_CHOICE.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Dependencies */
+typedef enum GetConnectivityParametersResponse_PR {
+ GetConnectivityParametersResponse_PR_NOTHING, /* No components present */
+ GetConnectivityParametersResponse_PR_connectivityParameters,
+ GetConnectivityParametersResponse_PR_connectivityParametersError
+ /* Extensions may appear below */
+
+} GetConnectivityParametersResponse_PR;
+
+/* GetConnectivityParametersResponse */
+typedef struct GetConnectivityParametersResponse {
+ GetConnectivityParametersResponse_PR present;
+ union GetConnectivityParametersResponse_u {
+ ConnectivityParameters_t connectivityParameters;
+ ConnectivityParametersError_t connectivityParametersError;
+ /*
+ * This type is extensible,
+ * possible extensions are below.
+ */
+ } choice;
+
+ /* Context for parsing across buffer boundaries */
+ asn_struct_ctx_t _asn_ctx;
+} GetConnectivityParametersResponse_t;
+
+/* Implementation */
+extern asn_TYPE_descriptor_t asn_DEF_GetConnectivityParametersResponse;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GetConnectivityParametersResponse_H_ */
+#include <asn_internal.h>
diff --git a/src/ipa/libipa/CMakeLists.txt b/src/ipa/libipa/CMakeLists.txt
index d25b35b..e85d128 100644
--- a/src/ipa/libipa/CMakeLists.txt
+++ b/src/ipa/libipa/CMakeLists.txt
@@ -24,6 +24,7 @@
es10b_ret_from_fallback.c
es10b_en_emerg_prfle.c
es10b_dis_emerg_prfle.c
+ es10b_get_conn_params.c
es10c_delete_prfle.c
es10c_disable_prfle.c
es10c_enable_prfle.c
diff --git a/src/ipa/libipa/es10b_get_conn_params.c b/src/ipa/libipa/es10b_get_conn_params.c
new file mode 100644
index 0000000..074c8b4
--- /dev/null
+++ b/src/ipa/libipa/es10b_get_conn_params.c
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ *
+ * Author: Philipp Maier <pmaier(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH
+ * Andreas Eversberg <aeversberg(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH
+ *
+ * See also: GSMA SGP.22, 5.9.20: Function (ES10b): ExecuteFallbackMechanism
+ */
+
+#include <stdio.h>
+#include <assert.h>
+#include <onomondo/ipa/utils.h>
+#include "context.h"
+#include "utils.h"
+#include "euicc.h"
+#include "es10x.h"
+#include "es10b_get_conn_params.h"
+#include <GetConnectivityParametersRequest.h>
+
+static const struct num_str_map error_code_strings[] = {
+ { ConnectivityParametersError_parametersNotAvailable, "parametersNotAvailable" },
+ { ConnectivityParametersError_undefinedError, "undefinedError" },
+ { 0, NULL }
+};
+
+static int dec_get_conn_params_res(struct ipa_es10b_get_conn_params_res *res, const struct ipa_buf *es10b_res)
+{
+ struct GetConnectivityParametersResponse *asn = NULL;
+
+ asn = ipa_es10x_res_dec(&asn_DEF_GetConnectivityParametersResponse, es10b_res, "GetConnectivityParameters");
+ if (!asn)
+ return -EINVAL;
+
+ switch (asn->present) {
+ case GetConnectivityParametersResponse_PR_connectivityParameters:
+ IPA_LOGP_ES10X("GetConnectivityParametersResponse", LERROR, "function succeeded!\n");
+ break;
+ case GetConnectivityParametersResponse_PR_connectivityParametersError:
+ IPA_LOGP_ES10X("GetConnectivityParametersResponse", LERROR, "function failed with error code %ld=%s!\n",
+ asn->choice.connectivityParametersError,
+ ipa_str_from_num(error_code_strings, asn->choice.connectivityParametersError, "(unknown)"));
+ break;
+ default:
+ break;
+ }
+
+ res->res = asn;
+ return 0;
+}
+
+/*! Function (Es10b): GetConnectivityParameters.
+ * \param[inout] ctx pointer to ipa_context.
+ * \returns pointer newly allocated struct with function result, NULL on error. */
+struct ipa_es10b_get_conn_params_res *ipa_es10b_get_conn_params(struct ipa_context *ctx)
+{
+ struct ipa_buf *es10b_req = NULL;
+ struct ipa_buf *es10b_res = NULL;
+ struct GetConnectivityParametersRequest req = { 0 };
+ struct ipa_es10b_get_conn_params_res *res = IPA_ALLOC_ZERO(struct ipa_es10b_get_conn_params_res);
+ int rc;
+
+ es10b_req = ipa_es10x_req_enc(&asn_DEF_GetConnectivityParametersRequest, &req, "GetConnectivityParameters");
+ if (!es10b_req) {
+ IPA_LOGP_ES10X("GetConnectivityParametersRequest", LERROR, "unable to encode Es10b request\n");
+ goto error;
+ }
+
+ es10b_res = ipa_euicc_transceive_es10x(ctx, es10b_req);
+ if (!es10b_res) {
+ IPA_LOGP_ES10X("GetConnectivityParametersRequest", LERROR, "no Es10b response\n");
+ goto error;
+ }
+
+ rc = dec_get_conn_params_res(res, es10b_res);
+ if (rc < 0)
+ goto error;
+
+ IPA_FREE(es10b_req);
+ IPA_FREE(es10b_res);
+ return res;
+error:
+ IPA_FREE(es10b_req);
+ IPA_FREE(es10b_res);
+ ipa_es10b_get_conn_params_res_free(res);
+ return NULL;
+}
+
+/*! Free results of function (Es10b): GetConnectivityParameters.
+ * \param[in] res pointer to function result. */
+void ipa_es10b_get_conn_params_res_free(struct ipa_es10b_get_conn_params_res *res)
+{
+ IPA_ES10X_RES_FREE(asn_DEF_GetConnectivityParametersResponse, res);
+}
diff --git a/src/ipa/libipa/es10b_get_conn_params.h b/src/ipa/libipa/es10b_get_conn_params.h
new file mode 100644
index 0000000..75feeca
--- /dev/null
+++ b/src/ipa/libipa/es10b_get_conn_params.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved.
+ *
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+#pragma once
+
+#include <GetConnectivityParametersResponse.h>
+struct ipa_context;
+
+struct ipa_es10b_get_conn_params_res {
+ struct GetConnectivityParametersResponse *res;
+};
+
+struct ipa_es10b_get_conn_params_res *ipa_es10b_get_conn_params(struct ipa_context *ctx);
+void ipa_es10b_get_conn_params_res_free(struct ipa_es10b_get_conn_params_res *res);
diff --git a/src/ipa/libipa/ipad.c b/src/ipa/libipa/ipad.c
index 00ab37d..83e94a1 100644
--- a/src/ipa/libipa/ipad.c
+++ b/src/ipa/libipa/ipad.c
@@ -29,6 +29,7 @@
#include "es10b_ret_from_fallback.h"
#include "es10b_en_emerg_prfle.h"
#include "es10b_dis_emerg_prfle.h"
+#include "es10b_get_conn_params.h"
#include "proc_euicc_pkg_dwnld_exec.h"
#include "proc_notif_delivery.h"
@@ -373,6 +374,35 @@
return rc;
}
+/*! Get connectivity parameters from active profile.
+ * \param[inout] ctx pointer to ipa_context.
+ * \param[out] http_params pointer to the HTTP parameters pointer to be returned.
+ * \returns 0 on success, negative on error. */
+int ipa_get_connnectivity_parameters(struct ipa_context *ctx, struct ipa_buf **http_params)
+{
+ struct ipa_es10b_get_conn_params_res *res;
+
+ *http_params = NULL;
+
+ if (ctx->cfg->iot_euicc_emu_enabled) {
+ IPA_LOGP(SIPA, LERROR, "Unable to emulate retrieval of connectivity patameters.\n");
+ return -ENOTSUP;
+ }
+
+ res = ipa_es10b_get_conn_params(ctx);
+ if (!res)
+ return -EIO;
+ if (res->res->present == GetConnectivityParametersResponse_PR_connectivityParameters) {
+ if (res->res->choice.connectivityParameters.httpParams) {
+ ipa_buf_alloc_data(res->res->choice.connectivityParameters.httpParams->size,
+ res->res->choice.connectivityParameters.httpParams->buf);
+ }
+ }
+ ipa_es10b_get_conn_params_res_free(res);
+
+ return 0;
+}
+
static int check_canaries(struct ipa_context *ctx)
{
if (ctx->check_http)
diff --git a/src/ipa/main.c b/src/ipa/main.c
index 4352ee6..3e7b7a7 100644
--- a/src/ipa/main.c
+++ b/src/ipa/main.c
@@ -54,6 +54,7 @@
printf(" --enable-emergency-profile.. Trigger enabling of emergency profile\n");
printf(" --disable-emergency-profile. Trigger return from emergency profile to previous profile\n");
printf(" --refresh-flag.............. Make eUICC send a CAT refresh after switchting profile with the triggers above.\n");
+ printf(" --getopt-get-conn-params.... Get connectivity parameters from acurrently active profile\n");
printf(" -n PATH .................... path to nvstate file (default: %s)\n", DEFAULT_NVSTATE_PATH);
printf(" -y NUM ..................... number of retries for ESipa requests (default: %u)\n",
DEFAULT_ESIPA_REQ_RETRIES);
@@ -152,6 +153,7 @@
bool getopt_enable_emergency_profile = false;
bool getopt_disable_emergency_profile = false;
bool getopt_refresh_flag = false;
+ bool getopt_get_connectivity_params = false;
char *getopt_nvstate_path = DEFAULT_NVSTATE_PATH;
struct ipa_buf *nvstate_load = NULL;
struct ipa_buf *nvstate_save = NULL;
@@ -174,6 +176,7 @@
OPT_ENABLEEMGERGENCY,
OPT_DISABLEEMGERGENCY,
OPT_REFRESHFLAG,
+ OPT_GETCONNPARAMS,
};
struct option long_options[] = {
@@ -182,6 +185,7 @@
{ "enable-emergency-profile", no_argument, NULL, OPT_ENABLEEMGERGENCY},
{ "disable-emergency-profile", no_argument, NULL, OPT_DISABLEEMGERGENCY},
{ "refresh-flag", no_argument, NULL, OPT_REFRESHFLAG},
+ { "get-conn-params", no_argument, NULL, OPT_GETCONNPARAMS},
{ NULL, 0, NULL, 0}
};
@@ -229,6 +233,9 @@
case OPT_REFRESHFLAG:
getopt_refresh_flag = true;
break;
+ case OPT_GETCONNPARAMS:
+ getopt_get_connectivity_params = true;
+ break;
case 'n':
getopt_nvstate_path = optarg;
break;
@@ -322,6 +329,14 @@
} else if (getopt_disable_emergency_profile) {
/* Trigger return from emergency profile to previous profile */
ipa_disable_emergency_profile(ctx, getopt_refresh_flag);
+ } else if (getopt_get_connectivity_params) {
+ struct ipa_buf *http_params;
+ /* Trigger return from emergency profile to previous profile */
+ rc = ipa_get_connnectivity_parameters(ctx, &http_params);
+ if (rc < 0)
+ goto leave;
+ IPA_LOGP(SMAIN, LINFO, "HTTP paramms: %s\n", ipa_buf_hexdump(http_params));
+ ipa_buf_free(http_params);
} else {
IPA_LOGP(SMAIN, LINFO, "-----------------------------8<-----------------------------\n");
rc = eim_init(ctx);
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43054?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I075590e095dbbe05fa6cdb0a96d5b38c7a17ff78
Gerrit-Change-Number: 43054
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
[L] Change in onomondo-ipa[master]: V1.2: Change fields in RetrieveNotificationsListResponse
by jolly 16 Jul '26
by jolly 16 Jul '26
16 Jul '26
jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43053?usp=email )
Change subject: V1.2: Change fields in RetrieveNotificationsListResponse
......................................................................
V1.2: Change fields in RetrieveNotificationsListResponse
Remove notificationAndEprList and restructure definitions in
RetrieveNotificationsListResponse.
This requires name changes in IPA process. The notificationAndEprList
case is removed.
Reference: SGP.32 Section 5.9.11
Related: SYS#8101
Change-Id: I757586e92c5eb1ca54ddf8ab6f71eb418de20f6e
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.c
M src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.h
M src/ipa/libipa/es10b_retr_notif_from_lst.c
4 files changed, 20 insertions(+), 277 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/53/43053/1
diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 8537460..09fda46 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -577,13 +577,9 @@
-- ASN1START
SGP32-RetrieveNotificationsListResponse ::= [43] CHOICE { -- Tag 'BF2B'
- notificationList SEQUENCE OF SGP32-PendingNotification,
- notificationsListResultError INTEGER { undefinedError(127)},
- euiccPackageResultList SEQUENCE OF EuiccPackageResult,
- notificationAndEprList SEQUENCE {
- notificationList SEQUENCE OF SGP32-PendingNotification,
- euiccPackageResultList SEQUENCE OF EuiccPackageResult
- }
+ notificationList PendingNotificationList, -- Tag 'A0'
+ notificationsListResultError INTEGER { undefinedError(127)}, -- Tag '81'
+ euiccPackageResultList EuiccPackageResultList -- Tag 'A2'
}
-- ASN1STOP
diff --git a/src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.c b/src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.c
index 13b4b61..29fb7c0 100644
--- a/src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.c
+++ b/src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.c
@@ -11,216 +11,15 @@
{ 0, 0 },
-1};
asn_per_constraints_t asn_PER_type_SGP32_RetrieveNotificationsListResponse_constr_1 CC_NOTUSED = {
- { APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 3 } /* (0..3,...) */,
+ { APC_CONSTRAINED | APC_EXTENSIBLE, 2, 2, 0, 2 } /* (0..2,...) */,
{ APC_UNCONSTRAINED, -1, -1, 0, 0 },
0, 0 /* No PER value map */
};
-static asn_TYPE_member_t asn_MBR_notificationList_2[] = {
- { ATF_POINTER, 0, 0,
- -1 /* Ambiguous tag (CHOICE?) */,
- 0,
- &asn_DEF_SGP32_PendingNotification,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- ""
- },
-};
-static const ber_tlv_tag_t asn_DEF_notificationList_tags_2[] = {
- (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
- (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static asn_SET_OF_specifics_t asn_SPC_notificationList_specs_2 = {
- sizeof(struct SGP32_RetrieveNotificationsListResponse__notificationList),
- offsetof(struct SGP32_RetrieveNotificationsListResponse__notificationList, _asn_ctx),
- 2, /* XER encoding is XMLValueList */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_notificationList_2 = {
- "notificationList",
- "notificationList",
- &asn_OP_SEQUENCE_OF,
- asn_DEF_notificationList_tags_2,
- sizeof(asn_DEF_notificationList_tags_2)
- /sizeof(asn_DEF_notificationList_tags_2[0]) - 1, /* 1 */
- asn_DEF_notificationList_tags_2, /* Same as above */
- sizeof(asn_DEF_notificationList_tags_2)
- /sizeof(asn_DEF_notificationList_tags_2[0]), /* 2 */
- { 0, 0, SEQUENCE_OF_constraint },
- asn_MBR_notificationList_2,
- 1, /* Single element */
- &asn_SPC_notificationList_specs_2 /* Additional specs */
-};
-
-static asn_TYPE_member_t asn_MBR_euiccPackageResultList_6[] = {
- { ATF_POINTER, 0, 0,
- (ASN_TAG_CLASS_CONTEXT | (81 << 2)),
- 0,
- &asn_DEF_EuiccPackageResult,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- ""
- },
-};
-static const ber_tlv_tag_t asn_DEF_euiccPackageResultList_tags_6[] = {
- (ASN_TAG_CLASS_CONTEXT | (2 << 2)),
- (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static asn_SET_OF_specifics_t asn_SPC_euiccPackageResultList_specs_6 = {
- sizeof(struct SGP32_RetrieveNotificationsListResponse__euiccPackageResultList),
- offsetof(struct SGP32_RetrieveNotificationsListResponse__euiccPackageResultList, _asn_ctx),
- 2, /* XER encoding is XMLValueList */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_euiccPackageResultList_6 = {
- "euiccPackageResultList",
- "euiccPackageResultList",
- &asn_OP_SEQUENCE_OF,
- asn_DEF_euiccPackageResultList_tags_6,
- sizeof(asn_DEF_euiccPackageResultList_tags_6)
- /sizeof(asn_DEF_euiccPackageResultList_tags_6[0]) - 1, /* 1 */
- asn_DEF_euiccPackageResultList_tags_6, /* Same as above */
- sizeof(asn_DEF_euiccPackageResultList_tags_6)
- /sizeof(asn_DEF_euiccPackageResultList_tags_6[0]), /* 2 */
- { 0, 0, SEQUENCE_OF_constraint },
- asn_MBR_euiccPackageResultList_6,
- 1, /* Single element */
- &asn_SPC_euiccPackageResultList_specs_6 /* Additional specs */
-};
-
-static asn_TYPE_member_t asn_MBR_notificationList_9[] = {
- { ATF_POINTER, 0, 0,
- -1 /* Ambiguous tag (CHOICE?) */,
- 0,
- &asn_DEF_SGP32_PendingNotification,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- ""
- },
-};
-static const ber_tlv_tag_t asn_DEF_notificationList_tags_9[] = {
- (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
- (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static asn_SET_OF_specifics_t asn_SPC_notificationList_specs_9 = {
- sizeof(struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList__notificationList),
- offsetof(struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList__notificationList, _asn_ctx),
- 2, /* XER encoding is XMLValueList */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_notificationList_9 = {
- "notificationList",
- "notificationList",
- &asn_OP_SEQUENCE_OF,
- asn_DEF_notificationList_tags_9,
- sizeof(asn_DEF_notificationList_tags_9)
- /sizeof(asn_DEF_notificationList_tags_9[0]) - 1, /* 1 */
- asn_DEF_notificationList_tags_9, /* Same as above */
- sizeof(asn_DEF_notificationList_tags_9)
- /sizeof(asn_DEF_notificationList_tags_9[0]), /* 2 */
- { 0, 0, SEQUENCE_OF_constraint },
- asn_MBR_notificationList_9,
- 1, /* Single element */
- &asn_SPC_notificationList_specs_9 /* Additional specs */
-};
-
-static asn_TYPE_member_t asn_MBR_euiccPackageResultList_11[] = {
- { ATF_POINTER, 0, 0,
- (ASN_TAG_CLASS_CONTEXT | (81 << 2)),
- 0,
- &asn_DEF_EuiccPackageResult,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- ""
- },
-};
-static const ber_tlv_tag_t asn_DEF_euiccPackageResultList_tags_11[] = {
- (ASN_TAG_CLASS_CONTEXT | (1 << 2)),
- (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static asn_SET_OF_specifics_t asn_SPC_euiccPackageResultList_specs_11 = {
- sizeof(struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList__euiccPackageResultList),
- offsetof(struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList__euiccPackageResultList, _asn_ctx),
- 2, /* XER encoding is XMLValueList */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_euiccPackageResultList_11 = {
- "euiccPackageResultList",
- "euiccPackageResultList",
- &asn_OP_SEQUENCE_OF,
- asn_DEF_euiccPackageResultList_tags_11,
- sizeof(asn_DEF_euiccPackageResultList_tags_11)
- /sizeof(asn_DEF_euiccPackageResultList_tags_11[0]) - 1, /* 1 */
- asn_DEF_euiccPackageResultList_tags_11, /* Same as above */
- sizeof(asn_DEF_euiccPackageResultList_tags_11)
- /sizeof(asn_DEF_euiccPackageResultList_tags_11[0]), /* 2 */
- { 0, 0, SEQUENCE_OF_constraint },
- asn_MBR_euiccPackageResultList_11,
- 1, /* Single element */
- &asn_SPC_euiccPackageResultList_specs_11 /* Additional specs */
-};
-
-static asn_TYPE_member_t asn_MBR_notificationAndEprList_8[] = {
- { ATF_NOFLAGS, 0, offsetof(struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList, notificationList),
- (ASN_TAG_CLASS_CONTEXT | (0 << 2)),
- 0,
- &asn_DEF_notificationList_9,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "notificationList"
- },
- { ATF_NOFLAGS, 0, offsetof(struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList, euiccPackageResultList),
- (ASN_TAG_CLASS_CONTEXT | (1 << 2)),
- 0,
- &asn_DEF_euiccPackageResultList_11,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "euiccPackageResultList"
- },
-};
-static const ber_tlv_tag_t asn_DEF_notificationAndEprList_tags_8[] = {
- (ASN_TAG_CLASS_CONTEXT | (3 << 2)),
- (ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
-};
-static const asn_TYPE_tag2member_t asn_MAP_notificationAndEprList_tag2el_8[] = {
- { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* notificationList */
- { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 } /* euiccPackageResultList */
-};
-static asn_SEQUENCE_specifics_t asn_SPC_notificationAndEprList_specs_8 = {
- sizeof(struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList),
- offsetof(struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList, _asn_ctx),
- asn_MAP_notificationAndEprList_tag2el_8,
- 2, /* Count of tags in the map */
- 0, 0, 0, /* Optional elements (not needed) */
- 2, /* First extension addition */
-};
-static /* Use -fall-defs-global to expose */
-asn_TYPE_descriptor_t asn_DEF_notificationAndEprList_8 = {
- "notificationAndEprList",
- "notificationAndEprList",
- &asn_OP_SEQUENCE,
- asn_DEF_notificationAndEprList_tags_8,
- sizeof(asn_DEF_notificationAndEprList_tags_8)
- /sizeof(asn_DEF_notificationAndEprList_tags_8[0]) - 1, /* 1 */
- asn_DEF_notificationAndEprList_tags_8, /* Same as above */
- sizeof(asn_DEF_notificationAndEprList_tags_8)
- /sizeof(asn_DEF_notificationAndEprList_tags_8[0]), /* 2 */
- { 0, 0, SEQUENCE_constraint },
- asn_MBR_notificationAndEprList_8,
- 2, /* Elements count */
- &asn_SPC_notificationAndEprList_specs_8 /* Additional specs */
-};
-
asn_TYPE_member_t asn_MBR_SGP32_RetrieveNotificationsListResponse_1[] = {
{ ATF_NOFLAGS, 0, offsetof(struct SGP32_RetrieveNotificationsListResponse, choice.notificationList),
(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
- 0,
- &asn_DEF_notificationList_2,
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_PendingNotificationList,
0,
{ 0, 0, 0 },
0, 0, /* No default value */
@@ -237,22 +36,13 @@
},
{ ATF_NOFLAGS, 0, offsetof(struct SGP32_RetrieveNotificationsListResponse, choice.euiccPackageResultList),
(ASN_TAG_CLASS_CONTEXT | (2 << 2)),
- 0,
- &asn_DEF_euiccPackageResultList_6,
+ -1, /* IMPLICIT tag at current level */
+ &asn_DEF_EuiccPackageResultList,
0,
{ 0, 0, 0 },
0, 0, /* No default value */
"euiccPackageResultList"
},
- { ATF_NOFLAGS, 0, offsetof(struct SGP32_RetrieveNotificationsListResponse, choice.notificationAndEprList),
- (ASN_TAG_CLASS_CONTEXT | (3 << 2)),
- 0,
- &asn_DEF_notificationAndEprList_8,
- 0,
- { 0, 0, 0 },
- 0, 0, /* No default value */
- "notificationAndEprList"
- },
};
static const ber_tlv_tag_t asn_DEF_SGP32_RetrieveNotificationsListResponse_tags_1[] = {
(ASN_TAG_CLASS_CONTEXT | (43 << 2))
@@ -260,8 +50,7 @@
static const asn_TYPE_tag2member_t asn_MAP_SGP32_RetrieveNotificationsListResponse_tag2el_1[] = {
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* notificationList */
{ (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* notificationsListResultError */
- { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* euiccPackageResultList */
- { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* notificationAndEprList */
+ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* euiccPackageResultList */
};
asn_CHOICE_specifics_t asn_SPC_SGP32_RetrieveNotificationsListResponse_specs_1 = {
sizeof(struct SGP32_RetrieveNotificationsListResponse),
@@ -269,9 +58,9 @@
offsetof(struct SGP32_RetrieveNotificationsListResponse, present),
sizeof(((struct SGP32_RetrieveNotificationsListResponse *)0)->present),
asn_MAP_SGP32_RetrieveNotificationsListResponse_tag2el_1,
- 4, /* Count of tags in the map */
+ 3, /* Count of tags in the map */
0, 0,
- 4 /* Extensions start */
+ 3 /* Extensions start */
};
asn_TYPE_descriptor_t asn_DEF_SGP32_RetrieveNotificationsListResponse = {
"SGP32-RetrieveNotificationsListResponse",
@@ -285,7 +74,7 @@
/sizeof(asn_DEF_SGP32_RetrieveNotificationsListResponse_tags_1[0]), /* 1 */
{ &asn_OER_type_SGP32_RetrieveNotificationsListResponse_constr_1, &asn_PER_type_SGP32_RetrieveNotificationsListResponse_constr_1, CHOICE_constraint },
asn_MBR_SGP32_RetrieveNotificationsListResponse_1,
- 4, /* Elements count */
+ 3, /* Elements count */
&asn_SPC_SGP32_RetrieveNotificationsListResponse_specs_1 /* Additional specs */
};
diff --git a/src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.h b/src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.h
index 4315f7e..380cffe 100644
--- a/src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.h
+++ b/src/ipa/libasn/SGP32-RetrieveNotificationsListResponse.h
@@ -12,10 +12,9 @@
#include <asn_application.h>
/* Including external dependencies */
+#include "PendingNotificationList.h"
#include <NativeInteger.h>
-#include <asn_SEQUENCE_OF.h>
-#include <constr_SEQUENCE_OF.h>
-#include <constr_SEQUENCE.h>
+#include "EuiccPackageResultList.h"
#include <constr_CHOICE.h>
#ifdef __cplusplus
@@ -27,8 +26,7 @@
SGP32_RetrieveNotificationsListResponse_PR_NOTHING, /* No components present */
SGP32_RetrieveNotificationsListResponse_PR_notificationList,
SGP32_RetrieveNotificationsListResponse_PR_notificationsListResultError,
- SGP32_RetrieveNotificationsListResponse_PR_euiccPackageResultList,
- SGP32_RetrieveNotificationsListResponse_PR_notificationAndEprList
+ SGP32_RetrieveNotificationsListResponse_PR_euiccPackageResultList
/* Extensions may appear below */
} SGP32_RetrieveNotificationsListResponse_PR;
@@ -36,48 +34,13 @@
SGP32_RetrieveNotificationsListResponse__notificationsListResultError_undefinedError = 127
} e_SGP32_RetrieveNotificationsListResponse__notificationsListResultError;
-/* Forward declarations */
-struct SGP32_PendingNotification;
-struct EuiccPackageResult;
-
/* SGP32-RetrieveNotificationsListResponse */
typedef struct SGP32_RetrieveNotificationsListResponse {
SGP32_RetrieveNotificationsListResponse_PR present;
union SGP32_RetrieveNotificationsListResponse_u {
- struct SGP32_RetrieveNotificationsListResponse__notificationList {
- A_SEQUENCE_OF(struct SGP32_PendingNotification) list;
-
- /* Context for parsing across buffer boundaries */
- asn_struct_ctx_t _asn_ctx;
- } notificationList;
+ PendingNotificationList_t notificationList;
long notificationsListResultError;
- struct SGP32_RetrieveNotificationsListResponse__euiccPackageResultList {
- A_SEQUENCE_OF(struct EuiccPackageResult) list;
-
- /* Context for parsing across buffer boundaries */
- asn_struct_ctx_t _asn_ctx;
- } euiccPackageResultList;
- struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList {
- struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList__notificationList {
- A_SEQUENCE_OF(struct SGP32_PendingNotification) list;
-
- /* Context for parsing across buffer boundaries */
- asn_struct_ctx_t _asn_ctx;
- } notificationList;
- struct SGP32_RetrieveNotificationsListResponse__notificationAndEprList__euiccPackageResultList {
- A_SEQUENCE_OF(struct EuiccPackageResult) list;
-
- /* Context for parsing across buffer boundaries */
- asn_struct_ctx_t _asn_ctx;
- } euiccPackageResultList;
- /*
- * This type is extensible,
- * possible extensions are below.
- */
-
- /* Context for parsing across buffer boundaries */
- asn_struct_ctx_t _asn_ctx;
- } notificationAndEprList;
+ EuiccPackageResultList_t euiccPackageResultList;
/*
* This type is extensible,
* possible extensions are below.
@@ -91,16 +54,12 @@
/* Implementation */
extern asn_TYPE_descriptor_t asn_DEF_SGP32_RetrieveNotificationsListResponse;
extern asn_CHOICE_specifics_t asn_SPC_SGP32_RetrieveNotificationsListResponse_specs_1;
-extern asn_TYPE_member_t asn_MBR_SGP32_RetrieveNotificationsListResponse_1[4];
+extern asn_TYPE_member_t asn_MBR_SGP32_RetrieveNotificationsListResponse_1[3];
extern asn_per_constraints_t asn_PER_type_SGP32_RetrieveNotificationsListResponse_constr_1;
#ifdef __cplusplus
}
#endif
-/* Referred external types */
-#include "SGP32-PendingNotification.h"
-#include "EuiccPackageResult.h"
-
#endif /* _SGP32_RetrieveNotificationsListResponse_H_ */
#include <asn_internal.h>
diff --git a/src/ipa/libipa/es10b_retr_notif_from_lst.c b/src/ipa/libipa/es10b_retr_notif_from_lst.c
index 170f59a..bd90b3a 100644
--- a/src/ipa/libipa/es10b_retr_notif_from_lst.c
+++ b/src/ipa/libipa/es10b_retr_notif_from_lst.c
@@ -24,7 +24,7 @@
#include "es10b_retr_notif_from_lst.h"
/* Convert a notificationList (RetrieveNotificationsListResponse) from RSP to SGP32 format. */
-void convert_notification_list(struct SGP32_RetrieveNotificationsListResponse__notificationList *lst_out,
+void convert_notification_list(PendingNotificationList_t *lst_out,
const struct RetrieveNotificationsListResponse__notificationList *lst_in)
{
unsigned int i;
@@ -67,7 +67,7 @@
}
/*! Free a converted notificationList (RetrieveNotificationsListResponse). */
-void free_converted_notification_list(struct SGP32_RetrieveNotificationsListResponse__notificationList *lst)
+void free_converted_notification_list(PendingNotificationList_t *lst)
{
int i;
if (!lst)
@@ -138,7 +138,6 @@
res->notif_lst_result_err, "(unknown)"));
case SGP32_RetrieveNotificationsListResponse_PR_notificationList:
case SGP32_RetrieveNotificationsListResponse_PR_euiccPackageResultList:
- case SGP32_RetrieveNotificationsListResponse_PR_notificationAndEprList:
/* Nothing to do */
break;
default:
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43053?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I757586e92c5eb1ca54ddf8ab6f71eb418de20f6e
Gerrit-Change-Number: 43053
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0