laforge has submitted this change. (
https://gerrit.osmocom.org/c/onomondo-ipa/+/43027?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)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(-)
Approvals:
dexter: Looks good to me, approved
Jenkins Builder: Verified
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 fd3f1df..03ac65a 100644
--- a/src/ipa/libipa/es10b_load_euicc_pkg.c
+++ b/src/ipa/libipa/es10b_load_euicc_pkg.c
@@ -564,9 +564,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: merged
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I46270d626d64f4ca6513423d9cebfc929076027d
Gerrit-Change-Number: 43027
Gerrit-PatchSet: 2
Gerrit-Owner: jolly <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
