laforge has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43023?usp=email )
Change subject: V1.2: Rename "Automatic" -> "Immediate" ......................................................................
V1.2: Rename "Automatic" -> "Immediate"
Rename all ASN.1 occurrences of "Automatic" or "AutomaticEnable" or similar to "Immediate" or "ImmediateEnable" or similar respectively.
Also rename internal structure names from "auto" or similar to "immediate" or similar respectively.
Reference: SGP.32 Section 2.9.2
Related: SYS#8101 Change-Id: I2b18e5cf65269347ce40e5e9560ab934e75a92a6 --- M asn1/SGP32Definitions.asn M include/onomondo/ipa/ipad.h 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/context.h M src/ipa/libipa/es10b_enable_using_dd.c M src/ipa/libipa/es10b_euicc_mem_rst.c M src/ipa/libipa/es10b_euicc_mem_rst.h M src/ipa/libipa/es10b_load_bnd_prfle_pkg.c M src/ipa/libipa/es10b_load_euicc_pkg.c M src/ipa/libipa/ipad.c 30 files changed, 476 insertions(+), 474 deletions(-)
Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified
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/include/onomondo/ipa/ipad.h b/include/onomondo/ipa/ipad.h index c2ce394..bb4a05a 100644 --- a/include/onomondo/ipa/ipad.h +++ b/include/onomondo/ipa/ipad.h @@ -93,7 +93,7 @@ int eim_init(struct ipa_context *ctx); int ipa_add_init_eim_cfg(struct ipa_context *ctx, struct ipa_buf *cfg); int ipa_euicc_mem_rst(struct ipa_context *ctx, bool operatnl_profiles, bool test_profiles, bool default_smdp_addr, - bool eim_cfg_data, bool auto_enable_cfg); + bool eim_cfg_data, bool immediate_enable_cfg); int ipa_poll(struct ipa_context *ctx); void ipa_close(struct ipa_context *ctx); struct ipa_buf *ipa_free_ctx(struct ipa_context *ctx); diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt index 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/context.h b/src/ipa/libipa/context.h index 067daff..5065286 100644 --- a/src/ipa/libipa/context.h +++ b/src/ipa/libipa/context.h @@ -27,12 +27,12 @@ int association_token_counter; struct ipa_buf *eim_cfg_ber;
- /*! Automatic Profile Enabling configuration (set via configureAutoEnable PSMO) */ + /*! Immediate Profile Enabling configuration (set via configureImmidiateEnable PSMO) */ struct { bool flag; struct ipa_buf *smdp_oid; struct ipa_buf *smdp_address; - } auto_enable; + } immediate_enable; } iot_euicc_emu;
} __attribute__((packed)); @@ -58,12 +58,12 @@ * ipa_proc_eucc_pkg_dwnld_exec is called. */ struct ipa_buf *rollback_iccid;
- /*! cached data to support the emulation of the ES10b function EnableUsingDD */ + /*! cached data to support the emulation of the ES10b function ImmidiateEnable */ struct { struct ipa_buf *smdp_oid; struct ipa_buf *smdp_address; struct ipa_buf *profile_aid; - } auto_enable; + } immediate_enable; } iot_euicc_emu;
/*! cached eimId (read from eUICC when ipa_init is called) */ diff --git a/src/ipa/libipa/es10b_enable_using_dd.c b/src/ipa/libipa/es10b_enable_using_dd.c index ebf043b..87e731d 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 } @@ -93,58 +93,58 @@ int rc = EnableUsingDDResponse__enableUsingDDResult_undefinedError;
/* Auto enable must be active */ - if (ctx->nvstate.iot_euicc_emu.auto_enable.flag == false) { - rc = EnableUsingDDResponse__enableUsingDDResult_autoEnableNotAvailable; + if (ctx->nvstate.iot_euicc_emu.immediate_enable.flag == false) { + 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; + if (ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid == NULL && + ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address == NULL) { + rc = EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable; goto error; }
/* Ensure the session context is present and complete */ - if (ctx->iot_euicc_emu.auto_enable.smdp_address == NULL) { + if (ctx->iot_euicc_emu.immediate_enable.smdp_address == NULL) { rc = EnableUsingDDResponse__enableUsingDDResult_noSessionContext; goto error; } - if (ctx->iot_euicc_emu.auto_enable.smdp_oid == NULL) { + if (ctx->iot_euicc_emu.immediate_enable.smdp_oid == NULL) { rc = EnableUsingDDResponse__enableUsingDDResult_noSessionContext; goto error; } - if (ctx->iot_euicc_emu.auto_enable.profile_aid == NULL) { + if (ctx->iot_euicc_emu.immediate_enable.profile_aid == NULL) { rc = EnableUsingDDResponse__enableUsingDDResult_noSessionContext; goto error; }
/* Verify smdp OID (if configured) */ - 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; + if (ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid) { + if (ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid->len != + ctx->iot_euicc_emu.immediate_enable.smdp_oid->len) { + 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; + if (memcmp(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid->data, + ctx->iot_euicc_emu.immediate_enable.smdp_oid->data, + ctx->iot_euicc_emu.immediate_enable.smdp_oid->len)) { + rc = EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable; goto error; } }
/* Verify smdp address (if configured) */ - 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; + if (ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address) { + if (ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address->len != + ctx->iot_euicc_emu.immediate_enable.smdp_address->len) { + 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; + if (memcmp(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address->data, + ctx->iot_euicc_emu.immediate_enable.smdp_address->data, + ctx->iot_euicc_emu.immediate_enable.smdp_address->len)) { + rc = EnableUsingDDResponse__enableUsingDDResult_immediateEnableNotAvailable; goto error; } } @@ -152,8 +152,8 @@ /* Enable profile */ enable_prfle_req.req.profileIdentifier.present = EnableProfileRequest__profileIdentifier_PR_isdpAid; IPA_ASSIGN_BUF_TO_ASN(enable_prfle_req.req.profileIdentifier.choice.isdpAid, - ctx->iot_euicc_emu.auto_enable.profile_aid->data, - ctx->iot_euicc_emu.auto_enable.profile_aid->len); + ctx->iot_euicc_emu.immediate_enable.profile_aid->data, + ctx->iot_euicc_emu.immediate_enable.profile_aid->len);
enable_prfle_res = ipa_es10c_enable_prfle(ctx, &enable_prfle_req); if (enable_prfle_res && enable_prfle_res->res->enableResult == EnableProfileResponse__enableResult_ok) @@ -173,12 +173,12 @@ }
/* Ensure the auto enable data is cleared after use */ - ipa_buf_free(ctx->iot_euicc_emu.auto_enable.smdp_oid); - ctx->iot_euicc_emu.auto_enable.smdp_oid = NULL; - ipa_buf_free(ctx->iot_euicc_emu.auto_enable.smdp_address); - ctx->iot_euicc_emu.auto_enable.smdp_address = NULL; - ipa_buf_free(ctx->iot_euicc_emu.auto_enable.profile_aid); - ctx->iot_euicc_emu.auto_enable.profile_aid = NULL; + ipa_buf_free(ctx->iot_euicc_emu.immediate_enable.smdp_oid); + ctx->iot_euicc_emu.immediate_enable.smdp_oid = NULL; + ipa_buf_free(ctx->iot_euicc_emu.immediate_enable.smdp_address); + ctx->iot_euicc_emu.immediate_enable.smdp_address = NULL; + ipa_buf_free(ctx->iot_euicc_emu.immediate_enable.profile_aid); + ctx->iot_euicc_emu.immediate_enable.profile_aid = NULL;
ipa_es10c_enable_prfle_res_free(enable_prfle_res); return rc; diff --git a/src/ipa/libipa/es10b_euicc_mem_rst.c b/src/ipa/libipa/es10b_euicc_mem_rst.c index 2869caf..5b2040f 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)")); }
@@ -150,8 +150,8 @@ rst_opt[0] |= (1 << (7 - SGP32_EuiccMemoryResetRequest__resetOptions_resetDefaultSmdpAddress)); 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)); + if (req->immediate_enable_cfg) + 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) { @@ -200,14 +200,14 @@ IPA_FREE(ctx->nvstate.iot_euicc_emu.eim_cfg_ber); ctx->nvstate.iot_euicc_emu.eim_cfg_ber = NULL; } - if (req->auto_enable_cfg) { + if (req->immediate_enable_cfg) { IPA_LOGP_ES10X("eUICCMemoryReset", LINFO, - "IoT eUICC emulation active, also clearing auto enable configuration...\n"); - IPA_FREE(ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid); - ctx->nvstate.iot_euicc_emu.auto_enable.smdp_oid = NULL; - IPA_FREE(ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address); - ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address = NULL; - ctx->nvstate.iot_euicc_emu.auto_enable.flag = false; + "IoT eUICC emulation active, also clearing immediate enable configuration...\n"); + IPA_FREE(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid); + ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid = NULL; + IPA_FREE(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address); + ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address = NULL; + ctx->nvstate.iot_euicc_emu.immediate_enable.flag = false; }
es10b_req = ipa_es10x_req_enc(&asn_DEF_EuiccMemoryResetRequest, &mem_rst_req, "eUICCMemoryReset"); diff --git a/src/ipa/libipa/es10b_euicc_mem_rst.h b/src/ipa/libipa/es10b_euicc_mem_rst.h index 81c9c01..8f4d304 100644 --- a/src/ipa/libipa/es10b_euicc_mem_rst.h +++ b/src/ipa/libipa/es10b_euicc_mem_rst.h @@ -15,7 +15,7 @@ bool test_profiles; bool default_smdp_addr; bool eim_cfg_data; - bool auto_enable_cfg; + bool immediate_enable_cfg; };
int ipa_es10b_euicc_mem_rst(struct ipa_context *ctx, const struct ipa_es10b_euicc_mem_rst *req); diff --git a/src/ipa/libipa/es10b_load_bnd_prfle_pkg.c b/src/ipa/libipa/es10b_load_bnd_prfle_pkg.c index 52b70dc..d11eb7d 100644 --- a/src/ipa/libipa/es10b_load_bnd_prfle_pkg.c +++ b/src/ipa/libipa/es10b_load_bnd_prfle_pkg.c @@ -23,22 +23,22 @@ #include "es10x.h" #include "es10b_load_bnd_prfle_pkg.h"
-static void collect_auto_enable_data_from_prfle_inst_rslt(struct ipa_context *ctx, - struct ProfileInstallationResult *prfle_inst_rslt) +static void collect_immediate_enable_data_from_prfle_inst_rslt(struct ipa_context *ctx, + struct ProfileInstallationResult *prfle_inst_rslt) { struct ProfileInstallationResultData *prfle_inst_res_data = &prfle_inst_rslt->profileInstallationResultData;
- /* When the profile was not successfully installed, then there is no point in collecting any auto enable data. */ + /* When the profile was not successfully installed, then there is no point in collecting any immediate enable data. */ if (prfle_inst_res_data->finalResult.present != ProfileInstallationResultData__finalResult_PR_successResult) return;
- /* Collect smdpOid and smdpAddress so that we can verify later whether the auto enable is granted or not. */ - ctx->iot_euicc_emu.auto_enable.smdp_oid = IPA_BUF_FROM_ASN(&prfle_inst_res_data->smdpOid); - ctx->iot_euicc_emu.auto_enable.smdp_address = + /* Collect smdpOid and smdpAddress so that we can verify later whether the immediate enable is granted or not. */ + ctx->iot_euicc_emu.immediate_enable.smdp_oid = IPA_BUF_FROM_ASN(&prfle_inst_res_data->smdpOid); + ctx->iot_euicc_emu.immediate_enable.smdp_address = IPA_BUF_FROM_ASN(&prfle_inst_res_data->notificationMetadata.notificationAddress);
/* Collect AID of the profile so that we later know which profile to enable. */ - ctx->iot_euicc_emu.auto_enable.profile_aid = + ctx->iot_euicc_emu.immediate_enable.profile_aid = IPA_BUF_FROM_ASN(&prfle_inst_res_data->finalResult.choice.successResult.aid); }
@@ -67,14 +67,14 @@ struct ipa_es10b_load_bnd_prfle_pkg_res *res = IPA_ALLOC_ZERO(struct ipa_es10b_load_bnd_prfle_pkg_res); int rc;
- /* In case IoT eUICC emulation is active, ensure that the auto enable data is cleared. (This data has no + /* In case IoT eUICC emulation is active, ensure that the immediate enable data is cleared. (This data has no * relevance in case a real IoT eUICC is used.) */ - ipa_buf_free(ctx->iot_euicc_emu.auto_enable.smdp_oid); - ctx->iot_euicc_emu.auto_enable.smdp_oid = NULL; - ipa_buf_free(ctx->iot_euicc_emu.auto_enable.smdp_address); - ctx->iot_euicc_emu.auto_enable.smdp_address = NULL; - ipa_buf_free(ctx->iot_euicc_emu.auto_enable.profile_aid); - ctx->iot_euicc_emu.auto_enable.profile_aid = NULL; + ipa_buf_free(ctx->iot_euicc_emu.immediate_enable.smdp_oid); + ctx->iot_euicc_emu.immediate_enable.smdp_oid = NULL; + ipa_buf_free(ctx->iot_euicc_emu.immediate_enable.smdp_address); + ctx->iot_euicc_emu.immediate_enable.smdp_address = NULL; + ipa_buf_free(ctx->iot_euicc_emu.immediate_enable.profile_aid); + ctx->iot_euicc_emu.immediate_enable.profile_aid = NULL;
/* The ES10b LoadBoundProfilePackage function is a pseudo function that only exists as a placeholder in the * specification. In practice it is just a STORE DATA command that carries a profile segment without any @@ -94,10 +94,10 @@ if (rc < 0) goto error;
- /* In case IoT eUICC emulation is active, collect auto enable data to support the emulation of + /* In case IoT eUICC emulation is active, collect immediate enable data to support the emulation of * the ES10b function EnableUsingDD. */ if (ctx->cfg->iot_euicc_emu_enabled) - collect_auto_enable_data_from_prfle_inst_rslt(ctx, res->res); + collect_immediate_enable_data_from_prfle_inst_rslt(ctx, res->res); }
IPA_FREE(es10b_res); diff --git a/src/ipa/libipa/es10b_load_euicc_pkg.c b/src/ipa/libipa/es10b_load_euicc_pkg.c index eb223d2..fd3f1df 100644 --- a/src/ipa/libipa/es10b_load_euicc_pkg.c +++ b/src/ipa/libipa/es10b_load_euicc_pkg.c @@ -233,33 +233,33 @@ 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) - ctx->nvstate.iot_euicc_emu.auto_enable.flag = true; + /* Update immediateEnableFlag */ + if (configureImmediateEnable_psmo->immediateEnableFlag) + ctx->nvstate.iot_euicc_emu.immediate_enable.flag = true; else - ctx->nvstate.iot_euicc_emu.auto_enable.flag = false; + ctx->nvstate.iot_euicc_emu.immediate_enable.flag = false;
/* 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); + ipa_buf_free(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid); + ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_oid = NULL; + if (configureImmediateEnable_psmo->smdpOid) + ctx->nvstate.iot_euicc_emu.immediate_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) - ctx->nvstate.iot_euicc_emu.auto_enable.smdp_address = - IPA_BUF_FROM_ASN(configureAutoEnable_psmo->smdpAddress); + ipa_buf_free(ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address); + ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address = NULL; + if (configureImmediateEnable_psmo->smdpAddress) + ctx->nvstate.iot_euicc_emu.immediate_enable.smdp_address = + 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"); diff --git a/src/ipa/libipa/ipad.c b/src/ipa/libipa/ipad.c index fa1fb21..2d4f685 100644 --- a/src/ipa/libipa/ipad.c +++ b/src/ipa/libipa/ipad.c @@ -38,8 +38,8 @@ { /* free dynamically allocated struct members (append code for new members here) */ IPA_FREE(nvstate->iot_euicc_emu.eim_cfg_ber); - IPA_FREE(nvstate->iot_euicc_emu.auto_enable.smdp_oid); - IPA_FREE(nvstate->iot_euicc_emu.auto_enable.smdp_address); + IPA_FREE(nvstate->iot_euicc_emu.immediate_enable.smdp_oid); + IPA_FREE(nvstate->iot_euicc_emu.immediate_enable.smdp_address); }
static void nvstate_reset(struct ipa_nvstate *nvstate) @@ -77,8 +77,8 @@
/* serialize dynamically allocated struct members (append code for new members here) */ nvstate_bin = nvstate_serialize_ipa_buf(nvstate_bin, nvstate->iot_euicc_emu.eim_cfg_ber); - nvstate_bin = nvstate_serialize_ipa_buf(nvstate_bin, nvstate->iot_euicc_emu.auto_enable.smdp_oid); - nvstate_bin = nvstate_serialize_ipa_buf(nvstate_bin, nvstate->iot_euicc_emu.auto_enable.smdp_address); + nvstate_bin = nvstate_serialize_ipa_buf(nvstate_bin, nvstate->iot_euicc_emu.immediate_enable.smdp_oid); + nvstate_bin = nvstate_serialize_ipa_buf(nvstate_bin, nvstate->iot_euicc_emu.immediate_enable.smdp_address); return nvstate_bin; }
@@ -126,8 +126,8 @@
/* deserialize dynamically allocated struct members (append code for new members here) */ nvstate->iot_euicc_emu.eim_cfg_ber = nvstate_deserialize_ipa_buf(&nvstate_data, &nvstate_data_len); - nvstate->iot_euicc_emu.auto_enable.smdp_oid = nvstate_deserialize_ipa_buf(&nvstate_data, &nvstate_data_len); - nvstate->iot_euicc_emu.auto_enable.smdp_address = nvstate_deserialize_ipa_buf(&nvstate_data, &nvstate_data_len); + nvstate->iot_euicc_emu.immediate_enable.smdp_oid = nvstate_deserialize_ipa_buf(&nvstate_data, &nvstate_data_len); + nvstate->iot_euicc_emu.immediate_enable.smdp_address = nvstate_deserialize_ipa_buf(&nvstate_data, &nvstate_data_len); }
/*! Read eIM configuration from eUICC and pick a suitable eIM. @@ -250,16 +250,18 @@ * \param[inout] operatnl_profiles apply reset option "deleteOperationalProfiles". * \param[inout] test_profiles apply reset option "deleteFieldLoadedTestProfiles". * \param[inout] default_smdp_addr apply reset option "resetDefaultSmdpAddress". + * \param[inout] eim_cfg_data apply reset option "resetEimConfigData". + * \param[inout] immediate_enable_cfg apply reset option "resetImmediateEnableConfig". * \returns 0 on success, negative on error. */ int ipa_euicc_mem_rst(struct ipa_context *ctx, bool operatnl_profiles, bool test_profiles, bool default_smdp_addr, - bool eim_cfg_data, bool auto_enable_cfg) + bool eim_cfg_data, bool immediate_enable_cfg) { struct ipa_es10b_euicc_mem_rst euicc_mem_rst = { 0 }; euicc_mem_rst.operatnl_profiles = operatnl_profiles; euicc_mem_rst.test_profiles = test_profiles; euicc_mem_rst.default_smdp_addr = default_smdp_addr; euicc_mem_rst.eim_cfg_data = eim_cfg_data; - euicc_mem_rst.auto_enable_cfg = auto_enable_cfg; + euicc_mem_rst.immediate_enable_cfg = immediate_enable_cfg; return ipa_es10b_euicc_mem_rst(ctx, &euicc_mem_rst); }
@@ -346,9 +348,9 @@ nvstate = nvstate_serialize(&ctx->nvstate);
IPA_FREE(ctx->iot_euicc_emu.rollback_iccid); - ipa_buf_free(ctx->iot_euicc_emu.auto_enable.smdp_oid); - ipa_buf_free(ctx->iot_euicc_emu.auto_enable.smdp_address); - ipa_buf_free(ctx->iot_euicc_emu.auto_enable.profile_aid); + ipa_buf_free(ctx->iot_euicc_emu.immediate_enable.smdp_oid); + ipa_buf_free(ctx->iot_euicc_emu.immediate_enable.smdp_address); + ipa_buf_free(ctx->iot_euicc_emu.immediate_enable.profile_aid); IPA_FREE(ctx->eim_id); IPA_FREE(ctx->eim_fqdn); ipa_proc_eucc_pkg_dwnld_exec_res_free(ctx->proc_eucc_pkg_dwnld_exec_res);
-
laforge