jolly has uploaded this change for review.

View Change

V1.2: Rename TransactionId in EuiccPackageResultDataSigned

Reference: SGP.32 Section 2.11.2

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

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

diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn
index efe2e18..e97b418 100644
--- a/asn1/SGP32Definitions.asn
+++ b/asn1/SGP32Definitions.asn
@@ -160,7 +160,7 @@
 EuiccPackageResultDataSigned ::= SEQUENCE { -- #SupportedForPsmoV1.0.0#
   eimId [0] UTF8String,
   counterValue [1] INTEGER,
-  transactionId[2] TransactionId OPTIONAL,
+  eimTransactionId[2] TransactionId OPTIONAL,
   seqNumber [3] INTEGER,
   euiccResult SEQUENCE OF EuiccResultData
 }
diff --git a/src/ipa/libasn/EuiccPackageResultDataSigned.c b/src/ipa/libasn/EuiccPackageResultDataSigned.c
index b8ef57a..f1e6b3a 100644
--- a/src/ipa/libasn/EuiccPackageResultDataSigned.c
+++ b/src/ipa/libasn/EuiccPackageResultDataSigned.c
@@ -62,14 +62,14 @@
 		0, 0, /* No default value */
 		"counterValue"
 		},
-	{ ATF_POINTER, 1, offsetof(struct EuiccPackageResultDataSigned, transactionId),
+	{ ATF_POINTER, 1, offsetof(struct EuiccPackageResultDataSigned, 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 EuiccPackageResultDataSigned, seqNumber),
 		(ASN_TAG_CLASS_CONTEXT | (3 << 2)),
@@ -98,7 +98,7 @@
     { (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)), 4, 0, 0 }, /* euiccResult */
     { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* eimId */
     { (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* counterValue */
-    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* transactionId */
+    { (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 }, /* eimTransactionId */
     { (ASN_TAG_CLASS_CONTEXT | (3 << 2)), 3, 0, 0 } /* seqNumber */
 };
 asn_SEQUENCE_specifics_t asn_SPC_EuiccPackageResultDataSigned_specs_1 = {
diff --git a/src/ipa/libasn/EuiccPackageResultDataSigned.h b/src/ipa/libasn/EuiccPackageResultDataSigned.h
index 63a4593..32616a5 100644
--- a/src/ipa/libasn/EuiccPackageResultDataSigned.h
+++ b/src/ipa/libasn/EuiccPackageResultDataSigned.h
@@ -30,7 +30,7 @@
 typedef struct EuiccPackageResultDataSigned {
 	UTF8String_t	 eimId;
 	long	 counterValue;
-	TransactionId_t	*transactionId	/* OPTIONAL */;
+	TransactionId_t	*eimTransactionId	/* OPTIONAL */;
 	long	 seqNumber;
 	struct EuiccPackageResultDataSigned__euiccResult {
 		A_SEQUENCE_OF(struct EuiccResultData) list;
diff --git a/src/ipa/libipa/es10b_load_euicc_pkg.c b/src/ipa/libipa/es10b_load_euicc_pkg.c
index ff1fc01..d328bd4 100644
--- a/src/ipa/libipa/es10b_load_euicc_pkg.c
+++ b/src/ipa/libipa/es10b_load_euicc_pkg.c
@@ -618,7 +618,7 @@
 	asn->choice.euiccPackageResultSigned.euiccPackageResultDataSigned.counterValue =
 	    req->req.euiccPackageSigned.counterValue;
 	if (req->req.euiccPackageSigned.eimTransactionId) {
-		asn->choice.euiccPackageResultSigned.euiccPackageResultDataSigned.transactionId =
+		asn->choice.euiccPackageResultSigned.euiccPackageResultDataSigned.eimTransactionId =
 		    ipa_asn1c_dup(&asn_DEF_TransactionId, req->req.euiccPackageSigned.eimTransactionId);
 	}
 	asn->choice.euiccPackageResultSigned.euiccPackageResultDataSigned.seqNumber = 0;

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