jolly has uploaded this change for review.

View Change

V1.2: Change field name in InitiateAuthenticationOkEsipa

Change the fiel name euiccCiPKIdToBeUsed in
InitiateAuthenticationOkEsipa to euiccCiPKIdentifierToBeUsed.

Reference: SGP.32 Section 6.3.2.1

Related: SYS#8101
Change-Id: I68d59b44bd8b5dd23ae070d42dab9727c0da5272
---
M asn1/SGP32Definitions.asn
M src/ipa/libasn/InitiateAuthenticationOkEsipa.c
M src/ipa/libasn/InitiateAuthenticationOkEsipa.h
M src/ipa/libipa/proc_cmn_mtl_auth.c
4 files changed, 6 insertions(+), 6 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/58/43058/1

diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index 3bc2398..0f6b892 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -887,7 +887,7 @@
   transactionId [0] TransactionId OPTIONAL, -- The TransactionID generated by the SM-DP+
   serverSigned1 ServerSigned1, -- Signed information
   serverSignature1 [APPLICATION 55] OCTET STRING, -- Server Sign1, Tag '5F37'
-  euiccCiPKIdToBeUsed OCTET STRING, -- Key identifier (possibly truncated) of the CI Public Key to be used as required by ES10b.AuthenticateServer
+  euiccCiPKIdentifierToBeUsed OCTET STRING, -- Key identifier (possibly truncated) of the CI Public Key to be used as required by ES10b.AuthenticateServer
   serverCertificate Certificate,
   matchingId UTF8String OPTIONAL,
   ctxParams1 [2] CtxParams1 OPTIONAL
diff --git a/src/ipa/libasn/InitiateAuthenticationOkEsipa.c b/src/ipa/libasn/InitiateAuthenticationOkEsipa.c
index 0a208dd..3f2a065 100644
--- a/src/ipa/libasn/InitiateAuthenticationOkEsipa.c
+++ b/src/ipa/libasn/InitiateAuthenticationOkEsipa.c
@@ -35,14 +35,14 @@
 		0, 0, /* No default value */
 		"serverSignature1"
 		},
-	{ ATF_NOFLAGS, 0, offsetof(struct InitiateAuthenticationOkEsipa, euiccCiPKIdToBeUsed),
+	{ ATF_NOFLAGS, 0, offsetof(struct InitiateAuthenticationOkEsipa, euiccCiPKIdentifierToBeUsed),
 		(ASN_TAG_CLASS_UNIVERSAL | (4 << 2)),
 		0,
 		&asn_DEF_OCTET_STRING,
 		0,
 		{ 0, 0, 0 },
 		0, 0, /* No default value */
-		"euiccCiPKIdToBeUsed"
+		"euiccCiPKIdentifierToBeUsed"
 		},
 	{ ATF_NOFLAGS, 0, offsetof(struct InitiateAuthenticationOkEsipa, serverCertificate),
 		(ASN_TAG_CLASS_UNIVERSAL | (16 << 2)),
@@ -77,7 +77,7 @@
 	(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
 };
 static const asn_TYPE_tag2member_t asn_MAP_InitiateAuthenticationOkEsipa_tag2el_1[] = {
-    { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 3, 0, 0 }, /* euiccCiPKIdToBeUsed */
+    { (ASN_TAG_CLASS_UNIVERSAL | (4 << 2)), 3, 0, 0 }, /* euiccCiPKIdentifierToBeUsed */
     { (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 5, 0, 0 }, /* matchingId */
     { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 1, 0, 1 }, /* serverSigned1 */
     { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 4, -1, 0 }, /* serverCertificate */
diff --git a/src/ipa/libasn/InitiateAuthenticationOkEsipa.h b/src/ipa/libasn/InitiateAuthenticationOkEsipa.h
index 90af2bf..7880a03 100644
--- a/src/ipa/libasn/InitiateAuthenticationOkEsipa.h
+++ b/src/ipa/libasn/InitiateAuthenticationOkEsipa.h
@@ -31,7 +31,7 @@
 	TransactionId_t	*transactionId	/* OPTIONAL */;
 	ServerSigned1_t	 serverSigned1;
 	OCTET_STRING_t	 serverSignature1;
-	OCTET_STRING_t	 euiccCiPKIdToBeUsed;
+	OCTET_STRING_t	 euiccCiPKIdentifierToBeUsed;
 	Certificate_t	 serverCertificate;
 	UTF8String_t	*matchingId	/* OPTIONAL */;
 	struct CtxParams1	*ctxParams1	/* OPTIONAL */;
diff --git a/src/ipa/libipa/proc_cmn_mtl_auth.c b/src/ipa/libipa/proc_cmn_mtl_auth.c
index a8670ae..53ad401 100644
--- a/src/ipa/libipa/proc_cmn_mtl_auth.c
+++ b/src/ipa/libipa/proc_cmn_mtl_auth.c
@@ -205,7 +205,7 @@
 	auth_serv_req.req.serverSignature1.size =
 	    ipa_strip_tlv_envelope(auth_serv_req.req.serverSignature1.buf, auth_serv_req.req.serverSignature1.size,
 				   0x5f37);
-	auth_serv_req.req.euiccCiPKIdToBeUsed = init_auth_res->init_auth_ok->euiccCiPKIdToBeUsed;
+	auth_serv_req.req.euiccCiPKIdToBeUsed = init_auth_res->init_auth_ok->euiccCiPKIdentifierToBeUsed;
 	auth_serv_req.req.euiccCiPKIdToBeUsed.size =
 	    ipa_strip_tlv_envelope(auth_serv_req.req.euiccCiPKIdToBeUsed.buf,
 				   auth_serv_req.req.euiccCiPKIdToBeUsed.size, 0x04);

To view, visit change 43058. To unsubscribe, or for help writing mail filters, visit settings.