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;