lists.osmocom.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2026
September
August
July
June
May
April
March
February
January
2025
December
November
October
September
August
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
List overview
Download
gerrit-log
July 2026
----- 2026 -----
September 2026
August 2026
July 2026
June 2026
May 2026
April 2026
March 2026
February 2026
January 2026
----- 2025 -----
December 2025
November 2025
October 2025
September 2025
August 2025
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
gerrit-log@lists.osmocom.org
1 participants
869 discussions
Start a n
N
ew thread
[S] Change in onomondo-ipa[master]: WIP: Add refreshFlag
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43026?usp=email
) Change subject: WIP: Add refreshFlag ...................................................................... WIP: Add refreshFlag Ich weiss nicht die Bohne, was das hier soll. TBD!!! 5.9.15 TBD: explain why this is always true Change-Id: I7d8f9182b675ca0851e00ef8d36201151f30178f --- M src/ipa/libipa/context.h M src/ipa/libipa/es10b_immediate_enable.c M src/ipa/libipa/es10b_load_euicc_pkg.c 3 files changed, 7 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/26/43026/1 diff --git a/src/ipa/libipa/context.h b/src/ipa/libipa/context.h index 5065286..e0080d4 100644 --- a/src/ipa/libipa/context.h +++ b/src/ipa/libipa/context.h @@ -32,6 +32,7 @@ bool flag; struct ipa_buf *smdp_oid; struct ipa_buf *smdp_address; + bool refresh; } immediate_enable; } iot_euicc_emu; diff --git a/src/ipa/libipa/es10b_immediate_enable.c b/src/ipa/libipa/es10b_immediate_enable.c index 1d0b942..a649371 100644 --- a/src/ipa/libipa/es10b_immediate_enable.c +++ b/src/ipa/libipa/es10b_immediate_enable.c @@ -154,6 +154,7 @@ IPA_ASSIGN_BUF_TO_ASN(enable_prfle_req.req.profileIdentifier.choice.isdpAid, ctx->iot_euicc_emu.immediate_enable.profile_aid->data, ctx->iot_euicc_emu.immediate_enable.profile_aid->len); + enable_prfle_req.req.refreshFlag = ctx->nvstate.iot_euicc_emu.immediate_enable.refresh; enable_prfle_res = ipa_es10c_enable_prfle(ctx, &enable_prfle_req); if (enable_prfle_res && enable_prfle_res->res->enableResult == EnableProfileResponse__enableResult_ok) @@ -163,7 +164,7 @@ error: if (rc == ImmediateEnableResponse__immediateEnableResult_ok) { - IPA_LOGP_ES10X("ImmediateEnable", LERROR, + IPA_LOGP_ES10X("ImmediateEnable", LINFO, "IoT eUICC emulation active, function succeeded with status code %d=%s!\n", rc, ipa_str_from_num(error_code_strings, rc, "(unknown)")); } else { diff --git a/src/ipa/libipa/es10b_load_euicc_pkg.c b/src/ipa/libipa/es10b_load_euicc_pkg.c index fd3f1df..54cf3d9 100644 --- a/src/ipa/libipa/es10b_load_euicc_pkg.c +++ b/src/ipa/libipa/es10b_load_euicc_pkg.c @@ -241,10 +241,12 @@ euicc_result_data->present = EuiccResultData_PR_configureImmediateEnableResult; /* Update immediateEnableFlag */ - if (configureImmediateEnable_psmo->immediateEnableFlag) + if (configureImmediateEnable_psmo->immediateEnableFlag) { ctx->nvstate.iot_euicc_emu.immediate_enable.flag = true; - else + ctx->nvstate.iot_euicc_emu.immediate_enable.refresh = true; + } else { ctx->nvstate.iot_euicc_emu.immediate_enable.flag = false; + } /* Update smdpOid */ ipa_buf_free(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid); -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43026?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: I7d8f9182b675ca0851e00ef8d36201151f30178f Gerrit-Change-Number: 43026 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
[L] Change in onomondo-ipa[master]: V1.2: Rename "Automatic" -> "Immediate" in ASN.1 definitions
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43023?usp=email
) Change subject: V1.2: Rename "Automatic" -> "Immediate" in ASN.1 definitions ...................................................................... V1.2: Rename "Automatic" -> "Immediate" in ASN.1 definitions Rename all occurrences of "Automatic" or "AutomaticEnable" or similar to "Immediate" or "ImmediateEnable" or similar respectively. Reference: SGP.32 Section 2.9.2 Related: SYS#8101 Change-Id: I2b18e5cf65269347ce40e5e9560ab934e75a92a6 --- M asn1/SGP32Definitions.asn M src/ipa/libasn/CMakeLists.txt D src/ipa/libasn/ConfigureAutoEnableResult.c D src/ipa/libasn/ConfigureAutoEnableResult.h D src/ipa/libasn/ConfigureAutoProfileEnablingRequest.c D src/ipa/libasn/ConfigureAutoProfileEnablingRequest.h D src/ipa/libasn/ConfigureAutoProfileEnablingResponse.c D src/ipa/libasn/ConfigureAutoProfileEnablingResponse.h A src/ipa/libasn/ConfigureImmediateEnableResult.c A src/ipa/libasn/ConfigureImmediateEnableResult.h A src/ipa/libasn/ConfigureImmediateProfileEnablingRequest.c A src/ipa/libasn/ConfigureImmediateProfileEnablingRequest.h A src/ipa/libasn/ConfigureImmediateProfileEnablingResponse.c A src/ipa/libasn/ConfigureImmediateProfileEnablingResponse.h M src/ipa/libasn/EnableUsingDDResponse.h M src/ipa/libasn/EuiccResultData.c M src/ipa/libasn/EuiccResultData.h M src/ipa/libasn/Psmo.c M src/ipa/libasn/Psmo.h M src/ipa/libasn/SGP32-EuiccMemoryResetRequest.h M src/ipa/libasn/SGP32-EuiccMemoryResetResponse.c M src/ipa/libasn/SGP32-EuiccMemoryResetResponse.h M src/ipa/libipa/es10b_enable_using_dd.c M src/ipa/libipa/es10b_euicc_mem_rst.c M src/ipa/libipa/es10b_load_euicc_pkg.c 25 files changed, 400 insertions(+), 400 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/23/43023/1 diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index b953420..bc4fdad 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -97,8 +97,8 @@ delete [5] SEQUENCE {iccid [APPLICATION 26] Iccid}, listProfileInfo [45] ProfileInfoListRequest, -- Tag 'BF2D' getRAT [6] SEQUENCE {}, - configureAutoEnable [7] SEQUENCE { - autoEnableFlag [0] NULL OPTIONAL, + configureImmediateEnable [7] SEQUENCE { + immediateEnableFlag [0] NULL OPTIONAL, smdpOid [1] OBJECT IDENTIFIER OPTIONAL, smdpAddress [2] UTF8String OPTIONAL } @@ -165,7 +165,7 @@ deleteResult [5] DeleteProfileResult, listProfileInfoResult [45] SGP32-ProfileInfoListResponse, getRATResult [6] RulesAuthorisationTable, -- see SGP.22 - configureAutoEnableResult [7] ConfigureAutoEnableResult, + configureImmediateEnableResult [7] ConfigureImmediateEnableResult, addEimResult [8] AddEimResult, deleteEimResult [9] DeleteEimResult, updateEimResult [10] UpdateEimResult, @@ -193,7 +193,7 @@ eimId [0] UTF8String, associationToken [4] INTEGER OPTIONAL } -ConfigureAutoEnableResult ::= INTEGER { +ConfigureImmediateEnableResult ::= INTEGER { ok(0), insufficientMemory(1), commandError(7), @@ -410,13 +410,13 @@ deleteFieldLoadedTestProfiles(1), resetDefaultSmdpAddress(2), resetEimConfigData(3), - resetAutoEnableConfig(4) + resetImmediateEnableConfig(4) } } SGP32-EuiccMemoryResetResponse ::= [52] SEQUENCE { -- Tag 'BF34' resetResult INTEGER {ok(0), nothingToDelete(1), catBusy(5), undefinedError(127)}, resetEimResult [1] INTEGER {ok(0), nothingToDelete(1), eimResetNotSupported(2), undefinedError(127)} OPTIONAL, - resetAutoEnableConfigResult [2] INTEGER {ok(0), resetAECNotSupported(1), undefinedError(127)} OPTIONAL + resetImmediateEnableConfigResult [2] INTEGER {ok(0), resetAECNotSupported(1), undefinedError(127)} OPTIONAL } -- Section 5.9.10 @@ -465,7 +465,7 @@ EnableUsingDDResponse ::= [90] SEQUENCE { -- Tag 'BF5A' enableUsingDDResult [0] INTEGER { ok(0), - autoEnableNotAvailable(1), + immediateEnableNotAvailable(1), noSessionContext(4), undefinedError(127) } @@ -493,18 +493,18 @@ -- Section 5.9.17 -- ASN1START -ConfigureAutoProfileEnablingRequest ::= [89] SEQUENCE { -- Tag 'BF59' - autoEnableFlag [0] NULL OPTIONAL, - smdpOid [1] OBJECT IDENTIFIER OPTIONAL, - smdpAddress [2] UTF8String OPTIONAL +ConfigureImmediateProfileEnablingRequest ::= [89] SEQUENCE { -- Tag 'BF59' + immediateEnableFlag [0] NULL OPTIONAL, + defaultSmdpOid [1] OBJECT IDENTIFIER OPTIONAL, + defaultSmdpAddress [2] UTF8String OPTIONAL } -- ASN1STOP -- ASN1START -ConfigureAutoProfileEnablingResponse ::= [89] SEQUENCE { -- Tag 'BF59' - configAutoEnableResult [0] INTEGER { + ConfigureImmediateProfileEnablingResponse ::= [89] SEQUENCE { -- Tag 'BF59' + configImmediateEnableResult [0] INTEGER { ok(0), insufficientMemory(1), - unsignedAutoEnableConfigDisallowed(2), + associatedEimAlreadyExists(2), undefinedError(127) } } diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt index ed1d4f9..8efadc9 100644 --- a/src/ipa/libasn/CMakeLists.txt +++ b/src/ipa/libasn/CMakeLists.txt @@ -186,12 +186,12 @@ CompactProfileInstallationResult.h CompactSuccessResult.c CompactSuccessResult.h -ConfigureAutoEnableResult.c -ConfigureAutoEnableResult.h -ConfigureAutoProfileEnablingRequest.c -ConfigureAutoProfileEnablingRequest.h -ConfigureAutoProfileEnablingResponse.c -ConfigureAutoProfileEnablingResponse.h +ConfigureImmediateEnableResult.c +ConfigureImmediateEnableResult.h +ConfigureImmediateProfileEnablingRequest.c +ConfigureImmediateProfileEnablingRequest.h +ConfigureImmediateProfileEnablingResponse.c +ConfigureImmediateProfileEnablingResponse.h ConfigureISDPRequest.c ConfigureISDPRequest.h constraints.c diff --git a/src/ipa/libasn/ConfigureAutoEnableResult.c b/src/ipa/libasn/ConfigureAutoEnableResult.c deleted file mode 100644 index 2562a44..0000000 --- a/src/ipa/libasn/ConfigureAutoEnableResult.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * 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 "ConfigureAutoEnableResult.h" - -/* - * This type is implemented using NativeInteger, - * so here we adjust the DEF accordingly. - */ -static const ber_tlv_tag_t asn_DEF_ConfigureAutoEnableResult_tags_1[] = { - (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)) -}; -asn_TYPE_descriptor_t asn_DEF_ConfigureAutoEnableResult = { - "ConfigureAutoEnableResult", - "ConfigureAutoEnableResult", - &asn_OP_NativeInteger, - asn_DEF_ConfigureAutoEnableResult_tags_1, - sizeof(asn_DEF_ConfigureAutoEnableResult_tags_1) - /sizeof(asn_DEF_ConfigureAutoEnableResult_tags_1[0]), /* 1 */ - asn_DEF_ConfigureAutoEnableResult_tags_1, /* Same as above */ - sizeof(asn_DEF_ConfigureAutoEnableResult_tags_1) - /sizeof(asn_DEF_ConfigureAutoEnableResult_tags_1[0]), /* 1 */ - { 0, 0, NativeInteger_constraint }, - 0, 0, /* Defined elsewhere */ - 0 /* No specifics */ -}; - diff --git a/src/ipa/libasn/ConfigureAutoEnableResult.h b/src/ipa/libasn/ConfigureAutoEnableResult.h deleted file mode 100644 index e7e33d6..0000000 --- a/src/ipa/libasn/ConfigureAutoEnableResult.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 _ConfigureAutoEnableResult_H_ -#define _ConfigureAutoEnableResult_H_ - - -#include <asn_application.h> - -/* Including external dependencies */ -#include <NativeInteger.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* Dependencies */ -typedef enum ConfigureAutoEnableResult { - ConfigureAutoEnableResult_ok = 0, - ConfigureAutoEnableResult_insufficientMemory = 1, - ConfigureAutoEnableResult_commandError = 7, - ConfigureAutoEnableResult_undefinedError = 127 -} e_ConfigureAutoEnableResult; - -/* ConfigureAutoEnableResult */ -typedef long ConfigureAutoEnableResult_t; - -/* Implementation */ -extern asn_TYPE_descriptor_t asn_DEF_ConfigureAutoEnableResult; -asn_struct_free_f ConfigureAutoEnableResult_free; -asn_struct_print_f ConfigureAutoEnableResult_print; -asn_constr_check_f ConfigureAutoEnableResult_constraint; -ber_type_decoder_f ConfigureAutoEnableResult_decode_ber; -der_type_encoder_f ConfigureAutoEnableResult_encode_der; -xer_type_decoder_f ConfigureAutoEnableResult_decode_xer; -xer_type_encoder_f ConfigureAutoEnableResult_encode_xer; -oer_type_decoder_f ConfigureAutoEnableResult_decode_oer; -oer_type_encoder_f ConfigureAutoEnableResult_encode_oer; -per_type_decoder_f ConfigureAutoEnableResult_decode_uper; -per_type_encoder_f ConfigureAutoEnableResult_encode_uper; - -#ifdef __cplusplus -} -#endif - -#endif /* _ConfigureAutoEnableResult_H_ */ -#include <asn_internal.h> diff --git a/src/ipa/libasn/ConfigureAutoProfileEnablingRequest.c b/src/ipa/libasn/ConfigureAutoProfileEnablingRequest.c deleted file mode 100644 index e0f9f6c..0000000 --- a/src/ipa/libasn/ConfigureAutoProfileEnablingRequest.c +++ /dev/null @@ -1,73 +0,0 @@ -/* - * 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 "ConfigureAutoProfileEnablingRequest.h" - -static asn_TYPE_member_t asn_MBR_ConfigureAutoProfileEnablingRequest_1[] = { - { ATF_POINTER, 3, offsetof(struct ConfigureAutoProfileEnablingRequest, autoEnableFlag), - (ASN_TAG_CLASS_CONTEXT | (0 << 2)), - -1, /* IMPLICIT tag at current level */ - &asn_DEF_NULL, - 0, - { 0, 0, 0 }, - 0, 0, /* No default value */ - "autoEnableFlag" - }, - { ATF_POINTER, 2, offsetof(struct ConfigureAutoProfileEnablingRequest, smdpOid), - (ASN_TAG_CLASS_CONTEXT | (1 << 2)), - -1, /* IMPLICIT tag at current level */ - &asn_DEF_OBJECT_IDENTIFIER, - 0, - { 0, 0, 0 }, - 0, 0, /* No default value */ - "smdpOid" - }, - { ATF_POINTER, 1, offsetof(struct ConfigureAutoProfileEnablingRequest, smdpAddress), - (ASN_TAG_CLASS_CONTEXT | (2 << 2)), - -1, /* IMPLICIT tag at current level */ - &asn_DEF_UTF8String, - 0, - { 0, 0, 0 }, - 0, 0, /* No default value */ - "smdpAddress" - }, -}; -static const int asn_MAP_ConfigureAutoProfileEnablingRequest_oms_1[] = { 0, 1, 2 }; -static const ber_tlv_tag_t asn_DEF_ConfigureAutoProfileEnablingRequest_tags_1[] = { - (ASN_TAG_CLASS_CONTEXT | (89 << 2)), - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) -}; -static const asn_TYPE_tag2member_t asn_MAP_ConfigureAutoProfileEnablingRequest_tag2el_1[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* autoEnableFlag */ - { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* smdpOid */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* smdpAddress */ -}; -static asn_SEQUENCE_specifics_t asn_SPC_ConfigureAutoProfileEnablingRequest_specs_1 = { - sizeof(struct ConfigureAutoProfileEnablingRequest), - offsetof(struct ConfigureAutoProfileEnablingRequest, _asn_ctx), - asn_MAP_ConfigureAutoProfileEnablingRequest_tag2el_1, - 3, /* Count of tags in the map */ - asn_MAP_ConfigureAutoProfileEnablingRequest_oms_1, /* Optional members */ - 3, 0, /* Root/Additions */ - 3, /* First extension addition */ -}; -asn_TYPE_descriptor_t asn_DEF_ConfigureAutoProfileEnablingRequest = { - "ConfigureAutoProfileEnablingRequest", - "ConfigureAutoProfileEnablingRequest", - &asn_OP_SEQUENCE, - asn_DEF_ConfigureAutoProfileEnablingRequest_tags_1, - sizeof(asn_DEF_ConfigureAutoProfileEnablingRequest_tags_1) - /sizeof(asn_DEF_ConfigureAutoProfileEnablingRequest_tags_1[0]) - 1, /* 1 */ - asn_DEF_ConfigureAutoProfileEnablingRequest_tags_1, /* Same as above */ - sizeof(asn_DEF_ConfigureAutoProfileEnablingRequest_tags_1) - /sizeof(asn_DEF_ConfigureAutoProfileEnablingRequest_tags_1[0]), /* 2 */ - { 0, 0, SEQUENCE_constraint }, - asn_MBR_ConfigureAutoProfileEnablingRequest_1, - 3, /* Elements count */ - &asn_SPC_ConfigureAutoProfileEnablingRequest_specs_1 /* Additional specs */ -}; - diff --git a/src/ipa/libasn/ConfigureAutoProfileEnablingRequest.h b/src/ipa/libasn/ConfigureAutoProfileEnablingRequest.h deleted file mode 100644 index 5294afd..0000000 --- a/src/ipa/libasn/ConfigureAutoProfileEnablingRequest.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * 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 _ConfigureAutoProfileEnablingRequest_H_ -#define _ConfigureAutoProfileEnablingRequest_H_ - - -#include <asn_application.h> - -/* Including external dependencies */ -#include <NULL.h> -#include <OBJECT_IDENTIFIER.h> -#include <UTF8String.h> -#include <constr_SEQUENCE.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* ConfigureAutoProfileEnablingRequest */ -typedef struct ConfigureAutoProfileEnablingRequest { - NULL_t *autoEnableFlag /* OPTIONAL */; - OBJECT_IDENTIFIER_t *smdpOid /* OPTIONAL */; - UTF8String_t *smdpAddress /* OPTIONAL */; - /* - * This type is extensible, - * possible extensions are below. - */ - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; -} ConfigureAutoProfileEnablingRequest_t; - -/* Implementation */ -extern asn_TYPE_descriptor_t asn_DEF_ConfigureAutoProfileEnablingRequest; - -#ifdef __cplusplus -} -#endif - -#endif /* _ConfigureAutoProfileEnablingRequest_H_ */ -#include <asn_internal.h> diff --git a/src/ipa/libasn/ConfigureAutoProfileEnablingResponse.c b/src/ipa/libasn/ConfigureAutoProfileEnablingResponse.c deleted file mode 100644 index 9cd5299..0000000 --- a/src/ipa/libasn/ConfigureAutoProfileEnablingResponse.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 "ConfigureAutoProfileEnablingResponse.h" - -static asn_TYPE_member_t asn_MBR_ConfigureAutoProfileEnablingResponse_1[] = { - { ATF_NOFLAGS, 0, offsetof(struct ConfigureAutoProfileEnablingResponse, configAutoEnableResult), - (ASN_TAG_CLASS_CONTEXT | (0 << 2)), - -1, /* IMPLICIT tag at current level */ - &asn_DEF_NativeInteger, - 0, - { 0, 0, 0 }, - 0, 0, /* No default value */ - "configAutoEnableResult" - }, -}; -static const ber_tlv_tag_t asn_DEF_ConfigureAutoProfileEnablingResponse_tags_1[] = { - (ASN_TAG_CLASS_CONTEXT | (89 << 2)), - (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) -}; -static const asn_TYPE_tag2member_t asn_MAP_ConfigureAutoProfileEnablingResponse_tag2el_1[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* configAutoEnableResult */ -}; -static asn_SEQUENCE_specifics_t asn_SPC_ConfigureAutoProfileEnablingResponse_specs_1 = { - sizeof(struct ConfigureAutoProfileEnablingResponse), - offsetof(struct ConfigureAutoProfileEnablingResponse, _asn_ctx), - asn_MAP_ConfigureAutoProfileEnablingResponse_tag2el_1, - 1, /* Count of tags in the map */ - 0, 0, 0, /* Optional elements (not needed) */ - 1, /* First extension addition */ -}; -asn_TYPE_descriptor_t asn_DEF_ConfigureAutoProfileEnablingResponse = { - "ConfigureAutoProfileEnablingResponse", - "ConfigureAutoProfileEnablingResponse", - &asn_OP_SEQUENCE, - asn_DEF_ConfigureAutoProfileEnablingResponse_tags_1, - sizeof(asn_DEF_ConfigureAutoProfileEnablingResponse_tags_1) - /sizeof(asn_DEF_ConfigureAutoProfileEnablingResponse_tags_1[0]) - 1, /* 1 */ - asn_DEF_ConfigureAutoProfileEnablingResponse_tags_1, /* Same as above */ - sizeof(asn_DEF_ConfigureAutoProfileEnablingResponse_tags_1) - /sizeof(asn_DEF_ConfigureAutoProfileEnablingResponse_tags_1[0]), /* 2 */ - { 0, 0, SEQUENCE_constraint }, - asn_MBR_ConfigureAutoProfileEnablingResponse_1, - 1, /* Elements count */ - &asn_SPC_ConfigureAutoProfileEnablingResponse_specs_1 /* Additional specs */ -}; - diff --git a/src/ipa/libasn/ConfigureAutoProfileEnablingResponse.h b/src/ipa/libasn/ConfigureAutoProfileEnablingResponse.h deleted file mode 100644 index 2d5d69e..0000000 --- a/src/ipa/libasn/ConfigureAutoProfileEnablingResponse.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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 _ConfigureAutoProfileEnablingResponse_H_ -#define _ConfigureAutoProfileEnablingResponse_H_ - - -#include <asn_application.h> - -/* Including external dependencies */ -#include <NativeInteger.h> -#include <constr_SEQUENCE.h> - -#ifdef __cplusplus -extern "C" { -#endif - -/* Dependencies */ -typedef enum ConfigureAutoProfileEnablingResponse__configAutoEnableResult { - ConfigureAutoProfileEnablingResponse__configAutoEnableResult_ok = 0, - ConfigureAutoProfileEnablingResponse__configAutoEnableResult_insufficientMemory = 1, - ConfigureAutoProfileEnablingResponse__configAutoEnableResult_unsignedAutoEnableConfigDisallowed = 2, - ConfigureAutoProfileEnablingResponse__configAutoEnableResult_undefinedError = 127 -} e_ConfigureAutoProfileEnablingResponse__configAutoEnableResult; - -/* ConfigureAutoProfileEnablingResponse */ -typedef struct ConfigureAutoProfileEnablingResponse { - long configAutoEnableResult; - /* - * This type is extensible, - * possible extensions are below. - */ - - /* Context for parsing across buffer boundaries */ - asn_struct_ctx_t _asn_ctx; -} ConfigureAutoProfileEnablingResponse_t; - -/* Implementation */ -extern asn_TYPE_descriptor_t asn_DEF_ConfigureAutoProfileEnablingResponse; - -#ifdef __cplusplus -} -#endif - -#endif /* _ConfigureAutoProfileEnablingResponse_H_ */ -#include <asn_internal.h> diff --git a/src/ipa/libasn/ConfigureImmediateEnableResult.c b/src/ipa/libasn/ConfigureImmediateEnableResult.c new file mode 100644 index 0000000..ea70b82 --- /dev/null +++ b/src/ipa/libasn/ConfigureImmediateEnableResult.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 "ConfigureImmediateEnableResult.h" + +/* + * This type is implemented using NativeInteger, + * so here we adjust the DEF accordingly. + */ +static const ber_tlv_tag_t asn_DEF_ConfigureImmediateEnableResult_tags_1[] = { + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)) +}; +asn_TYPE_descriptor_t asn_DEF_ConfigureImmediateEnableResult = { + "ConfigureImmediateEnableResult", + "ConfigureImmediateEnableResult", + &asn_OP_NativeInteger, + asn_DEF_ConfigureImmediateEnableResult_tags_1, + sizeof(asn_DEF_ConfigureImmediateEnableResult_tags_1) + /sizeof(asn_DEF_ConfigureImmediateEnableResult_tags_1[0]), /* 1 */ + asn_DEF_ConfigureImmediateEnableResult_tags_1, /* Same as above */ + sizeof(asn_DEF_ConfigureImmediateEnableResult_tags_1) + /sizeof(asn_DEF_ConfigureImmediateEnableResult_tags_1[0]), /* 1 */ + { 0, 0, NativeInteger_constraint }, + 0, 0, /* Defined elsewhere */ + 0 /* No specifics */ +}; + diff --git a/src/ipa/libasn/ConfigureImmediateEnableResult.h b/src/ipa/libasn/ConfigureImmediateEnableResult.h new file mode 100644 index 0000000..d687414 --- /dev/null +++ b/src/ipa/libasn/ConfigureImmediateEnableResult.h @@ -0,0 +1,51 @@ +/* + * 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 _ConfigureImmediateEnableResult_H_ +#define _ConfigureImmediateEnableResult_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NativeInteger.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dependencies */ +typedef enum ConfigureImmediateEnableResult { + ConfigureImmediateEnableResult_ok = 0, + ConfigureImmediateEnableResult_insufficientMemory = 1, + ConfigureImmediateEnableResult_commandError = 7, + ConfigureImmediateEnableResult_undefinedError = 127 +} e_ConfigureImmediateEnableResult; + +/* ConfigureImmediateEnableResult */ +typedef long ConfigureImmediateEnableResult_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ConfigureImmediateEnableResult; +asn_struct_free_f ConfigureImmediateEnableResult_free; +asn_struct_print_f ConfigureImmediateEnableResult_print; +asn_constr_check_f ConfigureImmediateEnableResult_constraint; +ber_type_decoder_f ConfigureImmediateEnableResult_decode_ber; +der_type_encoder_f ConfigureImmediateEnableResult_encode_der; +xer_type_decoder_f ConfigureImmediateEnableResult_decode_xer; +xer_type_encoder_f ConfigureImmediateEnableResult_encode_xer; +oer_type_decoder_f ConfigureImmediateEnableResult_decode_oer; +oer_type_encoder_f ConfigureImmediateEnableResult_encode_oer; +per_type_decoder_f ConfigureImmediateEnableResult_decode_uper; +per_type_encoder_f ConfigureImmediateEnableResult_encode_uper; + +#ifdef __cplusplus +} +#endif + +#endif /* _ConfigureImmediateEnableResult_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/ConfigureImmediateProfileEnablingRequest.c b/src/ipa/libasn/ConfigureImmediateProfileEnablingRequest.c new file mode 100644 index 0000000..b9e5f13 --- /dev/null +++ b/src/ipa/libasn/ConfigureImmediateProfileEnablingRequest.c @@ -0,0 +1,73 @@ +/* + * 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 "ConfigureImmediateProfileEnablingRequest.h" + +static asn_TYPE_member_t asn_MBR_ConfigureImmediateProfileEnablingRequest_1[] = { + { ATF_POINTER, 3, offsetof(struct ConfigureImmediateProfileEnablingRequest, immediateEnableFlag), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_NULL, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "immediateEnableFlag" + }, + { ATF_POINTER, 2, offsetof(struct ConfigureImmediateProfileEnablingRequest, defaultSmdpOid), + (ASN_TAG_CLASS_CONTEXT | (1 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_OBJECT_IDENTIFIER, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "defaultSmdpOid" + }, + { ATF_POINTER, 1, offsetof(struct ConfigureImmediateProfileEnablingRequest, defaultSmdpAddress), + (ASN_TAG_CLASS_CONTEXT | (2 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_UTF8String, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "defaultSmdpAddress" + }, +}; +static const int asn_MAP_ConfigureImmediateProfileEnablingRequest_oms_1[] = { 0, 1, 2 }; +static const ber_tlv_tag_t asn_DEF_ConfigureImmediateProfileEnablingRequest_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (89 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_ConfigureImmediateProfileEnablingRequest_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* immediateEnableFlag */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* defaultSmdpOid */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* defaultSmdpAddress */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_ConfigureImmediateProfileEnablingRequest_specs_1 = { + sizeof(struct ConfigureImmediateProfileEnablingRequest), + offsetof(struct ConfigureImmediateProfileEnablingRequest, _asn_ctx), + asn_MAP_ConfigureImmediateProfileEnablingRequest_tag2el_1, + 3, /* Count of tags in the map */ + asn_MAP_ConfigureImmediateProfileEnablingRequest_oms_1, /* Optional members */ + 3, 0, /* Root/Additions */ + 3, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_ConfigureImmediateProfileEnablingRequest = { + "ConfigureImmediateProfileEnablingRequest", + "ConfigureImmediateProfileEnablingRequest", + &asn_OP_SEQUENCE, + asn_DEF_ConfigureImmediateProfileEnablingRequest_tags_1, + sizeof(asn_DEF_ConfigureImmediateProfileEnablingRequest_tags_1) + /sizeof(asn_DEF_ConfigureImmediateProfileEnablingRequest_tags_1[0]) - 1, /* 1 */ + asn_DEF_ConfigureImmediateProfileEnablingRequest_tags_1, /* Same as above */ + sizeof(asn_DEF_ConfigureImmediateProfileEnablingRequest_tags_1) + /sizeof(asn_DEF_ConfigureImmediateProfileEnablingRequest_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_ConfigureImmediateProfileEnablingRequest_1, + 3, /* Elements count */ + &asn_SPC_ConfigureImmediateProfileEnablingRequest_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/ConfigureImmediateProfileEnablingRequest.h b/src/ipa/libasn/ConfigureImmediateProfileEnablingRequest.h new file mode 100644 index 0000000..577b2a9 --- /dev/null +++ b/src/ipa/libasn/ConfigureImmediateProfileEnablingRequest.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 _ConfigureImmediateProfileEnablingRequest_H_ +#define _ConfigureImmediateProfileEnablingRequest_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NULL.h> +#include <OBJECT_IDENTIFIER.h> +#include <UTF8String.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* ConfigureImmediateProfileEnablingRequest */ +typedef struct ConfigureImmediateProfileEnablingRequest { + NULL_t *immediateEnableFlag /* OPTIONAL */; + OBJECT_IDENTIFIER_t *defaultSmdpOid /* OPTIONAL */; + UTF8String_t *defaultSmdpAddress /* OPTIONAL */; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ConfigureImmediateProfileEnablingRequest_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ConfigureImmediateProfileEnablingRequest; + +#ifdef __cplusplus +} +#endif + +#endif /* _ConfigureImmediateProfileEnablingRequest_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/ConfigureImmediateProfileEnablingResponse.c b/src/ipa/libasn/ConfigureImmediateProfileEnablingResponse.c new file mode 100644 index 0000000..265742f --- /dev/null +++ b/src/ipa/libasn/ConfigureImmediateProfileEnablingResponse.c @@ -0,0 +1,51 @@ +/* + * 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 "ConfigureImmediateProfileEnablingResponse.h" + +static asn_TYPE_member_t asn_MBR_ConfigureImmediateProfileEnablingResponse_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct ConfigureImmediateProfileEnablingResponse, configImmediateEnableResult), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_NativeInteger, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "configImmediateEnableResult" + }, +}; +static const ber_tlv_tag_t asn_DEF_ConfigureImmediateProfileEnablingResponse_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (89 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_ConfigureImmediateProfileEnablingResponse_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* configImmediateEnableResult */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_ConfigureImmediateProfileEnablingResponse_specs_1 = { + sizeof(struct ConfigureImmediateProfileEnablingResponse), + offsetof(struct ConfigureImmediateProfileEnablingResponse, _asn_ctx), + asn_MAP_ConfigureImmediateProfileEnablingResponse_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_ConfigureImmediateProfileEnablingResponse = { + "ConfigureImmediateProfileEnablingResponse", + "ConfigureImmediateProfileEnablingResponse", + &asn_OP_SEQUENCE, + asn_DEF_ConfigureImmediateProfileEnablingResponse_tags_1, + sizeof(asn_DEF_ConfigureImmediateProfileEnablingResponse_tags_1) + /sizeof(asn_DEF_ConfigureImmediateProfileEnablingResponse_tags_1[0]) - 1, /* 1 */ + asn_DEF_ConfigureImmediateProfileEnablingResponse_tags_1, /* Same as above */ + sizeof(asn_DEF_ConfigureImmediateProfileEnablingResponse_tags_1) + /sizeof(asn_DEF_ConfigureImmediateProfileEnablingResponse_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_ConfigureImmediateProfileEnablingResponse_1, + 1, /* Elements count */ + &asn_SPC_ConfigureImmediateProfileEnablingResponse_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/ConfigureImmediateProfileEnablingResponse.h b/src/ipa/libasn/ConfigureImmediateProfileEnablingResponse.h new file mode 100644 index 0000000..8c1ba8f --- /dev/null +++ b/src/ipa/libasn/ConfigureImmediateProfileEnablingResponse.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 _ConfigureImmediateProfileEnablingResponse_H_ +#define _ConfigureImmediateProfileEnablingResponse_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NativeInteger.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dependencies */ +typedef enum ConfigureImmediateProfileEnablingResponse__configImmediateEnableResult { + ConfigureImmediateProfileEnablingResponse__configImmediateEnableResult_ok = 0, + ConfigureImmediateProfileEnablingResponse__configImmediateEnableResult_insufficientMemory = 1, + ConfigureImmediateProfileEnablingResponse__configImmediateEnableResult_associatedEimAlreadyExists = 2, + ConfigureImmediateProfileEnablingResponse__configImmediateEnableResult_undefinedError = 127 +} e_ConfigureImmediateProfileEnablingResponse__configImmediateEnableResult; + +/* ConfigureImmediateProfileEnablingResponse */ +typedef struct ConfigureImmediateProfileEnablingResponse { + long configImmediateEnableResult; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ConfigureImmediateProfileEnablingResponse_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ConfigureImmediateProfileEnablingResponse; + +#ifdef __cplusplus +} +#endif + +#endif /* _ConfigureImmediateProfileEnablingResponse_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/EnableUsingDDResponse.h b/src/ipa/libasn/EnableUsingDDResponse.h index 1b96777..faa2c26 100644 --- a/src/ipa/libasn/EnableUsingDDResponse.h +++ b/src/ipa/libasn/EnableUsingDDResponse.h @@ -22,7 +22,7 @@ /* Dependencies */ typedef enum EnableUsingDDResponse__enableUsingDDResult { EnableUsingDDResponse__enableUsingDDResult_ok = 0, - EnableUsingDDResponse__enableUsingDDResult_autoEnableNotAvailable = 1, + EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable = 1, EnableUsingDDResponse__enableUsingDDResult_noSessionContext = 4, EnableUsingDDResponse__enableUsingDDResult_undefinedError = 127 } e_EnableUsingDDResponse__enableUsingDDResult; diff --git a/src/ipa/libasn/EuiccResultData.c b/src/ipa/libasn/EuiccResultData.c index 0b10112..08f4119 100644 --- a/src/ipa/libasn/EuiccResultData.c +++ b/src/ipa/libasn/EuiccResultData.c @@ -61,14 +61,14 @@ 0, 0, /* No default value */ "getRATResult" }, - { ATF_NOFLAGS, 0, offsetof(struct EuiccResultData, choice.configureAutoEnableResult), + { ATF_NOFLAGS, 0, offsetof(struct EuiccResultData, choice.configureImmediateEnableResult), (ASN_TAG_CLASS_CONTEXT | (7 << 2)), -1, /* IMPLICIT tag at current level */ - &asn_DEF_ConfigureAutoEnableResult, + &asn_DEF_ConfigureImmediateEnableResult, 0, { 0, 0, 0 }, 0, 0, /* No default value */ - "configureAutoEnableResult" + "configureImmediateEnableResult" }, { ATF_NOFLAGS, 0, offsetof(struct EuiccResultData, choice.addEimResult), (ASN_TAG_CLASS_CONTEXT | (8 << 2)), @@ -133,7 +133,7 @@ { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 1, 0, 0 }, /* disableResult */ { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 2, 0, 0 }, /* deleteResult */ { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 4, 0, 0 }, /* getRATResult */ - { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 5, 0, 0 }, /* configureAutoEnableResult */ + { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 5, 0, 0 }, /* configureImmediateEnableResult */ { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 6, 0, 0 }, /* addEimResult */ { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 7, 0, 0 }, /* deleteEimResult */ { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 8, 0, 0 }, /* updateEimResult */ diff --git a/src/ipa/libasn/EuiccResultData.h b/src/ipa/libasn/EuiccResultData.h index 0fb818b..82ee724 100644 --- a/src/ipa/libasn/EuiccResultData.h +++ b/src/ipa/libasn/EuiccResultData.h @@ -17,7 +17,7 @@ #include "DeleteProfileResult.h" #include "SGP32-ProfileInfoListResponse.h" #include "RulesAuthorisationTable.h" -#include "ConfigureAutoEnableResult.h" +#include "ConfigureImmediateEnableResult.h" #include "AddEimResult.h" #include "DeleteEimResult.h" #include "UpdateEimResult.h" @@ -38,7 +38,7 @@ EuiccResultData_PR_deleteResult, EuiccResultData_PR_listProfileInfoResult, EuiccResultData_PR_getRATResult, - EuiccResultData_PR_configureAutoEnableResult, + EuiccResultData_PR_configureImmediateEnableResult, EuiccResultData_PR_addEimResult, EuiccResultData_PR_deleteEimResult, EuiccResultData_PR_updateEimResult, @@ -64,7 +64,7 @@ DeleteProfileResult_t deleteResult; SGP32_ProfileInfoListResponse_t listProfileInfoResult; RulesAuthorisationTable_t getRATResult; - ConfigureAutoEnableResult_t configureAutoEnableResult; + ConfigureImmediateEnableResult_t configureImmediateEnableResult; AddEimResult_t addEimResult; DeleteEimResult_t deleteEimResult; UpdateEimResult_t updateEimResult; diff --git a/src/ipa/libasn/Psmo.c b/src/ipa/libasn/Psmo.c index d12d132..6b8d207 100644 --- a/src/ipa/libasn/Psmo.c +++ b/src/ipa/libasn/Psmo.c @@ -184,17 +184,17 @@ &asn_SPC_getRAT_specs_13 /* Additional specs */ }; -static asn_TYPE_member_t asn_MBR_configureAutoEnable_15[] = { - { ATF_POINTER, 3, offsetof(struct Psmo__configureAutoEnable, autoEnableFlag), +static asn_TYPE_member_t asn_MBR_configureImmediateEnable_15[] = { + { ATF_POINTER, 3, offsetof(struct Psmo__configureImmediateEnable, immediateEnableFlag), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_NULL, 0, { 0, 0, 0 }, 0, 0, /* No default value */ - "autoEnableFlag" + "immediateEnableFlag" }, - { ATF_POINTER, 2, offsetof(struct Psmo__configureAutoEnable, smdpOid), + { ATF_POINTER, 2, offsetof(struct Psmo__configureImmediateEnable, smdpOid), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_OBJECT_IDENTIFIER, @@ -203,7 +203,7 @@ 0, 0, /* No default value */ "smdpOid" }, - { ATF_POINTER, 1, offsetof(struct Psmo__configureAutoEnable, smdpAddress), + { ATF_POINTER, 1, offsetof(struct Psmo__configureImmediateEnable, smdpAddress), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_UTF8String, @@ -213,40 +213,40 @@ "smdpAddress" }, }; -static const int asn_MAP_configureAutoEnable_oms_15[] = { 0, 1, 2 }; -static const ber_tlv_tag_t asn_DEF_configureAutoEnable_tags_15[] = { +static const int asn_MAP_configureImmediateEnable_oms_15[] = { 0, 1, 2 }; +static const ber_tlv_tag_t asn_DEF_configureImmediateEnable_tags_15[] = { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; -static const asn_TYPE_tag2member_t asn_MAP_configureAutoEnable_tag2el_15[] = { - { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* autoEnableFlag */ +static const asn_TYPE_tag2member_t asn_MAP_configureImmediateEnable_tag2el_15[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* immediateEnableFlag */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* smdpOid */ { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* smdpAddress */ }; -static asn_SEQUENCE_specifics_t asn_SPC_configureAutoEnable_specs_15 = { - sizeof(struct Psmo__configureAutoEnable), - offsetof(struct Psmo__configureAutoEnable, _asn_ctx), - asn_MAP_configureAutoEnable_tag2el_15, +static asn_SEQUENCE_specifics_t asn_SPC_configureImmediateEnable_specs_15 = { + sizeof(struct Psmo__configureImmediateEnable), + offsetof(struct Psmo__configureImmediateEnable, _asn_ctx), + asn_MAP_configureImmediateEnable_tag2el_15, 3, /* Count of tags in the map */ - asn_MAP_configureAutoEnable_oms_15, /* Optional members */ + asn_MAP_configureImmediateEnable_oms_15, /* Optional members */ 3, 0, /* Root/Additions */ 3, /* First extension addition */ }; static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_configureAutoEnable_15 = { - "configureAutoEnable", - "configureAutoEnable", +asn_TYPE_descriptor_t asn_DEF_configureImmediateEnable_15 = { + "configureImmediateEnable", + "configureImmediateEnable", &asn_OP_SEQUENCE, - asn_DEF_configureAutoEnable_tags_15, - sizeof(asn_DEF_configureAutoEnable_tags_15) - /sizeof(asn_DEF_configureAutoEnable_tags_15[0]) - 1, /* 1 */ - asn_DEF_configureAutoEnable_tags_15, /* Same as above */ - sizeof(asn_DEF_configureAutoEnable_tags_15) - /sizeof(asn_DEF_configureAutoEnable_tags_15[0]), /* 2 */ + asn_DEF_configureImmediateEnable_tags_15, + sizeof(asn_DEF_configureImmediateEnable_tags_15) + /sizeof(asn_DEF_configureImmediateEnable_tags_15[0]) - 1, /* 1 */ + asn_DEF_configureImmediateEnable_tags_15, /* Same as above */ + sizeof(asn_DEF_configureImmediateEnable_tags_15) + /sizeof(asn_DEF_configureImmediateEnable_tags_15[0]), /* 2 */ { 0, 0, SEQUENCE_constraint }, - asn_MBR_configureAutoEnable_15, + asn_MBR_configureImmediateEnable_15, 3, /* Elements count */ - &asn_SPC_configureAutoEnable_specs_15 /* Additional specs */ + &asn_SPC_configureImmediateEnable_specs_15 /* Additional specs */ }; asn_TYPE_member_t asn_MBR_Psmo_1[] = { @@ -295,14 +295,14 @@ 0, 0, /* No default value */ "getRAT" }, - { ATF_NOFLAGS, 0, offsetof(struct Psmo, choice.configureAutoEnable), + { ATF_NOFLAGS, 0, offsetof(struct Psmo, choice.configureImmediateEnable), (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 0, - &asn_DEF_configureAutoEnable_15, + &asn_DEF_configureImmediateEnable_15, 0, { 0, 0, 0 }, 0, 0, /* No default value */ - "configureAutoEnable" + "configureImmediateEnable" }, }; static const unsigned asn_MAP_Psmo_to_canonical_1[] = { 0, 1, 2, 4, 5, 3 }; @@ -312,7 +312,7 @@ { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 1, 0, 0 }, /* disable */ { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 2, 0, 0 }, /* delete */ { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 4, 0, 0 }, /* getRAT */ - { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 5, 0, 0 }, /* configureAutoEnable */ + { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 5, 0, 0 }, /* configureImmediateEnable */ { (ASN_TAG_CLASS_CONTEXT | (45 << 2)), 3, 0, 0 } /* listProfileInfo */ }; asn_CHOICE_specifics_t asn_SPC_Psmo_specs_1 = { diff --git a/src/ipa/libasn/Psmo.h b/src/ipa/libasn/Psmo.h index 5e792f2..9e9c22f 100644 --- a/src/ipa/libasn/Psmo.h +++ b/src/ipa/libasn/Psmo.h @@ -32,7 +32,7 @@ Psmo_PR_delete, Psmo_PR_listProfileInfo, Psmo_PR_getRAT, - Psmo_PR_configureAutoEnable + Psmo_PR_configureImmediateEnable /* Extensions may appear below */ } Psmo_PR; @@ -82,8 +82,8 @@ /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } getRAT; - struct Psmo__configureAutoEnable { - NULL_t *autoEnableFlag /* OPTIONAL */; + struct Psmo__configureImmediateEnable { + NULL_t *immediateEnableFlag /* OPTIONAL */; OBJECT_IDENTIFIER_t *smdpOid /* OPTIONAL */; UTF8String_t *smdpAddress /* OPTIONAL */; /* @@ -93,7 +93,7 @@ /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; - } configureAutoEnable; + } configureImmediateEnable; /* * This type is extensible, * possible extensions are below. diff --git a/src/ipa/libasn/SGP32-EuiccMemoryResetRequest.h b/src/ipa/libasn/SGP32-EuiccMemoryResetRequest.h index 802f191..0761f51 100644 --- a/src/ipa/libasn/SGP32-EuiccMemoryResetRequest.h +++ b/src/ipa/libasn/SGP32-EuiccMemoryResetRequest.h @@ -25,7 +25,7 @@ SGP32_EuiccMemoryResetRequest__resetOptions_deleteFieldLoadedTestProfiles = 1, SGP32_EuiccMemoryResetRequest__resetOptions_resetDefaultSmdpAddress = 2, SGP32_EuiccMemoryResetRequest__resetOptions_resetEimConfigData = 3, - SGP32_EuiccMemoryResetRequest__resetOptions_resetAutoEnableConfig = 4 + SGP32_EuiccMemoryResetRequest__resetOptions_resetImmediateEnableConfig = 4 } e_SGP32_EuiccMemoryResetRequest__resetOptions; /* SGP32-EuiccMemoryResetRequest */ diff --git a/src/ipa/libasn/SGP32-EuiccMemoryResetResponse.c b/src/ipa/libasn/SGP32-EuiccMemoryResetResponse.c index 645ea50..cc66531 100644 --- a/src/ipa/libasn/SGP32-EuiccMemoryResetResponse.c +++ b/src/ipa/libasn/SGP32-EuiccMemoryResetResponse.c @@ -26,14 +26,14 @@ 0, 0, /* No default value */ "resetEimResult" }, - { ATF_POINTER, 1, offsetof(struct SGP32_EuiccMemoryResetResponse, resetAutoEnableConfigResult), + { ATF_POINTER, 1, offsetof(struct SGP32_EuiccMemoryResetResponse, resetImmediateEnableConfigResult), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_NativeInteger, 0, { 0, 0, 0 }, 0, 0, /* No default value */ - "resetAutoEnableConfigResult" + "resetImmediateEnableConfigResult" }, }; static const int asn_MAP_SGP32_EuiccMemoryResetResponse_oms_1[] = { 1, 2 }; @@ -44,7 +44,7 @@ static const asn_TYPE_tag2member_t asn_MAP_SGP32_EuiccMemoryResetResponse_tag2el_1[] = { { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, 0, 0 }, /* resetResult */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* resetEimResult */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* resetAutoEnableConfigResult */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* resetImmediateEnableConfigResult */ }; static asn_SEQUENCE_specifics_t asn_SPC_SGP32_EuiccMemoryResetResponse_specs_1 = { sizeof(struct SGP32_EuiccMemoryResetResponse), diff --git a/src/ipa/libasn/SGP32-EuiccMemoryResetResponse.h b/src/ipa/libasn/SGP32-EuiccMemoryResetResponse.h index 434b3d4..da8bcb6 100644 --- a/src/ipa/libasn/SGP32-EuiccMemoryResetResponse.h +++ b/src/ipa/libasn/SGP32-EuiccMemoryResetResponse.h @@ -32,17 +32,17 @@ SGP32_EuiccMemoryResetResponse__resetEimResult_eimResetNotSupported = 2, SGP32_EuiccMemoryResetResponse__resetEimResult_undefinedError = 127 } e_SGP32_EuiccMemoryResetResponse__resetEimResult; -typedef enum SGP32_EuiccMemoryResetResponse__resetAutoEnableConfigResult { - SGP32_EuiccMemoryResetResponse__resetAutoEnableConfigResult_ok = 0, - SGP32_EuiccMemoryResetResponse__resetAutoEnableConfigResult_resetAECNotSupported = 1, - SGP32_EuiccMemoryResetResponse__resetAutoEnableConfigResult_undefinedError = 127 -} e_SGP32_EuiccMemoryResetResponse__resetAutoEnableConfigResult; +typedef enum SGP32_EuiccMemoryResetResponse__resetImmediateEnableConfigResult { + SGP32_EuiccMemoryResetResponse__resetImmediateEnableConfigResult_ok = 0, + SGP32_EuiccMemoryResetResponse__resetImmediateEnableConfigResult_resetAECNotSupported = 1, + SGP32_EuiccMemoryResetResponse__resetImmediateEnableConfigResult_undefinedError = 127 +} e_SGP32_EuiccMemoryResetResponse__resetImmediateEnableConfigResult; /* SGP32-EuiccMemoryResetResponse */ typedef struct SGP32_EuiccMemoryResetResponse { long resetResult; long *resetEimResult /* OPTIONAL */; - long *resetAutoEnableConfigResult /* OPTIONAL */; + long *resetImmediateEnableConfigResult /* OPTIONAL */; /* * This type is extensible, * possible extensions are below. diff --git a/src/ipa/libipa/es10b_enable_using_dd.c b/src/ipa/libipa/es10b_enable_using_dd.c index ebf043b..61ba9bb 100644 --- a/src/ipa/libipa/es10b_enable_using_dd.c +++ b/src/ipa/libipa/es10b_enable_using_dd.c @@ -28,7 +28,7 @@ static const struct num_str_map error_code_strings[] = { { EnableUsingDDResponse__enableUsingDDResult_ok, "ok" }, - { EnableUsingDDResponse__enableUsingDDResult_autoEnableNotAvailable, "autoEnableNotAvailable" }, + { EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable, "immediateEnableNotAvailable" }, { EnableUsingDDResponse__enableUsingDDResult_noSessionContext, "noSessionContext" }, { EnableUsingDDResponse__enableUsingDDResult_undefinedError, "undefinedError" }, { 0, NULL } @@ -94,14 +94,14 @@ /* Auto enable must be active */ if (ctx->nvstate.iot_euicc_emu.auto_enable.flag == false) { - rc = EnableUsingDDResponse__enableUsingDDResult_autoEnableNotAvailable; + rc = EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable; goto error; } /* We also need either the smdp_oid or the smdp_address to verify against */ if (ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid == NULL && ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address == NULL) { - rc = EnableUsingDDResponse__enableUsingDDResult_autoEnableNotAvailable; + rc = EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable; goto error; } @@ -123,13 +123,13 @@ if (ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid) { if (ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid->len != ctx->iot_euicc_emu.auto_enable.smdp_oid->len) { - rc = EnableUsingDDResponse__enableUsingDDResult_autoEnableNotAvailable; + rc = EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable; goto error; } if (memcmp(ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid->data, ctx->iot_euicc_emu.auto_enable.smdp_oid->data, ctx->iot_euicc_emu.auto_enable.smdp_oid->len)) { - rc = EnableUsingDDResponse__enableUsingDDResult_autoEnableNotAvailable; + rc = EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable; goto error; } } @@ -138,13 +138,13 @@ if (ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address) { if (ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address->len != ctx->iot_euicc_emu.auto_enable.smdp_address->len) { - rc = EnableUsingDDResponse__enableUsingDDResult_autoEnableNotAvailable; + rc = EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable; goto error; } if (memcmp(ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address->data, ctx->iot_euicc_emu.auto_enable.smdp_address->data, ctx->iot_euicc_emu.auto_enable.smdp_address->len)) { - rc = EnableUsingDDResponse__enableUsingDDResult_autoEnableNotAvailable; + rc = EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable; goto error; } } diff --git a/src/ipa/libipa/es10b_euicc_mem_rst.c b/src/ipa/libipa/es10b_euicc_mem_rst.c index 2869caf..f57eb8e 100644 --- a/src/ipa/libipa/es10b_euicc_mem_rst.c +++ b/src/ipa/libipa/es10b_euicc_mem_rst.c @@ -50,10 +50,10 @@ { 0, NULL } }; -static const struct num_str_map sgp32_error_code_strings_resetAutoEnableConfigResult[] = { - { SGP32_EuiccMemoryResetResponse__resetAutoEnableConfigResult_ok, "ok" }, - { SGP32_EuiccMemoryResetResponse__resetAutoEnableConfigResult_resetAECNotSupported, "nothingToDelete" }, - { SGP32_EuiccMemoryResetResponse__resetAutoEnableConfigResult_undefinedError, "eimResetNotSupported" }, +static const struct num_str_map sgp32_error_code_strings_resetImmediateEnableConfigResult[] = { + { SGP32_EuiccMemoryResetResponse__resetImmediateEnableConfigResult_ok, "ok" }, + { SGP32_EuiccMemoryResetResponse__resetImmediateEnableConfigResult_resetAECNotSupported, "nothingToDelete" }, + { SGP32_EuiccMemoryResetResponse__resetImmediateEnableConfigResult_undefinedError, "eimResetNotSupported" }, { 0, NULL } }; @@ -90,14 +90,14 @@ asn->resetResult, "(unknown)")); } - if (asn->resetResult != SGP32_EuiccMemoryResetResponse__resetAutoEnableConfigResult_ok) { + if (asn->resetResult != SGP32_EuiccMemoryResetResponse__resetImmediateEnableConfigResult_ok) { IPA_LOGP_ES10X("eUICCMemoryReset", LERROR, "function failed with error code %ld=%s!\n", - asn->resetResult, ipa_str_from_num(sgp32_error_code_strings_resetAutoEnableConfigResult, + asn->resetResult, ipa_str_from_num(sgp32_error_code_strings_resetImmediateEnableConfigResult, asn->resetResult, "(unknown)")); rc = -EINVAL; } else { IPA_LOGP_ES10X("eUICCMemoryReset", LERROR, "function succeeded with status code %ld=%s!\n", - asn->resetResult, ipa_str_from_num(sgp32_error_code_strings_resetAutoEnableConfigResult, + asn->resetResult, ipa_str_from_num(sgp32_error_code_strings_resetImmediateEnableConfigResult, asn->resetResult, "(unknown)")); } @@ -151,7 +151,7 @@ if (req->eim_cfg_data) rst_opt[0] |= (1 << (7 - SGP32_EuiccMemoryResetRequest__resetOptions_resetEimConfigData)); if (req->auto_enable_cfg) - rst_opt[0] |= (1 << (7 - SGP32_EuiccMemoryResetRequest__resetOptions_resetAutoEnableConfig)); + rst_opt[0] |= (1 << (7 - SGP32_EuiccMemoryResetRequest__resetOptions_resetImmediateEnableConfig)); es10b_req = ipa_es10x_req_enc(&asn_DEF_SGP32_EuiccMemoryResetRequest, &mem_rst_req, "eUICCMemoryReset"); if (!es10b_req) { diff --git a/src/ipa/libipa/es10b_load_euicc_pkg.c b/src/ipa/libipa/es10b_load_euicc_pkg.c index eb223d2..c25ebc9 100644 --- a/src/ipa/libipa/es10b_load_euicc_pkg.c +++ b/src/ipa/libipa/es10b_load_euicc_pkg.c @@ -233,15 +233,15 @@ return euicc_result_data; } -struct EuiccResultData *iot_emo_do_configureAutoEnable_psmo(struct ipa_context *ctx, const struct Psmo__configureAutoEnable - *configureAutoEnable_psmo) +struct EuiccResultData *iot_emo_do_configureImmediateEnable_psmo(struct ipa_context *ctx, const struct Psmo__configureImmediateEnable + *configureImmediateEnable_psmo) { struct EuiccResultData *euicc_result_data = IPA_ALLOC_ZERO(struct EuiccResultData); - euicc_result_data->present = EuiccResultData_PR_configureAutoEnableResult; + euicc_result_data->present = EuiccResultData_PR_configureImmediateEnableResult; - /* Update autoEnableFlag */ - if (configureAutoEnable_psmo->autoEnableFlag) + /* Update immediateEnableFlag */ + if (configureImmediateEnable_psmo->immediateEnableFlag) ctx->nvstate.iot_euicc_emu.auto_enable.flag = true; else ctx->nvstate.iot_euicc_emu.auto_enable.flag = false; @@ -249,17 +249,17 @@ /* Update smdpOid */ ipa_buf_free(ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid); ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid = NULL; - if (configureAutoEnable_psmo->smdpOid) - ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid = IPA_BUF_FROM_ASN(configureAutoEnable_psmo->smdpOid); + if (configureImmediateEnable_psmo->smdpOid) + ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid = IPA_BUF_FROM_ASN(configureImmediateEnable_psmo->smdpOid); /* Update smdpAddress */ ipa_buf_free(ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address); ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address = NULL; - if (configureAutoEnable_psmo->smdpAddress) + if (configureImmediateEnable_psmo->smdpAddress) ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address = - IPA_BUF_FROM_ASN(configureAutoEnable_psmo->smdpAddress); + IPA_BUF_FROM_ASN(configureImmediateEnable_psmo->smdpAddress); - euicc_result_data->choice.configureAutoEnableResult = ConfigureAutoEnableResult_ok; + euicc_result_data->choice.configureImmediateEnableResult = ConfigureImmediateEnableResult_ok; return euicc_result_data; } @@ -594,9 +594,9 @@ case Psmo_PR_getRAT: psmo_result = iot_emo_do_getRAT_psmo(ctx, &psmo->choice.getRAT); break; - case Psmo_PR_configureAutoEnable: + case Psmo_PR_configureImmediateEnable: psmo_result = - iot_emo_do_configureAutoEnable_psmo(ctx, &psmo->choice.configureAutoEnable); + iot_emo_do_configureImmediateEnable_psmo(ctx, &psmo->choice.configureImmediateEnable); break; default: IPA_LOGP_ES10X("LoadEuiccPackage", LERROR, "ignoring invalid or unsupported PSMO!\n"); -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43023?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: I2b18e5cf65269347ce40e5e9560ab934e75a92a6 Gerrit-Change-Number: 43023 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
[S] Change in onomondo-ipa[master]: V1.2: Rename EuiccPackageSigned.transactionId to EuiccPackageSigned.e...
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43027?usp=email
) Change subject: V1.2: Rename EuiccPackageSigned.transactionId to EuiccPackageSigned.eimTransactionId ...................................................................... V1.2: Rename EuiccPackageSigned.transactionId to EuiccPackageSigned.eimTransactionId Reference: SGP.32 Section 2.11.1.1 Related: SYS#8101 Change-Id: I46270d626d64f4ca6513423d9cebfc929076027d --- M asn1/SGP32Definitions.asn M src/ipa/libasn/EuiccPackageSigned.c M src/ipa/libasn/EuiccPackageSigned.h M src/ipa/libipa/es10b_load_euicc_pkg.c 4 files changed, 7 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/27/43027/1 diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index 9b5da2f..dc09a83 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -33,7 +33,7 @@ eimId [0] UTF8String, eidValue [APPLICATION 26] Octet16, -- Tag '5A' counterValue [1] INTEGER, - transactionId [2] TransactionId OPTIONAL, + eimTransactionId [2] TransactionId OPTIONAL, euiccPackage EuiccPackage } EuiccPackage ::= CHOICE { diff --git a/src/ipa/libasn/EuiccPackageSigned.c b/src/ipa/libasn/EuiccPackageSigned.c index a6f9820..abc9109 100644 --- a/src/ipa/libasn/EuiccPackageSigned.c +++ b/src/ipa/libasn/EuiccPackageSigned.c @@ -35,14 +35,14 @@ 0, 0, /* No default value */ "counterValue" }, - { ATF_POINTER, 1, offsetof(struct EuiccPackageSigned, transactionId), + { ATF_POINTER, 1, offsetof(struct EuiccPackageSigned, 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 */ - "transactionId" + "eimTransactionId" }, { ATF_NOFLAGS, 0, offsetof(struct EuiccPackageSigned, euiccPackage), -1 /* Ambiguous tag (CHOICE?) */, @@ -64,7 +64,7 @@ { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 4, -1, 0 }, /* psmoList */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 1 }, /* counterValue */ { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 4, -1, 0 }, /* ecoList */ - { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 3, 0, 0 } /* transactionId */ + { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 3, 0, 0 } /* eimTransactionId */ }; asn_SEQUENCE_specifics_t asn_SPC_EuiccPackageSigned_specs_1 = { sizeof(struct EuiccPackageSigned), diff --git a/src/ipa/libasn/EuiccPackageSigned.h b/src/ipa/libasn/EuiccPackageSigned.h index 6434408..a04f372 100644 --- a/src/ipa/libasn/EuiccPackageSigned.h +++ b/src/ipa/libasn/EuiccPackageSigned.h @@ -28,7 +28,7 @@ UTF8String_t eimId; Octet16_t eidValue; long counterValue; - TransactionId_t *transactionId /* OPTIONAL */; + TransactionId_t *eimTransactionId /* OPTIONAL */; EuiccPackage_t euiccPackage; /* * This type is extensible, diff --git a/src/ipa/libipa/es10b_load_euicc_pkg.c b/src/ipa/libipa/es10b_load_euicc_pkg.c index 54cf3d9..0026d53 100644 --- a/src/ipa/libipa/es10b_load_euicc_pkg.c +++ b/src/ipa/libipa/es10b_load_euicc_pkg.c @@ -566,9 +566,9 @@ IPA_COPY_IPA_BUF_TO_ASN(&asn->choice.euiccPackageResultSigned.euiccPackageResultDataSigned.eimId, &eim_id); asn->choice.euiccPackageResultSigned.euiccPackageResultDataSigned.counterValue = req->req.euiccPackageSigned.counterValue; - if (req->req.euiccPackageSigned.transactionId) { + if (req->req.euiccPackageSigned.eimTransactionId) { asn->choice.euiccPackageResultSigned.euiccPackageResultDataSigned.transactionId = - ipa_asn1c_dup(&asn_DEF_TransactionId, req->req.euiccPackageSigned.transactionId); + ipa_asn1c_dup(&asn_DEF_TransactionId, req->req.euiccPackageSigned.eimTransactionId); } asn->choice.euiccPackageResultSigned.euiccPackageResultDataSigned.seqNumber = 0; ipa_buf_assign(&euicc_sign_epr, euiccSignEPR_dummy, sizeof(euiccSignEPR_dummy)); -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43027?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: I46270d626d64f4ca6513423d9cebfc929076027d Gerrit-Change-Number: 43027 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
[S] Change in onomondo-ipa[master]: V1.2: Add size constraint to EimConfigurationData.eimId
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43028?usp=email
) Change subject: V1.2: Add size constraint to EimConfigurationData.eimId ...................................................................... V1.2: Add size constraint to EimConfigurationData.eimId The size constraint has no impact on the existing code, because it only reads string data from structure. Reference: SGP.32 Section 2.11.1.1.1 Related: SYS#8101 Change-Id: Iafe940876763215a28b9f9067eda090f25ad836c --- M asn1/SGP32Definitions.asn M src/ipa/libasn/EimConfigurationData.c 2 files changed, 42 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/28/43028/1 diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index dc09a83..a9d18b4 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -46,7 +46,7 @@ -- Section 2.11.1.1.1 -- ASN1START EimConfigurationData ::= SEQUENCE { - eimId [0] UTF8String, -- eimId of eIM + eimId [0] UTF8String (SIZE(1..128)), -- eimId of eIM eimFqdn [1] UTF8String OPTIONAL, -- FQDN of eIM eimIdType [2] EimIdType OPTIONAL, counterValue [3] INTEGER OPTIONAL, -- initial counterValue for the eIM diff --git a/src/ipa/libasn/EimConfigurationData.c b/src/ipa/libasn/EimConfigurationData.c index d01e003..2ca5ed5 100644 --- a/src/ipa/libasn/EimConfigurationData.c +++ b/src/ipa/libasn/EimConfigurationData.c @@ -7,6 +7,38 @@ #include "EimConfigurationData.h" +static int +memb_eimId_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr, + asn_app_constraint_failed_f *ctfailcb, void *app_key) { + const UTF8String_t *st = (const UTF8String_t *)sptr; + size_t size; + + if(!sptr) { + ASN__CTFAIL(app_key, td, sptr, + "%s: value not given (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + size = UTF8String_length(st); + if((ssize_t)size < 0) { + ASN__CTFAIL(app_key, td, sptr, + "%s: UTF-8: broken encoding (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + if((size >= 1 && size <= 128)) { + /* Constraint check succeeded */ + return 0; + } else { + ASN__CTFAIL(app_key, td, sptr, + "%s: constraint failed (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } +} + static asn_oer_constraints_t asn_OER_type_eimPublicKeyData_constr_7 CC_NOTUSED = { { 0, 0 }, -1}; @@ -23,6 +55,14 @@ { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ }; +static asn_oer_constraints_t asn_OER_memb_eimId_constr_2 CC_NOTUSED = { + { 0, 0 }, + -1 /* (SIZE(0..MAX)) */}; +static asn_per_constraints_t asn_PER_memb_eimId_constr_2 CC_NOTUSED = { + { APC_UNCONSTRAINED, -1, -1, 0, 0 }, + { APC_UNCONSTRAINED, -1, -1, 0, 0 }, + 0, 0 /* No PER value map */ +}; static asn_TYPE_member_t asn_MBR_eimPublicKeyData_7[] = { { ATF_NOFLAGS, 0, offsetof(struct EimConfigurationData__eimPublicKeyData, choice.eimPublicKey), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), @@ -127,7 +167,7 @@ -1, /* IMPLICIT tag at current level */ &asn_DEF_UTF8String, 0, - { 0, 0, 0 }, + { &asn_OER_memb_eimId_constr_2, &asn_PER_memb_eimId_constr_2, memb_eimId_constraint_1 }, 0, 0, /* No default value */ "eimId" }, -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43028?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: Iafe940876763215a28b9f9067eda090f25ad836c Gerrit-Change-Number: 43028 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
[M] Change in onomondo-ipa[master]: V1.2: Add EimConfigurationData.indirectProfileDownload
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43029?usp=email
) Change subject: V1.2: Add EimConfigurationData.indirectProfileDownload ...................................................................... V1.2: Add EimConfigurationData.indirectProfileDownload The flag indicates, if eIM supports indirect download. As the current version of IPA only supports indirect download, this flag is checked. If it is not supported, profile download is rejected. get_euicc_ci_pkid() is renamed to get_euicc_ci_pkid_ipd(), to indicate that it also gets this flag. This also requires an update of contrib/sample_eim_cfg.ber, which is a BER encoded EimConfigurationData. Reference: SGP.32 Section 2.11.1.1.1 Related: SYS#8101 Change-Id: Ic40111531e6f35d5ea7f3789de6cae0f1c0d5ba7 --- M asn1/SGP32Definitions.asn M contrib/sample_eim_cfg.ber M src/ipa/libasn/EimConfigurationData.c M src/ipa/libasn/EimConfigurationData.h M src/ipa/libipa/proc_eim_pkg_retr.c 5 files changed, 42 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/29/43029/1 diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index a9d18b4..3b91400 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -60,7 +60,8 @@ trustedCertificateTls Certificate -- either the certificate of eIM, used for (D)TLS, or the certificate of the CA, where the encoding follows X.509 standard } OPTIONAL, eimSupportedProtocol [7] EimSupportedProtocol OPTIONAL, - euiccCiPKId [8] SubjectKeyIdentifier OPTIONAL -- CI Public Key Identifier supported on the eUICC for signature creation + euiccCiPKId [8] SubjectKeyIdentifier OPTIONAL, -- CI Public Key Identifier supported on the eUICC for signature creation + indirectProfileDownload[9] NULL OPTIONAL -- support of Indirect Profile download with indicated EimSupportedProtocol } EimIdType ::= INTEGER { eimIdTypeOid(1), diff --git a/contrib/sample_eim_cfg.ber b/contrib/sample_eim_cfg.ber index ba48514..0c0d00f 100644 --- a/contrib/sample_eim_cfg.ber +++ b/contrib/sample_eim_cfg.ber Binary files differ diff --git a/src/ipa/libasn/EimConfigurationData.c b/src/ipa/libasn/EimConfigurationData.c index 2ca5ed5..90bb101 100644 --- a/src/ipa/libasn/EimConfigurationData.c +++ b/src/ipa/libasn/EimConfigurationData.c @@ -171,7 +171,7 @@ 0, 0, /* No default value */ "eimId" }, - { ATF_POINTER, 8, offsetof(struct EimConfigurationData, eimFqdn), + { ATF_POINTER, 9, offsetof(struct EimConfigurationData, eimFqdn), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_UTF8String, @@ -180,7 +180,7 @@ 0, 0, /* No default value */ "eimFqdn" }, - { ATF_POINTER, 7, offsetof(struct EimConfigurationData, eimIdType), + { ATF_POINTER, 8, offsetof(struct EimConfigurationData, eimIdType), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_EimIdType, @@ -189,7 +189,7 @@ 0, 0, /* No default value */ "eimIdType" }, - { ATF_POINTER, 6, offsetof(struct EimConfigurationData, counterValue), + { ATF_POINTER, 7, offsetof(struct EimConfigurationData, counterValue), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_NativeInteger, @@ -198,7 +198,7 @@ 0, 0, /* No default value */ "counterValue" }, - { ATF_POINTER, 5, offsetof(struct EimConfigurationData, associationToken), + { ATF_POINTER, 6, offsetof(struct EimConfigurationData, associationToken), (ASN_TAG_CLASS_CONTEXT | (4 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_NativeInteger, @@ -207,7 +207,7 @@ 0, 0, /* No default value */ "associationToken" }, - { ATF_POINTER, 4, offsetof(struct EimConfigurationData, eimPublicKeyData), + { ATF_POINTER, 5, offsetof(struct EimConfigurationData, eimPublicKeyData), (ASN_TAG_CLASS_CONTEXT | (5 << 2)), +1, /* EXPLICIT tag at current level */ &asn_DEF_eimPublicKeyData_7, @@ -216,7 +216,7 @@ 0, 0, /* No default value */ "eimPublicKeyData" }, - { ATF_POINTER, 3, offsetof(struct EimConfigurationData, trustedPublicKeyDataTls), + { ATF_POINTER, 4, offsetof(struct EimConfigurationData, trustedPublicKeyDataTls), (ASN_TAG_CLASS_CONTEXT | (6 << 2)), +1, /* EXPLICIT tag at current level */ &asn_DEF_trustedPublicKeyDataTls_11, @@ -225,7 +225,7 @@ 0, 0, /* No default value */ "trustedPublicKeyDataTls" }, - { ATF_POINTER, 2, offsetof(struct EimConfigurationData, eimSupportedProtocol), + { ATF_POINTER, 3, offsetof(struct EimConfigurationData, eimSupportedProtocol), (ASN_TAG_CLASS_CONTEXT | (7 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_EimSupportedProtocol, @@ -234,7 +234,7 @@ 0, 0, /* No default value */ "eimSupportedProtocol" }, - { ATF_POINTER, 1, offsetof(struct EimConfigurationData, euiccCiPKId), + { ATF_POINTER, 2, offsetof(struct EimConfigurationData, euiccCiPKId), (ASN_TAG_CLASS_CONTEXT | (8 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_SubjectKeyIdentifier, @@ -243,8 +243,17 @@ 0, 0, /* No default value */ "euiccCiPKId" }, + { ATF_POINTER, 1, offsetof(struct EimConfigurationData, indirectProfileDownload), + (ASN_TAG_CLASS_CONTEXT | (9 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_NULL, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "indirectProfileDownload" + }, }; -static const int asn_MAP_EimConfigurationData_oms_1[] = { 1, 2, 3, 4, 5, 6, 7, 8 }; +static const int asn_MAP_EimConfigurationData_oms_1[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; static const ber_tlv_tag_t asn_DEF_EimConfigurationData_tags_1[] = { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; @@ -257,16 +266,17 @@ { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 5, 0, 0 }, /* eimPublicKeyData */ { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 6, 0, 0 }, /* trustedPublicKeyDataTls */ { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 7, 0, 0 }, /* eimSupportedProtocol */ - { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 } /* euiccCiPKId */ + { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 8, 0, 0 }, /* euiccCiPKId */ + { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 9, 0, 0 } /* indirectProfileDownload */ }; asn_SEQUENCE_specifics_t asn_SPC_EimConfigurationData_specs_1 = { sizeof(struct EimConfigurationData), offsetof(struct EimConfigurationData, _asn_ctx), asn_MAP_EimConfigurationData_tag2el_1, - 9, /* Count of tags in the map */ + 10, /* Count of tags in the map */ asn_MAP_EimConfigurationData_oms_1, /* Optional members */ - 8, 0, /* Root/Additions */ - 9, /* First extension addition */ + 9, 0, /* Root/Additions */ + 10, /* First extension addition */ }; asn_TYPE_descriptor_t asn_DEF_EimConfigurationData = { "EimConfigurationData", @@ -280,7 +290,7 @@ /sizeof(asn_DEF_EimConfigurationData_tags_1[0]), /* 1 */ { 0, 0, SEQUENCE_constraint }, asn_MBR_EimConfigurationData_1, - 9, /* Elements count */ + 10, /* Elements count */ &asn_SPC_EimConfigurationData_specs_1 /* Additional specs */ }; diff --git a/src/ipa/libasn/EimConfigurationData.h b/src/ipa/libasn/EimConfigurationData.h index a5ffc79..73f7218 100644 --- a/src/ipa/libasn/EimConfigurationData.h +++ b/src/ipa/libasn/EimConfigurationData.h @@ -17,6 +17,7 @@ #include <NativeInteger.h> #include "EimSupportedProtocol.h" #include "SubjectKeyIdentifier.h" +#include <NULL.h> #include "SubjectPublicKeyInfo.h" #include "Certificate.h" #include <constr_CHOICE.h> @@ -79,6 +80,7 @@ } *trustedPublicKeyDataTls; EimSupportedProtocol_t *eimSupportedProtocol /* OPTIONAL */; SubjectKeyIdentifier_t *euiccCiPKId /* OPTIONAL */; + NULL_t *indirectProfileDownload /* OPTIONAL */; /* * This type is extensible, * possible extensions are below. @@ -91,7 +93,7 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_EimConfigurationData; extern asn_SEQUENCE_specifics_t asn_SPC_EimConfigurationData_specs_1; -extern asn_TYPE_member_t asn_MBR_EimConfigurationData_1[9]; +extern asn_TYPE_member_t asn_MBR_EimConfigurationData_1[10]; #ifdef __cplusplus } diff --git a/src/ipa/libipa/proc_eim_pkg_retr.c b/src/ipa/libipa/proc_eim_pkg_retr.c index 3fe289c..59b6f99 100644 --- a/src/ipa/libipa/proc_eim_pkg_retr.c +++ b/src/ipa/libipa/proc_eim_pkg_retr.c @@ -28,7 +28,7 @@ #include "proc_euicc_data_req.h" #include "proc_eim_pkg_retr.h" -static int get_euicc_ci_pkid(struct ipa_context *ctx, struct ipa_buf **pkid) +static int get_euicc_ci_pkid_ipd(struct ipa_context *ctx, struct ipa_buf **pkid, bool *idp) { struct ipa_es10b_eim_cfg_data *eim_cfg_data = NULL; struct EimConfigurationData *eim_cfg_data_item = NULL; @@ -50,6 +50,9 @@ if (eim_cfg_data_item->euiccCiPKId) *pkid = IPA_BUF_FROM_ASN(eim_cfg_data_item->euiccCiPKId); + if (eim_cfg_data_item->indirectProfileDownload) + *idp = true; + ipa_es10b_get_eim_cfg_data_free(eim_cfg_data); return 0; error: @@ -62,6 +65,7 @@ int eim_pkg_exec(struct ipa_context *ctx, const struct ipa_esipa_get_eim_pkg_res *get_eim_pkg_res) { struct ipa_buf *allowed_ca_pkid = NULL; + bool indirect_profile_download = false; int rc; if (get_eim_pkg_res->euicc_package_request) { @@ -107,12 +111,19 @@ goto error; } - rc = get_euicc_ci_pkid(ctx, &allowed_ca_pkid); + rc = get_euicc_ci_pkid_ipd(ctx, &allowed_ca_pkid, &indirect_profile_download); if (rc < 0) { rc = -EINVAL; goto error; } + if (!indirect_profile_download) { + IPA_LOGP(SIPA, LERROR, + "Indirect profile download is not suppoted by eIM, we don't support direct profile download, -- cannot continue!\n"); + rc = -ENOTSUP; + goto error; + } + indirect_prfle_dwnlod_pars.allowed_ca = allowed_ca_pkid; indirect_prfle_dwnlod_pars.tac = ctx->cfg->tac; indirect_prfle_dwnlod_pars.ac = -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43029?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: Ic40111531e6f35d5ea7f3789de6cae0f1c0d5ba7 Gerrit-Change-Number: 43029 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
[L] Change in onomondo-ipa[master]: V1.2: Add setDefaultDpAddress function
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43031?usp=email
) Change subject: V1.2: Add setDefaultDpAddress function ...................................................................... V1.2: Add setDefaultDpAddress function Add setDefaultDpAddress to EuiccResultData. Implement the SGP.32 function SetDefaultDpAddress and handle the setDefaultDpAddress PSMO. The IoT eUICC emulation uses the non-IoT eUICC SGP.22 function SetDefaultDpAddress. Reference: SGP.32 Section 2.11.1.1.3 Related: SYS#8101 Change-Id: I514b03240289469142e6a41a7290a4afce199318 --- M asn1/SGP32Definitions.asn M src/ipa/libasn/CMakeLists.txt M src/ipa/libasn/EuiccResultData.c M src/ipa/libasn/EuiccResultData.h M src/ipa/libasn/Psmo.c M src/ipa/libasn/Psmo.h A src/ipa/libasn/SGP32-SetDefaultDpAddressRequest.c A src/ipa/libasn/SGP32-SetDefaultDpAddressRequest.h A src/ipa/libasn/SGP32-SetDefaultDpAddressResponse.c A src/ipa/libasn/SGP32-SetDefaultDpAddressResponse.h M src/ipa/libasn/SetDefaultDpAddressResponse.c M src/ipa/libasn/SetDefaultDpAddressResponse.h M src/ipa/libipa/CMakeLists.txt M src/ipa/libipa/es10b_load_euicc_pkg.c A src/ipa/libipa/es10c_set_def_dp_addr.c A src/ipa/libipa/es10c_set_def_dp_addr.h 16 files changed, 404 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/31/43031/1 diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index c37ac17..0e3723c 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -104,7 +104,8 @@ smdpAddress [2] UTF8String OPTIONAL }, setFallbackAttribute [8] SEQUENCE {iccid [APPLICATION 26] Iccid}, - unsetFallbackAttribute [9] SEQUENCE {} + unsetFallbackAttribute [9] SEQUENCE {}, + setDefaultDpAddress [101] SGP32-SetDefaultDpAddressRequest -- Tag 'BF65' } -- ASN1STOP @@ -181,7 +182,8 @@ unknownOrDamagedCommand(2), interruption(3), undefinedError(127) - } + }, + setDefaultDpAddressResult [101] SetDefaultDpAddressResponse } EuiccPackageErrorSigned ::= SEQUENCE { euiccPackageErrorDataSigned EuiccPackageErrorDataSigned, @@ -542,6 +544,16 @@ } -- ASN1STOP +-- Section 5.9.25 +-- ASN1START +SGP32-SetDefaultDpAddressRequest ::= [101] SEQUENCE { -- Tag 'BF65' + defaultDpAddress UTF8String -- Default SM-DP+ address as an FQDN +} +SGP32-SetDefaultDpAddressResponse ::= [101] SEQUENCE { -- Tag 'BF65' + setDefaultDpAddressResult INTEGER { ok (0), undefinedError (127)} +} +-- ASN1STOP + -- Section 5.14.2 -- ASN1START SGP32-PrepareDownloadResponse ::= [33] CHOICE { -- Tag 'BF21' diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt index 68338fb..bd8ed73 100644 --- a/src/ipa/libasn/CMakeLists.txt +++ b/src/ipa/libasn/CMakeLists.txt @@ -818,6 +818,10 @@ SGP32-RetrieveNotificationsListRequest.h SGP32-RetrieveNotificationsListResponse.c SGP32-RetrieveNotificationsListResponse.h +SGP32-SetDefaultDpAddressRequest.c +SGP32-SetDefaultDpAddressRequest.h +SGP32-SetDefaultDpAddressResponse.c +SGP32-SetDefaultDpAddressResponse.h SkipCerts.c SkipCerts.h SmdpSigned2.c diff --git a/src/ipa/libasn/EuiccResultData.c b/src/ipa/libasn/EuiccResultData.c index 15fc272..5a0376c 100644 --- a/src/ipa/libasn/EuiccResultData.c +++ b/src/ipa/libasn/EuiccResultData.c @@ -11,7 +11,7 @@ { 0, 0 }, -1}; asn_per_constraints_t asn_PER_type_EuiccResultData_constr_1 CC_NOTUSED = { - { APC_CONSTRAINED | APC_EXTENSIBLE, 4, 4, 0, 13 } /* (0..13,...) */, + { APC_CONSTRAINED | APC_EXTENSIBLE, 4, 4, 0, 14 } /* (0..14,...) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ }; @@ -142,9 +142,18 @@ 0, 0, /* No default value */ "processingTerminated" }, + { ATF_NOFLAGS, 0, offsetof(struct EuiccResultData, choice.setDefaultDpAddressResult), + (ASN_TAG_CLASS_CONTEXT | (101 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_SetDefaultDpAddressResponse, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "setDefaultDpAddressResult" + }, }; -static const unsigned asn_MAP_EuiccResultData_to_canonical_1[] = { 13, 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 3 }; -static const unsigned asn_MAP_EuiccResultData_from_canonical_1[] = { 1, 2, 3, 13, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0 }; +static const unsigned asn_MAP_EuiccResultData_to_canonical_1[] = { 13, 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 3, 14 }; +static const unsigned asn_MAP_EuiccResultData_from_canonical_1[] = { 1, 2, 3, 13, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0, 14 }; static const asn_TYPE_tag2member_t asn_MAP_EuiccResultData_tag2el_1[] = { { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 13, 0, 0 }, /* processingTerminated */ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 0, 0, 0 }, /* enableResult */ @@ -159,7 +168,8 @@ { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 10, 0, 0 }, /* rollbackResult */ { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 11, 0, 0 }, /* setFallbackAttributeResult */ { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 12, 0, 0 }, /* unsetFallbackAttributeResult */ - { (ASN_TAG_CLASS_CONTEXT | (45 << 2)), 3, 0, 0 } /* listProfileInfoResult */ + { (ASN_TAG_CLASS_CONTEXT | (45 << 2)), 3, 0, 0 }, /* listProfileInfoResult */ + { (ASN_TAG_CLASS_CONTEXT | (101 << 2)), 14, 0, 0 } /* setDefaultDpAddressResult */ }; asn_CHOICE_specifics_t asn_SPC_EuiccResultData_specs_1 = { sizeof(struct EuiccResultData), @@ -167,10 +177,10 @@ offsetof(struct EuiccResultData, present), sizeof(((struct EuiccResultData *)0)->present), asn_MAP_EuiccResultData_tag2el_1, - 14, /* Count of tags in the map */ + 15, /* Count of tags in the map */ asn_MAP_EuiccResultData_to_canonical_1, asn_MAP_EuiccResultData_from_canonical_1, - 14 /* Extensions start */ + 15 /* Extensions start */ }; asn_TYPE_descriptor_t asn_DEF_EuiccResultData = { "EuiccResultData", @@ -182,7 +192,7 @@ 0, /* No tags (count) */ { &asn_OER_type_EuiccResultData_constr_1, &asn_PER_type_EuiccResultData_constr_1, CHOICE_constraint }, asn_MBR_EuiccResultData_1, - 14, /* Elements count */ + 15, /* Elements count */ &asn_SPC_EuiccResultData_specs_1 /* Additional specs */ }; diff --git a/src/ipa/libasn/EuiccResultData.h b/src/ipa/libasn/EuiccResultData.h index 79197a6..aa7069b 100644 --- a/src/ipa/libasn/EuiccResultData.h +++ b/src/ipa/libasn/EuiccResultData.h @@ -26,6 +26,7 @@ #include "SetFallbackAttributeResult.h" #include "UnsetFallbackAttributeResult.h" #include <NativeInteger.h> +#include "SetDefaultDpAddressResponse.h" #include <constr_CHOICE.h> #ifdef __cplusplus @@ -48,7 +49,8 @@ EuiccResultData_PR_rollbackResult, EuiccResultData_PR_setFallbackAttributeResult, EuiccResultData_PR_unsetFallbackAttributeResult, - EuiccResultData_PR_processingTerminated + EuiccResultData_PR_processingTerminated, + EuiccResultData_PR_setDefaultDpAddressResult /* Extensions may appear below */ } EuiccResultData_PR; @@ -77,6 +79,7 @@ SetFallbackAttributeResult_t setFallbackAttributeResult; UnsetFallbackAttributeResult_t unsetFallbackAttributeResult; long processingTerminated; + SetDefaultDpAddressResponse_t setDefaultDpAddressResult; /* * This type is extensible, * possible extensions are below. @@ -90,7 +93,7 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_EuiccResultData; extern asn_CHOICE_specifics_t asn_SPC_EuiccResultData_specs_1; -extern asn_TYPE_member_t asn_MBR_EuiccResultData_1[14]; +extern asn_TYPE_member_t asn_MBR_EuiccResultData_1[15]; extern asn_per_constraints_t asn_PER_type_EuiccResultData_constr_1; #ifdef __cplusplus diff --git a/src/ipa/libasn/Psmo.c b/src/ipa/libasn/Psmo.c index 144a95a..e6bb849 100644 --- a/src/ipa/libasn/Psmo.c +++ b/src/ipa/libasn/Psmo.c @@ -11,7 +11,7 @@ { 0, 0 }, -1}; asn_per_constraints_t asn_PER_type_Psmo_constr_1 CC_NOTUSED = { - { APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 7 } /* (0..7,...) */, + { APC_CONSTRAINED | APC_EXTENSIBLE, 4, 4, 0, 8 } /* (0..8,...) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ }; @@ -393,9 +393,18 @@ 0, 0, /* No default value */ "unsetFallbackAttribute" }, + { ATF_NOFLAGS, 0, offsetof(struct Psmo, choice.setDefaultDpAddress), + (ASN_TAG_CLASS_CONTEXT | (101 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_SGP32_SetDefaultDpAddressRequest, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "setDefaultDpAddress" + }, }; -static const unsigned asn_MAP_Psmo_to_canonical_1[] = { 0, 1, 2, 4, 5, 6, 7, 3 }; -static const unsigned asn_MAP_Psmo_from_canonical_1[] = { 0, 1, 2, 7, 3, 4, 5, 6 }; +static const unsigned asn_MAP_Psmo_to_canonical_1[] = { 0, 1, 2, 4, 5, 6, 7, 3, 8 }; +static const unsigned asn_MAP_Psmo_from_canonical_1[] = { 0, 1, 2, 7, 3, 4, 5, 6, 8 }; static const asn_TYPE_tag2member_t asn_MAP_Psmo_tag2el_1[] = { { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 0, 0, 0 }, /* enable */ { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 1, 0, 0 }, /* disable */ @@ -404,7 +413,8 @@ { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 5, 0, 0 }, /* configureImmediateEnable */ { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 6, 0, 0 }, /* setFallbackAttribute */ { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 7, 0, 0 }, /* unsetFallbackAttribute */ - { (ASN_TAG_CLASS_CONTEXT | (45 << 2)), 3, 0, 0 } /* listProfileInfo */ + { (ASN_TAG_CLASS_CONTEXT | (45 << 2)), 3, 0, 0 }, /* listProfileInfo */ + { (ASN_TAG_CLASS_CONTEXT | (101 << 2)), 8, 0, 0 } /* setDefaultDpAddress */ }; asn_CHOICE_specifics_t asn_SPC_Psmo_specs_1 = { sizeof(struct Psmo), @@ -412,10 +422,10 @@ offsetof(struct Psmo, present), sizeof(((struct Psmo *)0)->present), asn_MAP_Psmo_tag2el_1, - 8, /* Count of tags in the map */ + 9, /* Count of tags in the map */ asn_MAP_Psmo_to_canonical_1, asn_MAP_Psmo_from_canonical_1, - 8 /* Extensions start */ + 9 /* Extensions start */ }; asn_TYPE_descriptor_t asn_DEF_Psmo = { "Psmo", @@ -427,7 +437,7 @@ 0, /* No tags (count) */ { &asn_OER_type_Psmo_constr_1, &asn_PER_type_Psmo_constr_1, CHOICE_constraint }, asn_MBR_Psmo_1, - 8, /* Elements count */ + 9, /* Elements count */ &asn_SPC_Psmo_specs_1 /* Additional specs */ }; diff --git a/src/ipa/libasn/Psmo.h b/src/ipa/libasn/Psmo.h index c5e3e10..e00f820 100644 --- a/src/ipa/libasn/Psmo.h +++ b/src/ipa/libasn/Psmo.h @@ -13,6 +13,7 @@ /* Including external dependencies */ #include "ProfileInfoListRequest.h" +#include "SGP32-SetDefaultDpAddressRequest.h" #include "Iccid.h" #include <NULL.h> #include <constr_SEQUENCE.h> @@ -34,7 +35,8 @@ Psmo_PR_getRAT, Psmo_PR_configureImmediateEnable, Psmo_PR_setFallbackAttribute, - Psmo_PR_unsetFallbackAttribute + Psmo_PR_unsetFallbackAttribute, + Psmo_PR_setDefaultDpAddress /* Extensions may appear below */ } Psmo_PR; @@ -115,6 +117,7 @@ /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } unsetFallbackAttribute; + SGP32_SetDefaultDpAddressRequest_t setDefaultDpAddress; /* * This type is extensible, * possible extensions are below. @@ -128,7 +131,7 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_Psmo; extern asn_CHOICE_specifics_t asn_SPC_Psmo_specs_1; -extern asn_TYPE_member_t asn_MBR_Psmo_1[8]; +extern asn_TYPE_member_t asn_MBR_Psmo_1[9]; extern asn_per_constraints_t asn_PER_type_Psmo_constr_1; #ifdef __cplusplus diff --git a/src/ipa/libasn/SGP32-SetDefaultDpAddressRequest.c b/src/ipa/libasn/SGP32-SetDefaultDpAddressRequest.c new file mode 100644 index 0000000..471f70d --- /dev/null +++ b/src/ipa/libasn/SGP32-SetDefaultDpAddressRequest.c @@ -0,0 +1,51 @@ +/* + * 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-SetDefaultDpAddressRequest.h" + +asn_TYPE_member_t asn_MBR_SGP32_SetDefaultDpAddressRequest_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct SGP32_SetDefaultDpAddressRequest, defaultDpAddress), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_UTF8String, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "defaultDpAddress" + }, +}; +static const ber_tlv_tag_t asn_DEF_SGP32_SetDefaultDpAddressRequest_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (101 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_SGP32_SetDefaultDpAddressRequest_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* defaultDpAddress */ +}; +asn_SEQUENCE_specifics_t asn_SPC_SGP32_SetDefaultDpAddressRequest_specs_1 = { + sizeof(struct SGP32_SetDefaultDpAddressRequest), + offsetof(struct SGP32_SetDefaultDpAddressRequest, _asn_ctx), + asn_MAP_SGP32_SetDefaultDpAddressRequest_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_SGP32_SetDefaultDpAddressRequest = { + "SGP32-SetDefaultDpAddressRequest", + "SGP32-SetDefaultDpAddressRequest", + &asn_OP_SEQUENCE, + asn_DEF_SGP32_SetDefaultDpAddressRequest_tags_1, + sizeof(asn_DEF_SGP32_SetDefaultDpAddressRequest_tags_1) + /sizeof(asn_DEF_SGP32_SetDefaultDpAddressRequest_tags_1[0]) - 1, /* 1 */ + asn_DEF_SGP32_SetDefaultDpAddressRequest_tags_1, /* Same as above */ + sizeof(asn_DEF_SGP32_SetDefaultDpAddressRequest_tags_1) + /sizeof(asn_DEF_SGP32_SetDefaultDpAddressRequest_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_SGP32_SetDefaultDpAddressRequest_1, + 1, /* Elements count */ + &asn_SPC_SGP32_SetDefaultDpAddressRequest_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/SGP32-SetDefaultDpAddressRequest.h b/src/ipa/libasn/SGP32-SetDefaultDpAddressRequest.h new file mode 100644 index 0000000..137b5e9 --- /dev/null +++ b/src/ipa/libasn/SGP32-SetDefaultDpAddressRequest.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 _SGP32_SetDefaultDpAddressRequest_H_ +#define _SGP32_SetDefaultDpAddressRequest_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <UTF8String.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* SGP32-SetDefaultDpAddressRequest */ +typedef struct SGP32_SetDefaultDpAddressRequest { + UTF8String_t defaultDpAddress; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} SGP32_SetDefaultDpAddressRequest_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_SGP32_SetDefaultDpAddressRequest; +extern asn_SEQUENCE_specifics_t asn_SPC_SGP32_SetDefaultDpAddressRequest_specs_1; +extern asn_TYPE_member_t asn_MBR_SGP32_SetDefaultDpAddressRequest_1[1]; + +#ifdef __cplusplus +} +#endif + +#endif /* _SGP32_SetDefaultDpAddressRequest_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/SGP32-SetDefaultDpAddressResponse.c b/src/ipa/libasn/SGP32-SetDefaultDpAddressResponse.c new file mode 100644 index 0000000..04ee4a0 --- /dev/null +++ b/src/ipa/libasn/SGP32-SetDefaultDpAddressResponse.c @@ -0,0 +1,51 @@ +/* + * 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-SetDefaultDpAddressResponse.h" + +static asn_TYPE_member_t asn_MBR_SGP32_SetDefaultDpAddressResponse_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct SGP32_SetDefaultDpAddressResponse, setDefaultDpAddressResult), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_NativeInteger, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "setDefaultDpAddressResult" + }, +}; +static const ber_tlv_tag_t asn_DEF_SGP32_SetDefaultDpAddressResponse_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (101 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_SGP32_SetDefaultDpAddressResponse_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* setDefaultDpAddressResult */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_SGP32_SetDefaultDpAddressResponse_specs_1 = { + sizeof(struct SGP32_SetDefaultDpAddressResponse), + offsetof(struct SGP32_SetDefaultDpAddressResponse, _asn_ctx), + asn_MAP_SGP32_SetDefaultDpAddressResponse_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_SGP32_SetDefaultDpAddressResponse = { + "SGP32-SetDefaultDpAddressResponse", + "SGP32-SetDefaultDpAddressResponse", + &asn_OP_SEQUENCE, + asn_DEF_SGP32_SetDefaultDpAddressResponse_tags_1, + sizeof(asn_DEF_SGP32_SetDefaultDpAddressResponse_tags_1) + /sizeof(asn_DEF_SGP32_SetDefaultDpAddressResponse_tags_1[0]) - 1, /* 1 */ + asn_DEF_SGP32_SetDefaultDpAddressResponse_tags_1, /* Same as above */ + sizeof(asn_DEF_SGP32_SetDefaultDpAddressResponse_tags_1) + /sizeof(asn_DEF_SGP32_SetDefaultDpAddressResponse_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_SGP32_SetDefaultDpAddressResponse_1, + 1, /* Elements count */ + &asn_SPC_SGP32_SetDefaultDpAddressResponse_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/SGP32-SetDefaultDpAddressResponse.h b/src/ipa/libasn/SGP32-SetDefaultDpAddressResponse.h new file mode 100644 index 0000000..83e8d2a --- /dev/null +++ b/src/ipa/libasn/SGP32-SetDefaultDpAddressResponse.h @@ -0,0 +1,48 @@ +/* + * 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_SetDefaultDpAddressResponse_H_ +#define _SGP32_SetDefaultDpAddressResponse_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NativeInteger.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dependencies */ +typedef enum SGP32_SetDefaultDpAddressResponse__setDefaultDpAddressResult { + SGP32_SetDefaultDpAddressResponse__setDefaultDpAddressResult_ok = 0, + SGP32_SetDefaultDpAddressResponse__setDefaultDpAddressResult_undefinedError = 127 +} e_SGP32_SetDefaultDpAddressResponse__setDefaultDpAddressResult; + +/* SGP32-SetDefaultDpAddressResponse */ +typedef struct SGP32_SetDefaultDpAddressResponse { + long setDefaultDpAddressResult; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} SGP32_SetDefaultDpAddressResponse_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_SGP32_SetDefaultDpAddressResponse; + +#ifdef __cplusplus +} +#endif + +#endif /* _SGP32_SetDefaultDpAddressResponse_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/SetDefaultDpAddressResponse.c b/src/ipa/libasn/SetDefaultDpAddressResponse.c index 0115f19..6aa5a5f 100644 --- a/src/ipa/libasn/SetDefaultDpAddressResponse.c +++ b/src/ipa/libasn/SetDefaultDpAddressResponse.c @@ -7,7 +7,7 @@ #include "SetDefaultDpAddressResponse.h" -static asn_TYPE_member_t asn_MBR_SetDefaultDpAddressResponse_1[] = { +asn_TYPE_member_t asn_MBR_SetDefaultDpAddressResponse_1[] = { { ATF_NOFLAGS, 0, offsetof(struct SetDefaultDpAddressResponse, setDefaultDpAddressResult), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ @@ -25,7 +25,7 @@ static const asn_TYPE_tag2member_t asn_MAP_SetDefaultDpAddressResponse_tag2el_1[] = { { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* setDefaultDpAddressResult */ }; -static asn_SEQUENCE_specifics_t asn_SPC_SetDefaultDpAddressResponse_specs_1 = { +asn_SEQUENCE_specifics_t asn_SPC_SetDefaultDpAddressResponse_specs_1 = { sizeof(struct SetDefaultDpAddressResponse), offsetof(struct SetDefaultDpAddressResponse, _asn_ctx), asn_MAP_SetDefaultDpAddressResponse_tag2el_1, diff --git a/src/ipa/libasn/SetDefaultDpAddressResponse.h b/src/ipa/libasn/SetDefaultDpAddressResponse.h index 14a049b..06cd019 100644 --- a/src/ipa/libasn/SetDefaultDpAddressResponse.h +++ b/src/ipa/libasn/SetDefaultDpAddressResponse.h @@ -39,6 +39,8 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_SetDefaultDpAddressResponse; +extern asn_SEQUENCE_specifics_t asn_SPC_SetDefaultDpAddressResponse_specs_1; +extern asn_TYPE_member_t asn_MBR_SetDefaultDpAddressResponse_1[1]; #ifdef __cplusplus } diff --git a/src/ipa/libipa/CMakeLists.txt b/src/ipa/libipa/CMakeLists.txt index e6bed87..7a6ac28 100644 --- a/src/ipa/libipa/CMakeLists.txt +++ b/src/ipa/libipa/CMakeLists.txt @@ -23,6 +23,7 @@ es10c_delete_prfle.c es10c_disable_prfle.c es10c_enable_prfle.c + es10c_set_def_dp_addr.c es10b_immediate_enable.c es10c_get_eid.c es10c_get_prfle_info.c diff --git a/src/ipa/libipa/es10b_load_euicc_pkg.c b/src/ipa/libipa/es10b_load_euicc_pkg.c index 01e743a..ff1fc01 100644 --- a/src/ipa/libipa/es10b_load_euicc_pkg.c +++ b/src/ipa/libipa/es10b_load_euicc_pkg.c @@ -25,6 +25,7 @@ #include "es10c_disable_prfle.h" #include "es10c_delete_prfle.h" #include "es10c_get_prfle_info.h" +#include "es10c_set_def_dp_addr.h" #include "es10b_get_eim_cfg_data.h" #include "es10b_add_init_eim.h" #include "es10b_get_rat.h" @@ -292,6 +293,30 @@ return euicc_result_data; } +struct EuiccResultData *iot_emo_do_setDefaultDpAddress_psmo(struct ipa_context *ctx, + const SGP32_SetDefaultDpAddressRequest_t *setDefaultDpAddress_psmo) +{ + struct EuiccResultData *euicc_result_data = IPA_ALLOC_ZERO(struct EuiccResultData); + struct ipa_es10c_set_def_dp_addr_req set_def_dp_addr_req = { 0 }; + struct ipa_es10c_set_def_dp_addr_res *set_def_dp_addr_res = NULL; + + euicc_result_data->present = EuiccResultData_PR_setDefaultDpAddressResult; + + set_def_dp_addr_req.req.defaultDpAddress = setDefaultDpAddress_psmo->defaultDpAddress; + + set_def_dp_addr_res = ipa_es10c_set_def_dp_addr(ctx, &set_def_dp_addr_req); + if (set_def_dp_addr_res) { + euicc_result_data->choice.setDefaultDpAddressResult.setDefaultDpAddressResult = + set_def_dp_addr_res->res->setDefaultDpAddressResult; + } else { + euicc_result_data->choice.setDefaultDpAddressResult.setDefaultDpAddressResult = + SetDefaultDpAddressResponse__setDefaultDpAddressResult_undefinedError; + } + + ipa_es10c_set_def_dp_addr_res_free(set_def_dp_addr_res); + return euicc_result_data; +} + struct EuiccResultData *iot_emo_do_addEim_eco(struct ipa_context *ctx, const struct EimConfigurationData *addEim_eco) { struct EuiccResultData *euicc_result_data = IPA_ALLOC_ZERO(struct EuiccResultData); @@ -632,6 +657,9 @@ case Psmo_PR_unsetFallbackAttribute: psmo_result = iot_emo_do_unsetFallbackAttribute_psmo(ctx, &psmo->choice.unsetFallbackAttribute); break; + case Psmo_PR_setDefaultDpAddress: + psmo_result = iot_emo_do_setDefaultDpAddress_psmo(ctx, &psmo->choice.setDefaultDpAddress); + break; default: IPA_LOGP_ES10X("LoadEuiccPackage", LERROR, "ignoring invalid or unsupported PSMO!\n"); break; diff --git a/src/ipa/libipa/es10c_set_def_dp_addr.c b/src/ipa/libipa/es10c_set_def_dp_addr.c new file mode 100644 index 0000000..db755dd --- /dev/null +++ b/src/ipa/libipa/es10c_set_def_dp_addr.c @@ -0,0 +1,92 @@ +/* + * 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.7.4: Function (ES10c): SetDefaultDpAddress + */ + +#include <stdio.h> +#include <assert.h> +#include <onomondo/ipa/utils.h> +#include "context.h" +#include "utils.h" +#include "euicc.h" +#include "es10x.h" +#include "es10c_set_def_dp_addr.h" + +static const struct num_str_map error_code_strings[] = { + { SetDefaultDpAddressResponse__setDefaultDpAddressResult_ok, "ok" }, + { SetDefaultDpAddressResponse__setDefaultDpAddressResult_undefinedError, "undefinedError" }, + { 0, NULL } +}; + +static int dec_set_def_dp_addr_res(struct ipa_es10c_set_def_dp_addr_res *res, const struct ipa_buf *es10c_res) +{ + struct SetDefaultDpAddressResponse *asn = NULL; + + asn = ipa_es10x_res_dec(&asn_DEF_SetDefaultDpAddressResponse, es10c_res, "SetDefaultDpAddress"); + if (!asn) + return -EINVAL; + + if (asn->setDefaultDpAddressResult != SetDefaultDpAddressResponse__setDefaultDpAddressResult_ok) { + IPA_LOGP_ES10X("SetDefaultDpAddress", LERROR, "function failed with error code %ld=%s!\n", + asn->setDefaultDpAddressResult, + ipa_str_from_num(error_code_strings, asn->setDefaultDpAddressResult, "(unknown)")); + } else { + IPA_LOGP_ES10X("SetDefaultDpAddress", LERROR, "function succeeded with status code %ld=%s!\n", + asn->setDefaultDpAddressResult, + ipa_str_from_num(error_code_strings, asn->setDefaultDpAddressResult, "(unknown)")); + } + + res->res = asn; + return 0; +} + +/*! Function (Es10c): SetDefaultDpAddress. + * \param[inout] ctx pointer to ipa_context. + * \param[in] req pointer to struct that holds the function parameters. + * \returns pointer newly allocated struct with function result, NULL on error. */ +struct ipa_es10c_set_def_dp_addr_res *ipa_es10c_set_def_dp_addr(struct ipa_context *ctx, + const struct ipa_es10c_set_def_dp_addr_req *req) +{ + struct ipa_buf *es10c_req = NULL; + struct ipa_buf *es10c_res = NULL; + struct ipa_es10c_set_def_dp_addr_res *res = IPA_ALLOC_ZERO(struct ipa_es10c_set_def_dp_addr_res); + int rc; + + es10c_req = ipa_es10x_req_enc(&asn_DEF_SetDefaultDpAddressRequest, &req->req, "SetDefaultDpAddress"); + if (!es10c_req) { + IPA_LOGP_ES10X("SetDefaultDpAddress", LERROR, "unable to encode Es10c request\n"); + goto error; + } + + es10c_res = ipa_euicc_transceive_es10x(ctx, es10c_req); + if (!es10c_res) { + IPA_LOGP_ES10X("SetDefaultDpAddress", LERROR, "no Es10c response\n"); + goto error; + } + + rc = dec_set_def_dp_addr_res(res, es10c_res); + if (rc < 0) + goto error; + + IPA_FREE(es10c_req); + IPA_FREE(es10c_res); + return res; +error: + IPA_FREE(es10c_req); + IPA_FREE(es10c_res); + ipa_es10c_set_def_dp_addr_res_free(res); + return NULL; +} + +/*! Free results of function (Es10c): SetDefaultDpAddress. + * \param[in] res pointer to function result. */ +void ipa_es10c_set_def_dp_addr_res_free(struct ipa_es10c_set_def_dp_addr_res *res) +{ + IPA_ES10X_RES_FREE(asn_DEF_SetDefaultDpAddressResponse, res); +} diff --git a/src/ipa/libipa/es10c_set_def_dp_addr.h b/src/ipa/libipa/es10c_set_def_dp_addr.h new file mode 100644 index 0000000..c8a3186 --- /dev/null +++ b/src/ipa/libipa/es10c_set_def_dp_addr.h @@ -0,0 +1,23 @@ +/* + * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved. + * + * SPDX-License-Identifier: AGPL-3.0-only + */ + +#pragma once + +#include <SetDefaultDpAddressRequest.h> +#include <SetDefaultDpAddressResponse.h> +struct ipa_context; + +struct ipa_es10c_set_def_dp_addr_req { + struct SetDefaultDpAddressRequest req; +}; + +struct ipa_es10c_set_def_dp_addr_res { + struct SetDefaultDpAddressResponse *res; +}; + +struct ipa_es10c_set_def_dp_addr_res *ipa_es10c_set_def_dp_addr(struct ipa_context *ctx, + const struct ipa_es10c_set_def_dp_addr_req *req); +void ipa_es10c_set_def_dp_addr_res_free(struct ipa_es10c_set_def_dp_addr_res *res); -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43031?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: I514b03240289469142e6a41a7290a4afce199318 Gerrit-Change-Number: 43031 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
[L] Change in onomondo-ipa[master]: V1.2: EuiccResultData.setFallbackAttribute / unsetFallbackAttribute
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43030?usp=email
) Change subject: V1.2: EuiccResultData.setFallbackAttribute / unsetFallbackAttribute ...................................................................... V1.2: EuiccResultData.setFallbackAttribute / unsetFallbackAttribute Add setFallbackAttribute and unsetFallbackAttribute to EuiccResultData. The IoT eUICC emulation just acknowledges the operation with a log message and does nothing. A non IoT eUICC does not support fallback. Reference: SGP.32 Section 2.11.1.1.3 Related: SYS#8101 Change-Id: I59fba32cb12de22f71b3238adcbab5fc7f66e991 --- M asn1/SGP32Definitions.asn M src/ipa/libasn/CMakeLists.txt M src/ipa/libasn/EuiccResultData.c M src/ipa/libasn/EuiccResultData.h M src/ipa/libasn/Psmo.c M src/ipa/libasn/Psmo.h A src/ipa/libasn/SetFallbackAttributeResult.c A src/ipa/libasn/SetFallbackAttributeResult.h A src/ipa/libasn/UnsetFallbackAttributeResult.c A src/ipa/libasn/UnsetFallbackAttributeResult.h M src/ipa/libipa/es10b_load_euicc_pkg.c 11 files changed, 375 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/30/43030/1 diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index 3b91400..c37ac17 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -102,7 +102,9 @@ immediateEnableFlag [0] NULL OPTIONAL, smdpOid [1] OBJECT IDENTIFIER OPTIONAL, smdpAddress [2] UTF8String OPTIONAL - } + }, + setFallbackAttribute [8] SEQUENCE {iccid [APPLICATION 26] Iccid}, + unsetFallbackAttribute [9] SEQUENCE {} } -- ASN1STOP @@ -172,6 +174,8 @@ updateEimResult [10] UpdateEimResult, listEimResult [11] ListEimResult, rollbackResult [12] RollbackProfileResult, + setFallbackAttributeResult [13] SetFallbackAttributeResult, + unsetFallbackAttributeResult [14] UnsetFallbackAttributeResult, processingTerminated INTEGER { resultSizeOverflow(1), unknownOrDamagedCommand(2), @@ -231,6 +235,20 @@ ok(0), undefinedError(127) } +SetFallbackAttributeResult ::= INTEGER { + ok(0), + iccidOrAidNotFound (1), + fallbackNotAllowed (2), + fallbackProfileEnabled (3), + undefinedError (127) +} +UnsetFallbackAttributeResult ::= INTEGER { + ok(0), + noFallbackAttribute(2), + fallbackProfileEnabled (3), + commandError(7), + undefinedError (127) +} AddEimResult ::= CHOICE { associationToken [4] INTEGER, addEimResultCode INTEGER { diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt index 90d7b42..68338fb 100644 --- a/src/ipa/libasn/CMakeLists.txt +++ b/src/ipa/libasn/CMakeLists.txt @@ -786,6 +786,8 @@ SetDefaultDpAddressRequest.h SetDefaultDpAddressResponse.c SetDefaultDpAddressResponse.h +SetFallbackAttributeResult.c +SetFallbackAttributeResult.h SetNicknameRequest.c SetNicknameRequest.h SetNicknameResponse.c @@ -892,6 +894,8 @@ UniquePostalName.h UniversalString.c UniversalString.h +UnsetFallbackAttributeResult.c +UnsetFallbackAttributeResult.h UpdateEimResult.c UpdateEimResult.h UpdateMetadataRequest.c diff --git a/src/ipa/libasn/EuiccResultData.c b/src/ipa/libasn/EuiccResultData.c index 08f4119..15fc272 100644 --- a/src/ipa/libasn/EuiccResultData.c +++ b/src/ipa/libasn/EuiccResultData.c @@ -11,7 +11,7 @@ { 0, 0 }, -1}; asn_per_constraints_t asn_PER_type_EuiccResultData_constr_1 CC_NOTUSED = { - { APC_CONSTRAINED | APC_EXTENSIBLE, 4, 4, 0, 11 } /* (0..11,...) */, + { APC_CONSTRAINED | APC_EXTENSIBLE, 4, 4, 0, 13 } /* (0..13,...) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ }; @@ -115,6 +115,24 @@ 0, 0, /* No default value */ "rollbackResult" }, + { ATF_NOFLAGS, 0, offsetof(struct EuiccResultData, choice.setFallbackAttributeResult), + (ASN_TAG_CLASS_CONTEXT | (13 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_SetFallbackAttributeResult, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "setFallbackAttributeResult" + }, + { ATF_NOFLAGS, 0, offsetof(struct EuiccResultData, choice.unsetFallbackAttributeResult), + (ASN_TAG_CLASS_CONTEXT | (14 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_UnsetFallbackAttributeResult, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "unsetFallbackAttributeResult" + }, { ATF_NOFLAGS, 0, offsetof(struct EuiccResultData, choice.processingTerminated), (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 0, @@ -125,10 +143,10 @@ "processingTerminated" }, }; -static const unsigned asn_MAP_EuiccResultData_to_canonical_1[] = { 11, 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 3 }; -static const unsigned asn_MAP_EuiccResultData_from_canonical_1[] = { 1, 2, 3, 11, 4, 5, 6, 7, 8, 9, 10, 0 }; +static const unsigned asn_MAP_EuiccResultData_to_canonical_1[] = { 13, 0, 1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 3 }; +static const unsigned asn_MAP_EuiccResultData_from_canonical_1[] = { 1, 2, 3, 13, 4, 5, 6, 7, 8, 9, 10, 11, 12, 0 }; static const asn_TYPE_tag2member_t asn_MAP_EuiccResultData_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 11, 0, 0 }, /* processingTerminated */ + { (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)), 13, 0, 0 }, /* processingTerminated */ { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 0, 0, 0 }, /* enableResult */ { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 1, 0, 0 }, /* disableResult */ { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 2, 0, 0 }, /* deleteResult */ @@ -139,6 +157,8 @@ { (ASN_TAG_CLASS_CONTEXT | (10 << 2)), 8, 0, 0 }, /* updateEimResult */ { (ASN_TAG_CLASS_CONTEXT | (11 << 2)), 9, 0, 0 }, /* listEimResult */ { (ASN_TAG_CLASS_CONTEXT | (12 << 2)), 10, 0, 0 }, /* rollbackResult */ + { (ASN_TAG_CLASS_CONTEXT | (13 << 2)), 11, 0, 0 }, /* setFallbackAttributeResult */ + { (ASN_TAG_CLASS_CONTEXT | (14 << 2)), 12, 0, 0 }, /* unsetFallbackAttributeResult */ { (ASN_TAG_CLASS_CONTEXT | (45 << 2)), 3, 0, 0 } /* listProfileInfoResult */ }; asn_CHOICE_specifics_t asn_SPC_EuiccResultData_specs_1 = { @@ -147,10 +167,10 @@ offsetof(struct EuiccResultData, present), sizeof(((struct EuiccResultData *)0)->present), asn_MAP_EuiccResultData_tag2el_1, - 12, /* Count of tags in the map */ + 14, /* Count of tags in the map */ asn_MAP_EuiccResultData_to_canonical_1, asn_MAP_EuiccResultData_from_canonical_1, - 12 /* Extensions start */ + 14 /* Extensions start */ }; asn_TYPE_descriptor_t asn_DEF_EuiccResultData = { "EuiccResultData", @@ -162,7 +182,7 @@ 0, /* No tags (count) */ { &asn_OER_type_EuiccResultData_constr_1, &asn_PER_type_EuiccResultData_constr_1, CHOICE_constraint }, asn_MBR_EuiccResultData_1, - 12, /* Elements count */ + 14, /* Elements count */ &asn_SPC_EuiccResultData_specs_1 /* Additional specs */ }; diff --git a/src/ipa/libasn/EuiccResultData.h b/src/ipa/libasn/EuiccResultData.h index 82ee724..79197a6 100644 --- a/src/ipa/libasn/EuiccResultData.h +++ b/src/ipa/libasn/EuiccResultData.h @@ -23,6 +23,8 @@ #include "UpdateEimResult.h" #include "ListEimResult.h" #include "RollbackProfileResult.h" +#include "SetFallbackAttributeResult.h" +#include "UnsetFallbackAttributeResult.h" #include <NativeInteger.h> #include <constr_CHOICE.h> @@ -44,6 +46,8 @@ EuiccResultData_PR_updateEimResult, EuiccResultData_PR_listEimResult, EuiccResultData_PR_rollbackResult, + EuiccResultData_PR_setFallbackAttributeResult, + EuiccResultData_PR_unsetFallbackAttributeResult, EuiccResultData_PR_processingTerminated /* Extensions may appear below */ @@ -70,6 +74,8 @@ UpdateEimResult_t updateEimResult; ListEimResult_t listEimResult; RollbackProfileResult_t rollbackResult; + SetFallbackAttributeResult_t setFallbackAttributeResult; + UnsetFallbackAttributeResult_t unsetFallbackAttributeResult; long processingTerminated; /* * This type is extensible, @@ -84,7 +90,7 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_EuiccResultData; extern asn_CHOICE_specifics_t asn_SPC_EuiccResultData_specs_1; -extern asn_TYPE_member_t asn_MBR_EuiccResultData_1[12]; +extern asn_TYPE_member_t asn_MBR_EuiccResultData_1[14]; extern asn_per_constraints_t asn_PER_type_EuiccResultData_constr_1; #ifdef __cplusplus diff --git a/src/ipa/libasn/Psmo.c b/src/ipa/libasn/Psmo.c index 6b8d207..144a95a 100644 --- a/src/ipa/libasn/Psmo.c +++ b/src/ipa/libasn/Psmo.c @@ -11,7 +11,7 @@ { 0, 0 }, -1}; asn_per_constraints_t asn_PER_type_Psmo_constr_1 CC_NOTUSED = { - { APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 5 } /* (0..5,...) */, + { APC_CONSTRAINED | APC_EXTENSIBLE, 3, 3, 0, 7 } /* (0..7,...) */, { APC_UNCONSTRAINED, -1, -1, 0, 0 }, 0, 0 /* No PER value map */ }; @@ -249,6 +249,77 @@ &asn_SPC_configureImmediateEnable_specs_15 /* Additional specs */ }; +static asn_TYPE_member_t asn_MBR_setFallbackAttribute_20[] = { + { ATF_NOFLAGS, 0, offsetof(struct Psmo__setFallbackAttribute, iccid), + (ASN_TAG_CLASS_APPLICATION | (26 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_Iccid, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "iccid" + }, +}; +static const ber_tlv_tag_t asn_DEF_setFallbackAttribute_tags_20[] = { + (ASN_TAG_CLASS_CONTEXT | (8 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_setFallbackAttribute_tag2el_20[] = { + { (ASN_TAG_CLASS_APPLICATION | (26 << 2)), 0, 0, 0 } /* iccid */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_setFallbackAttribute_specs_20 = { + sizeof(struct Psmo__setFallbackAttribute), + offsetof(struct Psmo__setFallbackAttribute, _asn_ctx), + asn_MAP_setFallbackAttribute_tag2el_20, + 1, /* Count of 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_setFallbackAttribute_20 = { + "setFallbackAttribute", + "setFallbackAttribute", + &asn_OP_SEQUENCE, + asn_DEF_setFallbackAttribute_tags_20, + sizeof(asn_DEF_setFallbackAttribute_tags_20) + /sizeof(asn_DEF_setFallbackAttribute_tags_20[0]) - 1, /* 1 */ + asn_DEF_setFallbackAttribute_tags_20, /* Same as above */ + sizeof(asn_DEF_setFallbackAttribute_tags_20) + /sizeof(asn_DEF_setFallbackAttribute_tags_20[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_setFallbackAttribute_20, + 1, /* Elements count */ + &asn_SPC_setFallbackAttribute_specs_20 /* Additional specs */ +}; + +static const ber_tlv_tag_t asn_DEF_unsetFallbackAttribute_tags_23[] = { + (ASN_TAG_CLASS_CONTEXT | (9 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static asn_SEQUENCE_specifics_t asn_SPC_unsetFallbackAttribute_specs_23 = { + sizeof(struct Psmo__unsetFallbackAttribute), + offsetof(struct Psmo__unsetFallbackAttribute, _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_unsetFallbackAttribute_23 = { + "unsetFallbackAttribute", + "unsetFallbackAttribute", + &asn_OP_SEQUENCE, + asn_DEF_unsetFallbackAttribute_tags_23, + sizeof(asn_DEF_unsetFallbackAttribute_tags_23) + /sizeof(asn_DEF_unsetFallbackAttribute_tags_23[0]) - 1, /* 1 */ + asn_DEF_unsetFallbackAttribute_tags_23, /* Same as above */ + sizeof(asn_DEF_unsetFallbackAttribute_tags_23) + /sizeof(asn_DEF_unsetFallbackAttribute_tags_23[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + 0, 0, /* No members */ + &asn_SPC_unsetFallbackAttribute_specs_23 /* Additional specs */ +}; + asn_TYPE_member_t asn_MBR_Psmo_1[] = { { ATF_NOFLAGS, 0, offsetof(struct Psmo, choice.enable), (ASN_TAG_CLASS_CONTEXT | (3 << 2)), @@ -304,15 +375,35 @@ 0, 0, /* No default value */ "configureImmediateEnable" }, + { ATF_NOFLAGS, 0, offsetof(struct Psmo, choice.setFallbackAttribute), + (ASN_TAG_CLASS_CONTEXT | (8 << 2)), + 0, + &asn_DEF_setFallbackAttribute_20, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "setFallbackAttribute" + }, + { ATF_NOFLAGS, 0, offsetof(struct Psmo, choice.unsetFallbackAttribute), + (ASN_TAG_CLASS_CONTEXT | (9 << 2)), + 0, + &asn_DEF_unsetFallbackAttribute_23, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "unsetFallbackAttribute" + }, }; -static const unsigned asn_MAP_Psmo_to_canonical_1[] = { 0, 1, 2, 4, 5, 3 }; -static const unsigned asn_MAP_Psmo_from_canonical_1[] = { 0, 1, 2, 5, 3, 4 }; +static const unsigned asn_MAP_Psmo_to_canonical_1[] = { 0, 1, 2, 4, 5, 6, 7, 3 }; +static const unsigned asn_MAP_Psmo_from_canonical_1[] = { 0, 1, 2, 7, 3, 4, 5, 6 }; static const asn_TYPE_tag2member_t asn_MAP_Psmo_tag2el_1[] = { { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 0, 0, 0 }, /* enable */ { (ASN_TAG_CLASS_CONTEXT | (4 << 2)), 1, 0, 0 }, /* disable */ { (ASN_TAG_CLASS_CONTEXT | (5 << 2)), 2, 0, 0 }, /* delete */ { (ASN_TAG_CLASS_CONTEXT | (6 << 2)), 4, 0, 0 }, /* getRAT */ { (ASN_TAG_CLASS_CONTEXT | (7 << 2)), 5, 0, 0 }, /* configureImmediateEnable */ + { (ASN_TAG_CLASS_CONTEXT | (8 << 2)), 6, 0, 0 }, /* setFallbackAttribute */ + { (ASN_TAG_CLASS_CONTEXT | (9 << 2)), 7, 0, 0 }, /* unsetFallbackAttribute */ { (ASN_TAG_CLASS_CONTEXT | (45 << 2)), 3, 0, 0 } /* listProfileInfo */ }; asn_CHOICE_specifics_t asn_SPC_Psmo_specs_1 = { @@ -321,10 +412,10 @@ offsetof(struct Psmo, present), sizeof(((struct Psmo *)0)->present), asn_MAP_Psmo_tag2el_1, - 6, /* Count of tags in the map */ + 8, /* Count of tags in the map */ asn_MAP_Psmo_to_canonical_1, asn_MAP_Psmo_from_canonical_1, - 6 /* Extensions start */ + 8 /* Extensions start */ }; asn_TYPE_descriptor_t asn_DEF_Psmo = { "Psmo", @@ -336,7 +427,7 @@ 0, /* No tags (count) */ { &asn_OER_type_Psmo_constr_1, &asn_PER_type_Psmo_constr_1, CHOICE_constraint }, asn_MBR_Psmo_1, - 6, /* Elements count */ + 8, /* Elements count */ &asn_SPC_Psmo_specs_1 /* Additional specs */ }; diff --git a/src/ipa/libasn/Psmo.h b/src/ipa/libasn/Psmo.h index 9e9c22f..c5e3e10 100644 --- a/src/ipa/libasn/Psmo.h +++ b/src/ipa/libasn/Psmo.h @@ -32,7 +32,9 @@ Psmo_PR_delete, Psmo_PR_listProfileInfo, Psmo_PR_getRAT, - Psmo_PR_configureImmediateEnable + Psmo_PR_configureImmediateEnable, + Psmo_PR_setFallbackAttribute, + Psmo_PR_unsetFallbackAttribute /* Extensions may appear below */ } Psmo_PR; @@ -94,6 +96,25 @@ /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; } configureImmediateEnable; + struct Psmo__setFallbackAttribute { + Iccid_t iccid; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; + } setFallbackAttribute; + struct Psmo__unsetFallbackAttribute { + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; + } unsetFallbackAttribute; /* * This type is extensible, * possible extensions are below. @@ -107,7 +128,7 @@ /* Implementation */ extern asn_TYPE_descriptor_t asn_DEF_Psmo; extern asn_CHOICE_specifics_t asn_SPC_Psmo_specs_1; -extern asn_TYPE_member_t asn_MBR_Psmo_1[6]; +extern asn_TYPE_member_t asn_MBR_Psmo_1[8]; extern asn_per_constraints_t asn_PER_type_Psmo_constr_1; #ifdef __cplusplus diff --git a/src/ipa/libasn/SetFallbackAttributeResult.c b/src/ipa/libasn/SetFallbackAttributeResult.c new file mode 100644 index 0000000..8996ca7 --- /dev/null +++ b/src/ipa/libasn/SetFallbackAttributeResult.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 "SetFallbackAttributeResult.h" + +/* + * This type is implemented using NativeInteger, + * so here we adjust the DEF accordingly. + */ +static const ber_tlv_tag_t asn_DEF_SetFallbackAttributeResult_tags_1[] = { + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)) +}; +asn_TYPE_descriptor_t asn_DEF_SetFallbackAttributeResult = { + "SetFallbackAttributeResult", + "SetFallbackAttributeResult", + &asn_OP_NativeInteger, + asn_DEF_SetFallbackAttributeResult_tags_1, + sizeof(asn_DEF_SetFallbackAttributeResult_tags_1) + /sizeof(asn_DEF_SetFallbackAttributeResult_tags_1[0]), /* 1 */ + asn_DEF_SetFallbackAttributeResult_tags_1, /* Same as above */ + sizeof(asn_DEF_SetFallbackAttributeResult_tags_1) + /sizeof(asn_DEF_SetFallbackAttributeResult_tags_1[0]), /* 1 */ + { 0, 0, NativeInteger_constraint }, + 0, 0, /* Defined elsewhere */ + 0 /* No specifics */ +}; + diff --git a/src/ipa/libasn/SetFallbackAttributeResult.h b/src/ipa/libasn/SetFallbackAttributeResult.h new file mode 100644 index 0000000..a8b708e --- /dev/null +++ b/src/ipa/libasn/SetFallbackAttributeResult.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 _SetFallbackAttributeResult_H_ +#define _SetFallbackAttributeResult_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NativeInteger.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dependencies */ +typedef enum SetFallbackAttributeResult { + SetFallbackAttributeResult_ok = 0, + SetFallbackAttributeResult_iccidOrAidNotFound = 1, + SetFallbackAttributeResult_fallbackNotAllowed = 2, + SetFallbackAttributeResult_fallbackProfileEnabled = 3, + SetFallbackAttributeResult_undefinedError = 127 +} e_SetFallbackAttributeResult; + +/* SetFallbackAttributeResult */ +typedef long SetFallbackAttributeResult_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_SetFallbackAttributeResult; +asn_struct_free_f SetFallbackAttributeResult_free; +asn_struct_print_f SetFallbackAttributeResult_print; +asn_constr_check_f SetFallbackAttributeResult_constraint; +ber_type_decoder_f SetFallbackAttributeResult_decode_ber; +der_type_encoder_f SetFallbackAttributeResult_encode_der; +xer_type_decoder_f SetFallbackAttributeResult_decode_xer; +xer_type_encoder_f SetFallbackAttributeResult_encode_xer; +oer_type_decoder_f SetFallbackAttributeResult_decode_oer; +oer_type_encoder_f SetFallbackAttributeResult_encode_oer; +per_type_decoder_f SetFallbackAttributeResult_decode_uper; +per_type_encoder_f SetFallbackAttributeResult_encode_uper; + +#ifdef __cplusplus +} +#endif + +#endif /* _SetFallbackAttributeResult_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/UnsetFallbackAttributeResult.c b/src/ipa/libasn/UnsetFallbackAttributeResult.c new file mode 100644 index 0000000..910a723 --- /dev/null +++ b/src/ipa/libasn/UnsetFallbackAttributeResult.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 "UnsetFallbackAttributeResult.h" + +/* + * This type is implemented using NativeInteger, + * so here we adjust the DEF accordingly. + */ +static const ber_tlv_tag_t asn_DEF_UnsetFallbackAttributeResult_tags_1[] = { + (ASN_TAG_CLASS_UNIVERSAL | (2 << 2)) +}; +asn_TYPE_descriptor_t asn_DEF_UnsetFallbackAttributeResult = { + "UnsetFallbackAttributeResult", + "UnsetFallbackAttributeResult", + &asn_OP_NativeInteger, + asn_DEF_UnsetFallbackAttributeResult_tags_1, + sizeof(asn_DEF_UnsetFallbackAttributeResult_tags_1) + /sizeof(asn_DEF_UnsetFallbackAttributeResult_tags_1[0]), /* 1 */ + asn_DEF_UnsetFallbackAttributeResult_tags_1, /* Same as above */ + sizeof(asn_DEF_UnsetFallbackAttributeResult_tags_1) + /sizeof(asn_DEF_UnsetFallbackAttributeResult_tags_1[0]), /* 1 */ + { 0, 0, NativeInteger_constraint }, + 0, 0, /* Defined elsewhere */ + 0 /* No specifics */ +}; + diff --git a/src/ipa/libasn/UnsetFallbackAttributeResult.h b/src/ipa/libasn/UnsetFallbackAttributeResult.h new file mode 100644 index 0000000..6aede02 --- /dev/null +++ b/src/ipa/libasn/UnsetFallbackAttributeResult.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 _UnsetFallbackAttributeResult_H_ +#define _UnsetFallbackAttributeResult_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NativeInteger.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dependencies */ +typedef enum UnsetFallbackAttributeResult { + UnsetFallbackAttributeResult_ok = 0, + UnsetFallbackAttributeResult_noFallbackAttribute = 2, + UnsetFallbackAttributeResult_fallbackProfileEnabled = 3, + UnsetFallbackAttributeResult_commandError = 7, + UnsetFallbackAttributeResult_undefinedError = 127 +} e_UnsetFallbackAttributeResult; + +/* UnsetFallbackAttributeResult */ +typedef long UnsetFallbackAttributeResult_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_UnsetFallbackAttributeResult; +asn_struct_free_f UnsetFallbackAttributeResult_free; +asn_struct_print_f UnsetFallbackAttributeResult_print; +asn_constr_check_f UnsetFallbackAttributeResult_constraint; +ber_type_decoder_f UnsetFallbackAttributeResult_decode_ber; +der_type_encoder_f UnsetFallbackAttributeResult_encode_der; +xer_type_decoder_f UnsetFallbackAttributeResult_decode_xer; +xer_type_encoder_f UnsetFallbackAttributeResult_encode_xer; +oer_type_decoder_f UnsetFallbackAttributeResult_decode_oer; +oer_type_encoder_f UnsetFallbackAttributeResult_encode_oer; +per_type_decoder_f UnsetFallbackAttributeResult_decode_uper; +per_type_encoder_f UnsetFallbackAttributeResult_encode_uper; + +#ifdef __cplusplus +} +#endif + +#endif /* _UnsetFallbackAttributeResult_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libipa/es10b_load_euicc_pkg.c b/src/ipa/libipa/es10b_load_euicc_pkg.c index 0026d53..01e743a 100644 --- a/src/ipa/libipa/es10b_load_euicc_pkg.c +++ b/src/ipa/libipa/es10b_load_euicc_pkg.c @@ -266,6 +266,32 @@ return euicc_result_data; } +struct EuiccResultData *iot_emo_do_setFallbackAttribute_psmo(struct ipa_context *ctx, + const struct Psmo__setFallbackAttribute *setFallbackAttribute_psmo) +{ + struct EuiccResultData *euicc_result_data = IPA_ALLOC_ZERO(struct EuiccResultData); + + IPA_LOGP_ES10X("LoadEuiccPackage", LINFO, + "IoT eUICC emulation active, setFallbackAttribute not supported by eUICC!\n"); + + euicc_result_data->choice.setFallbackAttributeResult = SetFallbackAttributeResult_ok; + + return euicc_result_data; +} + +struct EuiccResultData *iot_emo_do_unsetFallbackAttribute_psmo(struct ipa_context *ctx, + const struct Psmo__unsetFallbackAttribute *unsetFallbackAttribute_psmo) +{ + struct EuiccResultData *euicc_result_data = IPA_ALLOC_ZERO(struct EuiccResultData); + + IPA_LOGP_ES10X("LoadEuiccPackage", LINFO, + "IoT eUICC emulation active, unsetFallbackAttribute not supported by eUICC!\n"); + + euicc_result_data->choice.setFallbackAttributeResult = UnsetFallbackAttributeResult_ok; + + return euicc_result_data; +} + struct EuiccResultData *iot_emo_do_addEim_eco(struct ipa_context *ctx, const struct EimConfigurationData *addEim_eco) { struct EuiccResultData *euicc_result_data = IPA_ALLOC_ZERO(struct EuiccResultData); @@ -600,6 +626,12 @@ psmo_result = iot_emo_do_configureImmediateEnable_psmo(ctx, &psmo->choice.configureImmediateEnable); break; + case Psmo_PR_setFallbackAttribute: + psmo_result = iot_emo_do_setFallbackAttribute_psmo(ctx, &psmo->choice.setFallbackAttribute); + break; + case Psmo_PR_unsetFallbackAttribute: + psmo_result = iot_emo_do_unsetFallbackAttribute_psmo(ctx, &psmo->choice.unsetFallbackAttribute); + break; default: IPA_LOGP_ES10X("LoadEuiccPackage", LERROR, "ignoring invalid or unsupported PSMO!\n"); break; -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43030?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: I59fba32cb12de22f71b3238adcbab5fc7f66e991 Gerrit-Change-Number: 43030 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
[S] Change in onomondo-ipa[master]: V1.2: Rename euiccCiPKId of IpaEuiccDataRequest to euiccCiPKIdentifie...
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43033?usp=email
) Change subject: V1.2: Rename euiccCiPKId of IpaEuiccDataRequest to euiccCiPKIdentifierToBeUsed ...................................................................... V1.2: Rename euiccCiPKId of IpaEuiccDataRequest to euiccCiPKIdentifierToBeUsed Reference: SGP.32 Section 2.11.1.2 Related: SYS#8101 Change-Id: Id397206316721962cd534e8131fe2a3b6979d828 --- M asn1/SGP32Definitions.asn M src/ipa/libasn/IpaEuiccDataRequest.c M src/ipa/libasn/IpaEuiccDataRequest.h M src/ipa/libipa/proc_euicc_data_req.c 4 files changed, 8 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/33/43033/1 diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index ce0a5a3..8529f46 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -114,7 +114,7 @@ -- ASN1START IpaEuiccDataRequest ::= [82] SEQUENCE { -- Tag BF52 tagList [APPLICATION 28] OCTET STRING, -- Tag '5C' - euiccCiPKId SubjectKeyIdentifier OPTIONAL, -- CI Public Key Identifier supported on the eUICC for signature creation + euiccCiPKIdentifierToBeUsed OCTET STRING OPTIONAL, -- CI Public Key Identifier (possibly truncated) supported on the eUICC for signature creation searchCriteria [1] CHOICE { seqNumber [0] INTEGER, profileManagementOperation [1] NotificationEvent, diff --git a/src/ipa/libasn/IpaEuiccDataRequest.c b/src/ipa/libasn/IpaEuiccDataRequest.c index 1f471b9..e382a58 100644 --- a/src/ipa/libasn/IpaEuiccDataRequest.c +++ b/src/ipa/libasn/IpaEuiccDataRequest.c @@ -84,14 +84,14 @@ 0, 0, /* No default value */ "tagList" }, - { ATF_POINTER, 2, offsetof(struct IpaEuiccDataRequest, euiccCiPKId), + { ATF_POINTER, 2, offsetof(struct IpaEuiccDataRequest, euiccCiPKIdentifierToBeUsed), (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 0, - &asn_DEF_SubjectKeyIdentifier, + &asn_DEF_OCTET_STRING, 0, { 0, 0, 0 }, 0, 0, /* No default value */ - "euiccCiPKId" + "euiccCiPKIdentifierToBeUsed" }, { ATF_POINTER, 1, offsetof(struct IpaEuiccDataRequest, searchCriteria), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), @@ -109,7 +109,7 @@ (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) }; static const asn_TYPE_tag2member_t asn_MAP_IpaEuiccDataRequest_tag2el_1[] = { - { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 1, 0, 0 }, /* euiccCiPKId */ + { (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 } /* searchCriteria */ }; diff --git a/src/ipa/libasn/IpaEuiccDataRequest.h b/src/ipa/libasn/IpaEuiccDataRequest.h index 0a06183..b2deef4 100644 --- a/src/ipa/libasn/IpaEuiccDataRequest.h +++ b/src/ipa/libasn/IpaEuiccDataRequest.h @@ -13,7 +13,6 @@ /* Including external dependencies */ #include <OCTET_STRING.h> -#include "SubjectKeyIdentifier.h" #include <NativeInteger.h> #include "NotificationEvent.h" #include <NULL.h> @@ -37,7 +36,7 @@ /* IpaEuiccDataRequest */ typedef struct IpaEuiccDataRequest { OCTET_STRING_t tagList; - SubjectKeyIdentifier_t *euiccCiPKId /* OPTIONAL */; + OCTET_STRING_t *euiccCiPKIdentifierToBeUsed /* OPTIONAL */; struct IpaEuiccDataRequest__searchCriteria { IpaEuiccDataRequest__searchCriteria_PR present; union IpaEuiccDataRequest__searchCriteria_u { diff --git a/src/ipa/libipa/proc_euicc_data_req.c b/src/ipa/libipa/proc_euicc_data_req.c index 4cc5682..2e2ebc1 100644 --- a/src/ipa/libipa/proc_euicc_data_req.c +++ b/src/ipa/libipa/proc_euicc_data_req.c @@ -160,7 +160,7 @@ if (ipa_tag_in_taglist(0xA5, tag_list)) { IPA_LOGP(SIPA, LINFO, "eIM asks for EUM certificate\n"); - get_certs_req.req.euiccCiPKId = pars->ipa_euicc_data_request->euiccCiPKId; + get_certs_req.req.euiccCiPKId = pars->ipa_euicc_data_request->euiccCiPKIdentifierToBeUsed; get_certs_res = ipa_es10b_get_certs(ctx, &get_certs_req); if (get_certs_res && get_certs_res->eum_certificate && get_certs_res->euicc_certificate) ipa_euicc_data_response.choice.ipaEuiccData.eumCertificate = get_certs_res->eum_certificate; @@ -173,7 +173,7 @@ ipa_euicc_data_response.choice.ipaEuiccData.euiccCertificate = get_certs_res->euicc_certificate; } else { IPA_LOGP(SIPA, LINFO, "eIM asks for eUICC certificate\n"); - get_certs_req.req.euiccCiPKId = pars->ipa_euicc_data_request->euiccCiPKId; + get_certs_req.req.euiccCiPKId = pars->ipa_euicc_data_request->euiccCiPKIdentifierToBeUsed; get_certs_res = ipa_es10b_get_certs(ctx, &get_certs_req); if (get_certs_res && get_certs_res->eum_certificate && get_certs_res->euicc_certificate) ipa_euicc_data_response.choice.ipaEuiccData.euiccCertificate = get_certs_res->euicc_certificate; -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43033?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: Id397206316721962cd534e8131fe2a3b6979d828 Gerrit-Change-Number: 43033 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
[M] Change in onomondo-ipa[master]: V1.2: Rename searchCriteria of IpaEuiccDataRequest to searchCriteriaN...
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43034?usp=email
) Change subject: V1.2: Rename searchCriteria of IpaEuiccDataRequest to searchCriteriaNotification ...................................................................... V1.2: Rename searchCriteria of IpaEuiccDataRequest to searchCriteriaNotification Reference: SGP.32 Section 2.11.1.2 Related: SYS#8101 Change-Id: I245c2c1c1c5cdd2be387d515d1bf51d0bf82ef41 --- 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, 42 insertions(+), 42 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/34/43034/1 diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index 8529f46..69175e1 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -115,7 +115,7 @@ IpaEuiccDataRequest ::= [82] SEQUENCE { -- Tag BF52 tagList [APPLICATION 28] OCTET STRING, -- Tag '5C' euiccCiPKIdentifierToBeUsed OCTET STRING OPTIONAL, -- CI Public Key Identifier (possibly truncated) supported on the eUICC for signature creation - searchCriteria [1] CHOICE { + searchCriteriaNotification [1] CHOICE { seqNumber [0] INTEGER, profileManagementOperation [1] NotificationEvent, euiccPackageResults [2] NULL diff --git a/src/ipa/libasn/IpaEuiccDataRequest.c b/src/ipa/libasn/IpaEuiccDataRequest.c index e382a58..a790d61 100644 --- a/src/ipa/libasn/IpaEuiccDataRequest.c +++ b/src/ipa/libasn/IpaEuiccDataRequest.c @@ -7,16 +7,16 @@ #include "IpaEuiccDataRequest.h" -static asn_oer_constraints_t asn_OER_type_searchCriteria_constr_4 CC_NOTUSED = { +static asn_oer_constraints_t asn_OER_type_searchCriteriaNotification_constr_4 CC_NOTUSED = { { 0, 0 }, -1}; -static asn_per_constraints_t asn_PER_type_searchCriteria_constr_4 CC_NOTUSED = { +static asn_per_constraints_t asn_PER_type_searchCriteriaNotification_constr_4 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 asn_TYPE_member_t asn_MBR_searchCriteria_4[] = { - { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteria, choice.seqNumber), +static asn_TYPE_member_t asn_MBR_searchCriteriaNotification_4[] = { + { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteriaNotification, choice.seqNumber), (ASN_TAG_CLASS_CONTEXT | (0 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_NativeInteger, @@ -25,7 +25,7 @@ 0, 0, /* No default value */ "seqNumber" }, - { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteria, choice.profileManagementOperation), + { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteriaNotification, choice.profileManagementOperation), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_NotificationEvent, @@ -34,7 +34,7 @@ 0, 0, /* No default value */ "profileManagementOperation" }, - { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteria, choice.euiccPackageResults), + { ATF_NOFLAGS, 0, offsetof(struct IpaEuiccDataRequest__searchCriteriaNotification, choice.euiccPackageResults), (ASN_TAG_CLASS_CONTEXT | (2 << 2)), -1, /* IMPLICIT tag at current level */ &asn_DEF_NULL, @@ -44,34 +44,34 @@ "euiccPackageResults" }, }; -static const asn_TYPE_tag2member_t asn_MAP_searchCriteria_tag2el_4[] = { +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 */ }; -static asn_CHOICE_specifics_t asn_SPC_searchCriteria_specs_4 = { - sizeof(struct IpaEuiccDataRequest__searchCriteria), - offsetof(struct IpaEuiccDataRequest__searchCriteria, _asn_ctx), - offsetof(struct IpaEuiccDataRequest__searchCriteria, present), - sizeof(((struct IpaEuiccDataRequest__searchCriteria *)0)->present), - asn_MAP_searchCriteria_tag2el_4, +static asn_CHOICE_specifics_t asn_SPC_searchCriteriaNotification_specs_4 = { + sizeof(struct IpaEuiccDataRequest__searchCriteriaNotification), + offsetof(struct IpaEuiccDataRequest__searchCriteriaNotification, _asn_ctx), + offsetof(struct IpaEuiccDataRequest__searchCriteriaNotification, present), + sizeof(((struct IpaEuiccDataRequest__searchCriteriaNotification *)0)->present), + asn_MAP_searchCriteriaNotification_tag2el_4, 3, /* Count of tags in the map */ 0, 0, 3 /* Extensions start */ }; static /* Use -fall-defs-global to expose */ -asn_TYPE_descriptor_t asn_DEF_searchCriteria_4 = { - "searchCriteria", - "searchCriteria", +asn_TYPE_descriptor_t asn_DEF_searchCriteriaNotification_4 = { + "searchCriteriaNotification", + "searchCriteriaNotification", &asn_OP_CHOICE, 0, /* No effective tags (pointer) */ 0, /* No effective tags (count) */ 0, /* No tags (pointer) */ 0, /* No tags (count) */ - { &asn_OER_type_searchCriteria_constr_4, &asn_PER_type_searchCriteria_constr_4, CHOICE_constraint }, - asn_MBR_searchCriteria_4, + { &asn_OER_type_searchCriteriaNotification_constr_4, &asn_PER_type_searchCriteriaNotification_constr_4, CHOICE_constraint }, + asn_MBR_searchCriteriaNotification_4, 3, /* Elements count */ - &asn_SPC_searchCriteria_specs_4 /* Additional specs */ + &asn_SPC_searchCriteriaNotification_specs_4 /* Additional specs */ }; asn_TYPE_member_t asn_MBR_IpaEuiccDataRequest_1[] = { @@ -93,14 +93,14 @@ 0, 0, /* No default value */ "euiccCiPKIdentifierToBeUsed" }, - { ATF_POINTER, 1, offsetof(struct IpaEuiccDataRequest, searchCriteria), + { ATF_POINTER, 1, offsetof(struct IpaEuiccDataRequest, searchCriteriaNotification), (ASN_TAG_CLASS_CONTEXT | (1 << 2)), +1, /* EXPLICIT tag at current level */ - &asn_DEF_searchCriteria_4, + &asn_DEF_searchCriteriaNotification_4, 0, { 0, 0, 0 }, 0, 0, /* No default value */ - "searchCriteria" + "searchCriteriaNotification" }, }; static const int asn_MAP_IpaEuiccDataRequest_oms_1[] = { 1, 2 }; @@ -111,7 +111,7 @@ static const asn_TYPE_tag2member_t asn_MAP_IpaEuiccDataRequest_tag2el_1[] = { { (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 } /* searchCriteria */ + { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 2, 0, 0 } /* searchCriteriaNotification */ }; asn_SEQUENCE_specifics_t asn_SPC_IpaEuiccDataRequest_specs_1 = { sizeof(struct IpaEuiccDataRequest), diff --git a/src/ipa/libasn/IpaEuiccDataRequest.h b/src/ipa/libasn/IpaEuiccDataRequest.h index b2deef4..d40dfaf 100644 --- a/src/ipa/libasn/IpaEuiccDataRequest.h +++ b/src/ipa/libasn/IpaEuiccDataRequest.h @@ -24,22 +24,22 @@ #endif /* Dependencies */ -typedef enum IpaEuiccDataRequest__searchCriteria_PR { - IpaEuiccDataRequest__searchCriteria_PR_NOTHING, /* No components present */ - IpaEuiccDataRequest__searchCriteria_PR_seqNumber, - IpaEuiccDataRequest__searchCriteria_PR_profileManagementOperation, - IpaEuiccDataRequest__searchCriteria_PR_euiccPackageResults +typedef enum IpaEuiccDataRequest__searchCriteriaNotification_PR { + IpaEuiccDataRequest__searchCriteriaNotification_PR_NOTHING, /* No components present */ + IpaEuiccDataRequest__searchCriteriaNotification_PR_seqNumber, + IpaEuiccDataRequest__searchCriteriaNotification_PR_profileManagementOperation, + IpaEuiccDataRequest__searchCriteriaNotification_PR_euiccPackageResults /* Extensions may appear below */ -} IpaEuiccDataRequest__searchCriteria_PR; +} IpaEuiccDataRequest__searchCriteriaNotification_PR; /* IpaEuiccDataRequest */ typedef struct IpaEuiccDataRequest { OCTET_STRING_t tagList; OCTET_STRING_t *euiccCiPKIdentifierToBeUsed /* OPTIONAL */; - struct IpaEuiccDataRequest__searchCriteria { - IpaEuiccDataRequest__searchCriteria_PR present; - union IpaEuiccDataRequest__searchCriteria_u { + struct IpaEuiccDataRequest__searchCriteriaNotification { + IpaEuiccDataRequest__searchCriteriaNotification_PR present; + union IpaEuiccDataRequest__searchCriteriaNotification_u { long seqNumber; NotificationEvent_t profileManagementOperation; NULL_t euiccPackageResults; @@ -51,7 +51,7 @@ /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; - } *searchCriteria; + } *searchCriteriaNotification; /* * This type is extensible, * possible extensions are below. diff --git a/src/ipa/libipa/es10b_retr_notif_from_lst.c b/src/ipa/libipa/es10b_retr_notif_from_lst.c index e8b444e..170f59a 100644 --- a/src/ipa/libipa/es10b_retr_notif_from_lst.c +++ b/src/ipa/libipa/es10b_retr_notif_from_lst.c @@ -159,17 +159,17 @@ if (req->dr_search_criteria) { /* Convert from foreigen searchCriteria (see comment in header file) */ switch (req->dr_search_criteria->present) { - case IpaEuiccDataRequest__searchCriteria_PR_seqNumber: + 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__searchCriteria_PR_profileManagementOperation: + 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__searchCriteria_PR_euiccPackageResults: + case IpaEuiccDataRequest__searchCriteriaNotification_PR_euiccPackageResults: IPA_LOGP_ES10X("RetrieveNotificationsList", LERROR, "unsupported euiccPackageResults searchCriteria in IpaEuiccDataRequest!\n"); search_criteria.present = RetrieveNotificationsListRequest__searchCriteria_PR_NOTHING; @@ -219,17 +219,17 @@ if (req->dr_search_criteria) { /* Convert from foreigen searchCriteria (see comment in header file) */ switch (req->dr_search_criteria->present) { - case IpaEuiccDataRequest__searchCriteria_PR_seqNumber: + 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__searchCriteria_PR_profileManagementOperation: + 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__searchCriteria_PR_euiccPackageResults: + case IpaEuiccDataRequest__searchCriteriaNotification_PR_euiccPackageResults: search_criteria.present = SGP32_RetrieveNotificationsListRequest__searchCriteria_PR_euiccPackageResults; search_criteria.choice.euiccPackageResults = diff --git a/src/ipa/libipa/es10b_retr_notif_from_lst.h b/src/ipa/libipa/es10b_retr_notif_from_lst.h index 84f3706..2773356 100644 --- a/src/ipa/libipa/es10b_retr_notif_from_lst.h +++ b/src/ipa/libipa/es10b_retr_notif_from_lst.h @@ -19,7 +19,7 @@ /* 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__searchCriteria *dr_search_criteria; + const struct IpaEuiccDataRequest__searchCriteriaNotification *dr_search_criteria; }; 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 2e2ebc1..ebfbf1d 100644 --- a/src/ipa/libipa/proc_euicc_data_req.c +++ b/src/ipa/libipa/proc_euicc_data_req.c @@ -197,7 +197,7 @@ if (ipa_tag_in_taglist(0xBF2B, tag_list)) { IPA_LOGP(SIPA, LINFO, "eIM asks for List of Notifications and/or eUICC Package Results\n"); - retr_notif_from_lst_req.dr_search_criteria = pars->ipa_euicc_data_request->searchCriteria; + retr_notif_from_lst_req.dr_search_criteria = pars->ipa_euicc_data_request->searchCriteriaNotification; 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) ipa_euicc_data_response.choice.ipaEuiccData.notificationsList = retr_notif_from_lst_res->sgp32_res; -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43034?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: I245c2c1c1c5cdd2be387d515d1bf51d0bf82ef41 Gerrit-Change-Number: 43034 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
[L] Change in onomondo-ipa[master]: V1.2: Add new fields to ProfileInfo list
by jolly
16 Jul '26
16 Jul '26
jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43032?usp=email
) Change subject: V1.2: Add new fields to ProfileInfo list ...................................................................... V1.2: Add new fields to ProfileInfo list Add new tags for ecallIndication, fallbackAttribute and fallbackAllowed. They new are not supported by non IoT eUICC. The IoT eUICC emulation will remove the unsupported tags from the ProfileInfoListRequest and later adds the requested fields to the ProfileInfoListResponse with the value 'false'. Reference SGP.32 Section 2.11.1.1.3 Related: SYS#8101 Change-Id: I6667dba8dd84817cfee69daa1c44b98239fa171c --- M asn1/SGP32Definitions.asn M src/ipa/libasn/CMakeLists.txt A src/ipa/libasn/SGP32-ProfileInfo.c A src/ipa/libasn/SGP32-ProfileInfo.h M src/ipa/libasn/SGP32-ProfileInfoListResponse.c M src/ipa/libasn/SGP32-ProfileInfoListResponse.h M src/ipa/libipa/es10c_get_prfle_info.c M src/ipa/libipa/es10c_get_prfle_info.h 8 files changed, 666 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/32/43032/1 diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index 0e3723c..ce0a5a3 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -225,7 +225,7 @@ undefinedError(127) } SGP32-ProfileInfoListResponse ::= [45] CHOICE { - profileInfoListOk SEQUENCE OF ProfileInfo, -- see SGP.22 + profileInfoListOk SEQUENCE OF SGP32-ProfileInfo, profileInfoListError SGP32-ProfileInfoListError } SGP32-ProfileInfoListError ::= INTEGER { @@ -349,6 +349,30 @@ } -- ASN1STOP +-- Section 4.4 +-- ASN1START +-- Definition of ProfileInfo +SGP32-ProfileInfo ::= [PRIVATE 3] SEQUENCE { -- Tag 'E3' + iccid Iccid OPTIONAL, + isdpAid [APPLICATION 15] OctetTo16 OPTIONAL, -- AID of the ISD-P containing the Profile, tag '4F' + profileState [112] ProfileState OPTIONAL, -- Tag '9F70' + profileNickname [16] UTF8String (SIZE(0..64)) OPTIONAL, -- Tag '90' + serviceProviderName [17] UTF8String (SIZE(0..32)) OPTIONAL, -- Tag '91' + profileName [18] UTF8String (SIZE(0..64)) OPTIONAL, -- Tag '92' + iconType [19] IconType OPTIONAL, -- Tag '93' + icon [20] OCTET STRING (SIZE(0..1024)) OPTIONAL, -- Tag '94', see condition in ES10b:GetProfilesInfo + profileClass [21] ProfileClass OPTIONAL, -- Tag '95' + notificationConfigurationInfo [22] SEQUENCE OF NotificationConfigurationInformation OPTIONAL, -- Tag 'B6' + profileOwner [23] OperatorId OPTIONAL, -- Tag 'B7' + dpProprietaryData [24] DpProprietaryData OPTIONAL, -- Tag 'B8' + profilePolicyRules [25] PprIds OPTIONAL, -- Tag '99' + serviceSpecificDataStoredInEuicc [34] VendorSpecificExtension OPTIONAL, -- Tag 'BF22' + ecallIndication [123] BOOLEAN OPTIONAL, -- Tag '9F7B' + fallbackAttribute [38] BOOLEAN DEFAULT FALSE, -- Tag '9F26', indicates a Fallback Profile if set to TRUE + fallbackAllowed [103] BOOLEAN OPTIONAL -- Tag '9F67', indicates if Fallback is authorized by the Profile Owner +} +-- ASN1STOP + -- Section 5.9.2 -- ASN1START SGP32-EUICCInfo2 ::= [34] SEQUENCE { -- Tag 'BF22' diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt index bd8ed73..5ca748e 100644 --- a/src/ipa/libasn/CMakeLists.txt +++ b/src/ipa/libasn/CMakeLists.txt @@ -808,6 +808,8 @@ SGP32-PendingNotification.h SGP32-PrepareDownloadResponse.c SGP32-PrepareDownloadResponse.h +SGP32-ProfileInfo.c +SGP32-ProfileInfo.h SGP32-ProfileInfoListError.c SGP32-ProfileInfoListError.h SGP32-ProfileInfoListResponse.c diff --git a/src/ipa/libasn/SGP32-ProfileInfo.c b/src/ipa/libasn/SGP32-ProfileInfo.c new file mode 100644 index 0000000..63e6862 --- /dev/null +++ b/src/ipa/libasn/SGP32-ProfileInfo.c @@ -0,0 +1,427 @@ +/* + * 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-ProfileInfo.h" + +static int +memb_profileNickname_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr, + asn_app_constraint_failed_f *ctfailcb, void *app_key) { + const UTF8String_t *st = (const UTF8String_t *)sptr; + size_t size; + + if(!sptr) { + ASN__CTFAIL(app_key, td, sptr, + "%s: value not given (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + size = UTF8String_length(st); + if((ssize_t)size < 0) { + ASN__CTFAIL(app_key, td, sptr, + "%s: UTF-8: broken encoding (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + if((size <= 64)) { + /* Constraint check succeeded */ + return 0; + } else { + ASN__CTFAIL(app_key, td, sptr, + "%s: constraint failed (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } +} + +static int +memb_serviceProviderName_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr, + asn_app_constraint_failed_f *ctfailcb, void *app_key) { + const UTF8String_t *st = (const UTF8String_t *)sptr; + size_t size; + + if(!sptr) { + ASN__CTFAIL(app_key, td, sptr, + "%s: value not given (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + size = UTF8String_length(st); + if((ssize_t)size < 0) { + ASN__CTFAIL(app_key, td, sptr, + "%s: UTF-8: broken encoding (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + if((size <= 32)) { + /* Constraint check succeeded */ + return 0; + } else { + ASN__CTFAIL(app_key, td, sptr, + "%s: constraint failed (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } +} + +static int +memb_profileName_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr, + asn_app_constraint_failed_f *ctfailcb, void *app_key) { + const UTF8String_t *st = (const UTF8String_t *)sptr; + size_t size; + + if(!sptr) { + ASN__CTFAIL(app_key, td, sptr, + "%s: value not given (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + size = UTF8String_length(st); + if((ssize_t)size < 0) { + ASN__CTFAIL(app_key, td, sptr, + "%s: UTF-8: broken encoding (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + if((size <= 64)) { + /* Constraint check succeeded */ + return 0; + } else { + ASN__CTFAIL(app_key, td, sptr, + "%s: constraint failed (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } +} + +static int +memb_icon_constraint_1(const asn_TYPE_descriptor_t *td, const void *sptr, + asn_app_constraint_failed_f *ctfailcb, void *app_key) { + const OCTET_STRING_t *st = (const OCTET_STRING_t *)sptr; + size_t size; + + if(!sptr) { + ASN__CTFAIL(app_key, td, sptr, + "%s: value not given (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } + + size = st->size; + + if((size <= 1024)) { + /* Constraint check succeeded */ + return 0; + } else { + ASN__CTFAIL(app_key, td, sptr, + "%s: constraint failed (%s:%d)", + td->name, __FILE__, __LINE__); + return -1; + } +} + +static asn_oer_constraints_t asn_OER_memb_profileNickname_constr_5 CC_NOTUSED = { + { 0, 0 }, + -1 /* (SIZE(0..MAX)) */}; +static asn_per_constraints_t asn_PER_memb_profileNickname_constr_5 CC_NOTUSED = { + { APC_UNCONSTRAINED, -1, -1, 0, 0 }, + { APC_UNCONSTRAINED, -1, -1, 0, 0 }, + 0, 0 /* No PER value map */ +}; +static asn_oer_constraints_t asn_OER_memb_serviceProviderName_constr_6 CC_NOTUSED = { + { 0, 0 }, + -1 /* (SIZE(0..MAX)) */}; +static asn_per_constraints_t asn_PER_memb_serviceProviderName_constr_6 CC_NOTUSED = { + { APC_UNCONSTRAINED, -1, -1, 0, 0 }, + { APC_UNCONSTRAINED, -1, -1, 0, 0 }, + 0, 0 /* No PER value map */ +}; +static asn_oer_constraints_t asn_OER_memb_profileName_constr_7 CC_NOTUSED = { + { 0, 0 }, + -1 /* (SIZE(0..MAX)) */}; +static asn_per_constraints_t asn_PER_memb_profileName_constr_7 CC_NOTUSED = { + { APC_UNCONSTRAINED, -1, -1, 0, 0 }, + { APC_UNCONSTRAINED, -1, -1, 0, 0 }, + 0, 0 /* No PER value map */ +}; +static asn_oer_constraints_t asn_OER_memb_icon_constr_9 CC_NOTUSED = { + { 0, 0 }, + -1 /* (SIZE(0..1024)) */}; +static asn_per_constraints_t asn_PER_memb_icon_constr_9 CC_NOTUSED = { + { APC_UNCONSTRAINED, -1, -1, 0, 0 }, + { APC_CONSTRAINED, 11, 11, 0, 1024 } /* (SIZE(0..1024)) */, + 0, 0 /* No PER value map */ +}; +static asn_TYPE_member_t asn_MBR_notificationConfigurationInfo_11[] = { + { ATF_POINTER, 0, 0, + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), + 0, + &asn_DEF_NotificationConfigurationInformation, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "" + }, +}; +static const ber_tlv_tag_t asn_DEF_notificationConfigurationInfo_tags_11[] = { + (ASN_TAG_CLASS_CONTEXT | (22 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static asn_SET_OF_specifics_t asn_SPC_notificationConfigurationInfo_specs_11 = { + sizeof(struct SGP32_ProfileInfo__notificationConfigurationInfo), + offsetof(struct SGP32_ProfileInfo__notificationConfigurationInfo, _asn_ctx), + 0, /* XER encoding is XMLDelimitedItemList */ +}; +static /* Use -fall-defs-global to expose */ +asn_TYPE_descriptor_t asn_DEF_notificationConfigurationInfo_11 = { + "notificationConfigurationInfo", + "notificationConfigurationInfo", + &asn_OP_SEQUENCE_OF, + asn_DEF_notificationConfigurationInfo_tags_11, + sizeof(asn_DEF_notificationConfigurationInfo_tags_11) + /sizeof(asn_DEF_notificationConfigurationInfo_tags_11[0]) - 1, /* 1 */ + asn_DEF_notificationConfigurationInfo_tags_11, /* Same as above */ + sizeof(asn_DEF_notificationConfigurationInfo_tags_11) + /sizeof(asn_DEF_notificationConfigurationInfo_tags_11[0]), /* 2 */ + { 0, 0, SEQUENCE_OF_constraint }, + asn_MBR_notificationConfigurationInfo_11, + 1, /* Single element */ + &asn_SPC_notificationConfigurationInfo_specs_11 /* Additional specs */ +}; + +static int asn_DFL_18_cmp_0(const void *sptr) { + const BOOLEAN_t *st = sptr; + + if(!st) { + return -1; /* No value is not a default value */ + } + + /* Test default value 0 */ + return (*st != 0); +} +static int asn_DFL_18_set_0(void **sptr) { + BOOLEAN_t *st = *sptr; + + if(!st) { + st = (*sptr = CALLOC(1, sizeof(*st))); + if(!st) return -1; + } + + /* Install default value 0 */ + *st = 0; + return 0; +} +asn_TYPE_member_t asn_MBR_SGP32_ProfileInfo_1[] = { + { ATF_POINTER, 17, offsetof(struct SGP32_ProfileInfo, iccid), + (ASN_TAG_CLASS_APPLICATION | (26 << 2)), + 0, + &asn_DEF_Iccid, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "iccid" + }, + { ATF_POINTER, 16, offsetof(struct SGP32_ProfileInfo, isdpAid), + (ASN_TAG_CLASS_APPLICATION | (15 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_OctetTo16, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "isdpAid" + }, + { ATF_POINTER, 15, offsetof(struct SGP32_ProfileInfo, profileState), + (ASN_TAG_CLASS_CONTEXT | (112 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_ProfileState, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "profileState" + }, + { ATF_POINTER, 14, offsetof(struct SGP32_ProfileInfo, profileNickname), + (ASN_TAG_CLASS_CONTEXT | (16 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_UTF8String, + 0, + { &asn_OER_memb_profileNickname_constr_5, &asn_PER_memb_profileNickname_constr_5, memb_profileNickname_constraint_1 }, + 0, 0, /* No default value */ + "profileNickname" + }, + { ATF_POINTER, 13, offsetof(struct SGP32_ProfileInfo, serviceProviderName), + (ASN_TAG_CLASS_CONTEXT | (17 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_UTF8String, + 0, + { &asn_OER_memb_serviceProviderName_constr_6, &asn_PER_memb_serviceProviderName_constr_6, memb_serviceProviderName_constraint_1 }, + 0, 0, /* No default value */ + "serviceProviderName" + }, + { ATF_POINTER, 12, offsetof(struct SGP32_ProfileInfo, profileName), + (ASN_TAG_CLASS_CONTEXT | (18 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_UTF8String, + 0, + { &asn_OER_memb_profileName_constr_7, &asn_PER_memb_profileName_constr_7, memb_profileName_constraint_1 }, + 0, 0, /* No default value */ + "profileName" + }, + { ATF_POINTER, 11, offsetof(struct SGP32_ProfileInfo, iconType), + (ASN_TAG_CLASS_CONTEXT | (19 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_IconType, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "iconType" + }, + { ATF_POINTER, 10, offsetof(struct SGP32_ProfileInfo, icon), + (ASN_TAG_CLASS_CONTEXT | (20 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_OCTET_STRING, + 0, + { &asn_OER_memb_icon_constr_9, &asn_PER_memb_icon_constr_9, memb_icon_constraint_1 }, + 0, 0, /* No default value */ + "icon" + }, + { ATF_POINTER, 9, offsetof(struct SGP32_ProfileInfo, profileClass), + (ASN_TAG_CLASS_CONTEXT | (21 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_ProfileClass, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "profileClass" + }, + { ATF_POINTER, 8, offsetof(struct SGP32_ProfileInfo, notificationConfigurationInfo), + (ASN_TAG_CLASS_CONTEXT | (22 << 2)), + 0, + &asn_DEF_notificationConfigurationInfo_11, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "notificationConfigurationInfo" + }, + { ATF_POINTER, 7, offsetof(struct SGP32_ProfileInfo, profileOwner), + (ASN_TAG_CLASS_CONTEXT | (23 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_OperatorId, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "profileOwner" + }, + { ATF_POINTER, 6, offsetof(struct SGP32_ProfileInfo, dpProprietaryData), + (ASN_TAG_CLASS_CONTEXT | (24 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_DpProprietaryData, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "dpProprietaryData" + }, + { ATF_POINTER, 5, offsetof(struct SGP32_ProfileInfo, profilePolicyRules), + (ASN_TAG_CLASS_CONTEXT | (25 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_PprIds, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "profilePolicyRules" + }, + { ATF_POINTER, 4, offsetof(struct SGP32_ProfileInfo, serviceSpecificDataStoredInEuicc), + (ASN_TAG_CLASS_CONTEXT | (34 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_VendorSpecificExtension, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "serviceSpecificDataStoredInEuicc" + }, + { ATF_POINTER, 3, offsetof(struct SGP32_ProfileInfo, ecallIndication), + (ASN_TAG_CLASS_CONTEXT | (123 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_BOOLEAN, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "ecallIndication" + }, + { ATF_NOFLAGS, 2, offsetof(struct SGP32_ProfileInfo, fallbackAttribute), + (ASN_TAG_CLASS_CONTEXT | (38 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_BOOLEAN, + 0, + { 0, 0, 0 }, + &asn_DFL_18_cmp_0, /* Compare DEFAULT 0 */ + &asn_DFL_18_set_0, /* Set DEFAULT 0 */ + "fallbackAttribute" + }, + { ATF_POINTER, 1, offsetof(struct SGP32_ProfileInfo, fallbackAllowed), + (ASN_TAG_CLASS_CONTEXT | (103 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_BOOLEAN, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "fallbackAllowed" + }, +}; +static const int asn_MAP_SGP32_ProfileInfo_oms_1[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }; +static const ber_tlv_tag_t asn_DEF_SGP32_ProfileInfo_tags_1[] = { + (ASN_TAG_CLASS_PRIVATE | (3 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_SGP32_ProfileInfo_tag2el_1[] = { + { (ASN_TAG_CLASS_APPLICATION | (15 << 2)), 1, 0, 0 }, /* isdpAid */ + { (ASN_TAG_CLASS_APPLICATION | (26 << 2)), 0, 0, 0 }, /* iccid */ + { (ASN_TAG_CLASS_CONTEXT | (16 << 2)), 3, 0, 0 }, /* profileNickname */ + { (ASN_TAG_CLASS_CONTEXT | (17 << 2)), 4, 0, 0 }, /* serviceProviderName */ + { (ASN_TAG_CLASS_CONTEXT | (18 << 2)), 5, 0, 0 }, /* profileName */ + { (ASN_TAG_CLASS_CONTEXT | (19 << 2)), 6, 0, 0 }, /* iconType */ + { (ASN_TAG_CLASS_CONTEXT | (20 << 2)), 7, 0, 0 }, /* icon */ + { (ASN_TAG_CLASS_CONTEXT | (21 << 2)), 8, 0, 0 }, /* profileClass */ + { (ASN_TAG_CLASS_CONTEXT | (22 << 2)), 9, 0, 0 }, /* notificationConfigurationInfo */ + { (ASN_TAG_CLASS_CONTEXT | (23 << 2)), 10, 0, 0 }, /* profileOwner */ + { (ASN_TAG_CLASS_CONTEXT | (24 << 2)), 11, 0, 0 }, /* dpProprietaryData */ + { (ASN_TAG_CLASS_CONTEXT | (25 << 2)), 12, 0, 0 }, /* profilePolicyRules */ + { (ASN_TAG_CLASS_CONTEXT | (34 << 2)), 13, 0, 0 }, /* serviceSpecificDataStoredInEuicc */ + { (ASN_TAG_CLASS_CONTEXT | (38 << 2)), 15, 0, 0 }, /* fallbackAttribute */ + { (ASN_TAG_CLASS_CONTEXT | (103 << 2)), 16, 0, 0 }, /* fallbackAllowed */ + { (ASN_TAG_CLASS_CONTEXT | (112 << 2)), 2, 0, 0 }, /* profileState */ + { (ASN_TAG_CLASS_CONTEXT | (123 << 2)), 14, 0, 0 } /* ecallIndication */ +}; +asn_SEQUENCE_specifics_t asn_SPC_SGP32_ProfileInfo_specs_1 = { + sizeof(struct SGP32_ProfileInfo), + offsetof(struct SGP32_ProfileInfo, _asn_ctx), + asn_MAP_SGP32_ProfileInfo_tag2el_1, + 17, /* Count of tags in the map */ + asn_MAP_SGP32_ProfileInfo_oms_1, /* Optional members */ + 17, 0, /* Root/Additions */ + 17, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_SGP32_ProfileInfo = { + "SGP32-ProfileInfo", + "SGP32-ProfileInfo", + &asn_OP_SEQUENCE, + asn_DEF_SGP32_ProfileInfo_tags_1, + sizeof(asn_DEF_SGP32_ProfileInfo_tags_1) + /sizeof(asn_DEF_SGP32_ProfileInfo_tags_1[0]) - 1, /* 1 */ + asn_DEF_SGP32_ProfileInfo_tags_1, /* Same as above */ + sizeof(asn_DEF_SGP32_ProfileInfo_tags_1) + /sizeof(asn_DEF_SGP32_ProfileInfo_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_SGP32_ProfileInfo_1, + 17, /* Elements count */ + &asn_SPC_SGP32_ProfileInfo_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/SGP32-ProfileInfo.h b/src/ipa/libasn/SGP32-ProfileInfo.h new file mode 100644 index 0000000..c9ecd04 --- /dev/null +++ b/src/ipa/libasn/SGP32-ProfileInfo.h @@ -0,0 +1,87 @@ +/* + * 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_ProfileInfo_H_ +#define _SGP32_ProfileInfo_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include "Iccid.h" +#include "OctetTo16.h" +#include "ProfileState.h" +#include <UTF8String.h> +#include "IconType.h" +#include <OCTET_STRING.h> +#include "ProfileClass.h" +#include "PprIds.h" +#include <BOOLEAN.h> +#include <asn_SEQUENCE_OF.h> +#include <constr_SEQUENCE_OF.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Forward declarations */ +struct OperatorId; +struct DpProprietaryData; +struct VendorSpecificExtension; +struct NotificationConfigurationInformation; + +/* SGP32-ProfileInfo */ +typedef struct SGP32_ProfileInfo { + Iccid_t *iccid /* OPTIONAL */; + OctetTo16_t *isdpAid /* OPTIONAL */; + ProfileState_t *profileState /* OPTIONAL */; + UTF8String_t *profileNickname /* OPTIONAL */; + UTF8String_t *serviceProviderName /* OPTIONAL */; + UTF8String_t *profileName /* OPTIONAL */; + IconType_t *iconType /* OPTIONAL */; + OCTET_STRING_t *icon /* OPTIONAL */; + ProfileClass_t *profileClass /* OPTIONAL */; + struct SGP32_ProfileInfo__notificationConfigurationInfo { + A_SEQUENCE_OF(struct NotificationConfigurationInformation) list; + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; + } *notificationConfigurationInfo; + struct OperatorId *profileOwner /* OPTIONAL */; + struct DpProprietaryData *dpProprietaryData /* OPTIONAL */; + PprIds_t *profilePolicyRules /* OPTIONAL */; + struct VendorSpecificExtension *serviceSpecificDataStoredInEuicc /* OPTIONAL */; + BOOLEAN_t *ecallIndication /* OPTIONAL */; + BOOLEAN_t fallbackAttribute /* DEFAULT FALSE */; + BOOLEAN_t *fallbackAllowed /* OPTIONAL */; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} SGP32_ProfileInfo_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_SGP32_ProfileInfo; +extern asn_SEQUENCE_specifics_t asn_SPC_SGP32_ProfileInfo_specs_1; +extern asn_TYPE_member_t asn_MBR_SGP32_ProfileInfo_1[17]; + +#ifdef __cplusplus +} +#endif + +/* Referred external types */ +#include "OperatorId.h" +#include "DpProprietaryData.h" +#include "VendorSpecificExtension.h" +#include "NotificationConfigurationInformation.h" + +#endif /* _SGP32_ProfileInfo_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/SGP32-ProfileInfoListResponse.c b/src/ipa/libasn/SGP32-ProfileInfoListResponse.c index 50604b2..5b10232 100644 --- a/src/ipa/libasn/SGP32-ProfileInfoListResponse.c +++ b/src/ipa/libasn/SGP32-ProfileInfoListResponse.c @@ -19,7 +19,7 @@ { ATF_POINTER, 0, 0, (ASN_TAG_CLASS_PRIVATE | (3 << 2)), 0, - &asn_DEF_ProfileInfo, + &asn_DEF_SGP32_ProfileInfo, 0, { 0, 0, 0 }, 0, 0, /* No default value */ diff --git a/src/ipa/libasn/SGP32-ProfileInfoListResponse.h b/src/ipa/libasn/SGP32-ProfileInfoListResponse.h index d00c721..d2fb08e 100644 --- a/src/ipa/libasn/SGP32-ProfileInfoListResponse.h +++ b/src/ipa/libasn/SGP32-ProfileInfoListResponse.h @@ -31,14 +31,14 @@ } SGP32_ProfileInfoListResponse_PR; /* Forward declarations */ -struct ProfileInfo; +struct SGP32_ProfileInfo; /* SGP32-ProfileInfoListResponse */ typedef struct SGP32_ProfileInfoListResponse { SGP32_ProfileInfoListResponse_PR present; union SGP32_ProfileInfoListResponse_u { struct SGP32_ProfileInfoListResponse__profileInfoListOk { - A_SEQUENCE_OF(struct ProfileInfo) list; + A_SEQUENCE_OF(struct SGP32_ProfileInfo) list; /* Context for parsing across buffer boundaries */ asn_struct_ctx_t _asn_ctx; @@ -65,7 +65,7 @@ #endif /* Referred external types */ -#include "ProfileInfo.h" +#include "SGP32-ProfileInfo.h" #endif /* _SGP32_ProfileInfoListResponse_H_ */ #include <asn_internal.h> diff --git a/src/ipa/libipa/es10c_get_prfle_info.c b/src/ipa/libipa/es10c_get_prfle_info.c index b45e407..76417c8 100644 --- a/src/ipa/libipa/es10c_get_prfle_info.c +++ b/src/ipa/libipa/es10c_get_prfle_info.c @@ -36,10 +36,12 @@ }; /* Convert the response into SGP32 format */ -static struct SGP32_ProfileInfoListResponse *convert_res_to_sgp32(struct ProfileInfoListResponse *res) +static struct SGP32_ProfileInfoListResponse *convert_res_to_sgp32(struct ProfileInfoListResponse *res, + const struct ipa_es10c_get_prfle_info_req *conv_req) { struct SGP32_ProfileInfoListResponse *sgp32_res; struct ProfileInfo *prfle_info_item; + struct SGP32_ProfileInfo *sgp32_prfle_info_item; unsigned int i; if (!res) @@ -51,9 +53,38 @@ switch (res->present) { case ProfileInfoListResponse_PR_profileInfoListOk: for (i = 0; i < res->choice.profileInfoListOk.list.count; i++) { - prfle_info_item = IPA_ALLOC(struct ProfileInfo); - *prfle_info_item = *res->choice.profileInfoListOk.list.array[i]; - ASN_SEQUENCE_ADD(&sgp32_res->choice.profileInfoListOk.list, prfle_info_item); + sgp32_prfle_info_item = IPA_ALLOC_ZERO(struct SGP32_ProfileInfo); + assert(sgp32_prfle_info_item); + prfle_info_item = res->choice.profileInfoListOk.list.array[i]; + sgp32_prfle_info_item->iccid = prfle_info_item->iccid; + sgp32_prfle_info_item->isdpAid = prfle_info_item->isdpAid; + sgp32_prfle_info_item->profileState = prfle_info_item->profileState; + sgp32_prfle_info_item->profileNickname = prfle_info_item->profileNickname; + sgp32_prfle_info_item->serviceProviderName = prfle_info_item->serviceProviderName; + sgp32_prfle_info_item->profileName = prfle_info_item->profileName; + sgp32_prfle_info_item->iconType = prfle_info_item->iconType; + sgp32_prfle_info_item->icon = prfle_info_item->icon; + sgp32_prfle_info_item->profileClass = prfle_info_item->profileClass; + sgp32_prfle_info_item->notificationConfigurationInfo = (void *)prfle_info_item->notificationConfigurationInfo; + sgp32_prfle_info_item->profileOwner = prfle_info_item->profileOwner; + sgp32_prfle_info_item->dpProprietaryData = prfle_info_item->dpProprietaryData; + sgp32_prfle_info_item->profilePolicyRules = prfle_info_item->profilePolicyRules; + sgp32_prfle_info_item->serviceSpecificDataStoredInEuicc = prfle_info_item->serviceSpecificDataStoredInEuicc; + if (conv_req && conv_req->ecall_indication_removed) { + sgp32_prfle_info_item->ecallIndication = IPA_ALLOC_ZERO(BOOLEAN_t); + assert(sgp32_prfle_info_item->ecallIndication); + *sgp32_prfle_info_item->ecallIndication = false; + } + if (conv_req && conv_req->fallback_attribute_removed) { + sgp32_prfle_info_item->fallbackAttribute = false; + } + if (conv_req && conv_req->fallback_allowed_removed) { + sgp32_prfle_info_item->fallbackAllowed = IPA_ALLOC_ZERO(BOOLEAN_t); + assert(sgp32_prfle_info_item->fallbackAllowed); + *sgp32_prfle_info_item->fallbackAllowed = false; + } + + ASN_SEQUENCE_ADD(&sgp32_res->choice.profileInfoListOk.list, sgp32_prfle_info_item); } sgp32_res->present = SGP32_ProfileInfoListResponse_PR_profileInfoListOk; @@ -75,7 +106,71 @@ return sgp32_res; } -static int dec_get_prfle_info_res(struct ipa_es10c_get_prfle_info_res *res, const struct ipa_buf *es10c_res) +struct ipa_es10c_get_prfle_info_req *conv_get_prfle_info_req(const struct ipa_es10c_get_prfle_info_req *req) { + uint8_t default_tags[] = { 0x5A, 0x4F, 0x9F, 0x70, 0x91, 0x92, 0x95, 0x9F,0x7B, 0x9F,0x26, 0x9F,0x67 }; + struct ipa_es10c_get_prfle_info_req *conv_req = IPA_ALLOC_ZERO(struct ipa_es10c_get_prfle_info_req); + int i, new_size; + uint8_t *buf; + + assert(conv_req); + memcpy(conv_req, req, sizeof(struct ipa_es10c_get_prfle_info_req)); + conv_req->req.tagList = IPA_ALLOC_ZERO(OCTET_STRING_t); + assert(conv_req->req.tagList); + + if (!req->req.tagList || req->req.tagList->size == 0) { + conv_req->req.tagList->size = sizeof(default_tags); + conv_req->req.tagList->buf = IPA_ALLOC(conv_req->req.tagList->size); + assert(conv_req->req.tagList->buf); + memcpy(conv_req->req.tagList->buf, default_tags, conv_req->req.tagList->size); + } else { + conv_req->req.tagList->size = req->req.tagList->size; + conv_req->req.tagList->buf = IPA_ALLOC(conv_req->req.tagList->size); + assert(conv_req->req.tagList->buf); + memcpy(conv_req->req.tagList->buf, req->req.tagList->buf, conv_req->req.tagList->size); + } + buf = conv_req->req.tagList->buf; + for (i = 0, new_size = 0; i < conv_req->req.tagList->size;) { + if (i + 1 < conv_req->req.tagList->size && (buf[i] == 0x9F || buf[i] == 0xBF)) { + if (buf[i] == 0x9F && buf[i + 1] == 0x7B) { + conv_req->ecall_indication_removed = true; + i += 2; + continue; + } + if (buf[i] == 0x9F && buf[i + 1] == 0x26) { + conv_req->fallback_attribute_removed = true; + i += 2; + continue; + } + if (buf[i] == 0x9F && buf[i + 1] == 0x67) { + conv_req->fallback_allowed_removed = true; + i += 2; + continue; + } + buf[new_size++] = buf[i++]; + buf[new_size++] = buf[i++]; + } else { + buf[new_size++] = buf[i++]; + } + } + conv_req->req.tagList->size = new_size; + + return conv_req; +} + +void conv_get_prfle_info_req_free(struct ipa_es10c_get_prfle_info_req *req) +{ + if (!req) + return; + + if (req->req.tagList) { + free(req->req.tagList->buf); + free(req->req.tagList); + } + free(req); +} + +static int dec_get_prfle_info_res(struct ipa_es10c_get_prfle_info_res *res, const struct ipa_buf *es10c_res, + const struct ipa_es10c_get_prfle_info_req *conv_req) { struct ProfileInfoListResponse *asn = NULL; @@ -98,7 +193,7 @@ res->prfle_info_list_err = -1; } - res->sgp32_res = convert_res_to_sgp32(asn); + res->sgp32_res = convert_res_to_sgp32(asn, conv_req); res->res = asn; return 0; } @@ -134,7 +229,7 @@ static void find_currently_active_prfle(struct ipa_es10c_get_prfle_info_res *res) { unsigned int i; - struct ProfileInfo *prfle_info; + struct SGP32_ProfileInfo *prfle_info; res->currently_active_prfle = NULL; if (res->sgp32_res->present != SGP32_ProfileInfoListResponse_PR_profileInfoListOk) @@ -163,10 +258,18 @@ struct ipa_es10c_get_prfle_info_res *res = IPA_ALLOC_ZERO(struct ipa_es10c_get_prfle_info_res); int rc; const struct ipa_es10c_get_prfle_info_req req_all = { 0 }; + struct ipa_es10c_get_prfle_info_req *conv_req = NULL; if (!req) req = &req_all; + if (ctx->cfg->iot_euicc_emu_enabled) { + IPA_LOGP_ES10X("GetProfilesInfo", LINFO, + "IoT eUICC emulation active, will convert unsupported tags from ProfileInfoListRequest.\n"); + conv_req = conv_get_prfle_info_req(req); + req = conv_req; + } + es10c_req = ipa_es10x_req_enc(&asn_DEF_ProfileInfoListRequest, &req->req, "GetProfilesInfo"); if (!es10c_req) { IPA_LOGP_ES10X("GetProfilesInfo", LERROR, "unable to encode Es10c request\n"); @@ -182,7 +285,7 @@ if (ctx->cfg->iot_euicc_emu_enabled) { IPA_LOGP_ES10X("GetProfilesInfo", LINFO, "IoT eUICC emulation active, will derive SGP32_ProfileInfoListResponse from (SGP.22) ProfileInfoListResponse.\n"); - rc = dec_get_prfle_info_res(res, es10c_res); + rc = dec_get_prfle_info_res(res, es10c_res, conv_req); } else { rc = dec_get_prfle_info_res_sgp32(res, es10c_res); } @@ -193,10 +296,12 @@ IPA_FREE(es10c_req); IPA_FREE(es10c_res); + conv_get_prfle_info_req_free(conv_req); return res; error: IPA_FREE(es10c_req); IPA_FREE(es10c_res); + conv_get_prfle_info_req_free(conv_req); ipa_es10c_get_prfle_info_res_free(res); return NULL; } @@ -213,8 +318,11 @@ if (res->res) { if (res->sgp32_res) { if (res->sgp32_res->present == SGP32_ProfileInfoListResponse_PR_profileInfoListOk) { - for (i = 0; i < res->sgp32_res->choice.profileInfoListOk.list.count; i++) + for (i = 0; i < res->sgp32_res->choice.profileInfoListOk.list.count; i++) { + IPA_FREE(res->sgp32_res->choice.profileInfoListOk.list.array[i]->ecallIndication); + IPA_FREE(res->sgp32_res->choice.profileInfoListOk.list.array[i]->fallbackAllowed); IPA_FREE(res->sgp32_res->choice.profileInfoListOk.list.array[i]); + } IPA_FREE(res->sgp32_res->choice.profileInfoListOk.list.array); } IPA_FREE(res->sgp32_res); diff --git a/src/ipa/libipa/es10c_get_prfle_info.h b/src/ipa/libipa/es10c_get_prfle_info.h index b8a3464..65ed3d1 100644 --- a/src/ipa/libipa/es10c_get_prfle_info.h +++ b/src/ipa/libipa/es10c_get_prfle_info.h @@ -13,12 +13,15 @@ struct ipa_es10c_get_prfle_info_req { struct ProfileInfoListRequest req; + bool ecall_indication_removed; + bool fallback_attribute_removed; + bool fallback_allowed_removed; }; struct ipa_es10c_get_prfle_info_res { struct ProfileInfoListResponse *res; struct SGP32_ProfileInfoListResponse *sgp32_res; - struct ProfileInfo *currently_active_prfle; + struct SGP32_ProfileInfo *currently_active_prfle; long prfle_info_list_err; /*! When the IoT eUICC emulation is enabled, this function will retrieve the ProfileInfoListResponse -- To view, visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/43032?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: I6667dba8dd84817cfee69daa1c44b98239fa171c Gerrit-Change-Number: 43032 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>
1
0
0
0
← Newer
1
...
47
48
49
50
51
52
53
...
87
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
Results per page:
10
25
50
100
200