osmith has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/42861?usp=email )
(
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
)Change subject: utils: ignore Waddress in IPA_STR_FROM_ASN
......................................................................
utils: ignore Waddress in IPA_STR_FROM_ASN
When building with -Werror, GCC complains about this assert in the macro:
#define IPA_STR_FROM_ASN(asn1_obj) ({ \
char *__str; \
assert(asn1_obj); \ <----------------------
__str = IPA_ALLOC_N((asn1_obj)->size + 1); \
assert(__str); \
memcpy(__str, (asn1_obj)->buf, (asn1_obj)->size); \
__str[(asn1_obj)->size] = '\0'; \
__str; \
})
For example:
…/src/ipa/libipa/es10b_get_eim_cfg_data.c:48:21: error: the comparison will always evaluate as ‘true’ for the address of ‘eimId’ will never be NULL [-Werror=address]
48 | IPA_STR_FROM_ASN(&res->res->eimConfigurationDataList.list.array[i]->eimId);
Add pragmas to ignore the error, so it can still assert if somebody
should pass NULL to the macro.
Change-Id: Ia2ef30880dd3e5b2ab90eedd0046a95a22614a81
---
M src/ipa/libipa/utils.h
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
dexter: Looks good to me, approved
diff --git a/src/ipa/libipa/utils.h b/src/ipa/libipa/utils.h
index 8ae5b66..2f95ecd 100644
--- a/src/ipa/libipa/utils.h
+++ b/src/ipa/libipa/utils.h
@@ -100,7 +100,10 @@
* \returns null terminated char array with contents of asn1_obj. */
#define IPA_STR_FROM_ASN(asn1_obj) ({ \
char *__str; \
+ _Pragma("GCC diagnostic push") \
+ _Pragma("GCC diagnostic ignored \"-Waddress\"") \
assert(asn1_obj); \
+ _Pragma("GCC diagnostic pop") \
__str = IPA_ALLOC_N((asn1_obj)->size + 1); \
assert(__str); \
memcpy(__str, (asn1_obj)->buf, (asn1_obj)->size); \
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/42861?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: Ia2ef30880dd3e5b2ab90eedd0046a95a22614a81
Gerrit-Change-Number: 42861
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Attention is currently required from: dexter, fixeria, laforge.
Hello Jenkins Builder, dexter, laforge,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/42674?usp=email
to look at the new patch set (#7).
The following approvals got outdated and were removed:
Code-Review+1 by dexter, Code-Review+1 by laforge, Verified+1 by Jenkins Builder
Change subject: SmspTpScAddr: fix SMSP record length and alpha_id padding
......................................................................
SmspTpScAddr: fix SMSP record length and alpha_id padding
apply_val() was re-encoding the SMSP with the minimum total_len of 28,
which produces a 28-byte body with no alpha_id field. After a DER
round-trip, the profile machinery re-pads the body to the original
record length using the template's fill pattern, which may not be 0xFF.
Those non-0xFF fill bytes end up in the alpha_id area, and GSM 7-bit
decoding then fails with a KeyError when the modified profile is read
back.
Fix by:
- setting alpha_id = '' so the field is present but empty
- setting f_smsp.rec_len = 42 (28 fixed bytes + 14 bytes of alpha_id
padding) so the re-encoded body carries 0xFF-padded alpha_id space
and the efFileSize in the fileDescriptor stays consistent
- passing total_len=f_smsp.rec_len to encode_record_bin() so the
alpha_id area is actually padded to that length
Change-Id: Ief6e02517f3e96158a2509d763b88aec4bd5a296
Jenkins: skip-card-test
---
M pySim/esim/saip/personalization.py
1 file changed, 20 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/74/42674/7
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/42674?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ief6e02517f3e96158a2509d763b88aec4bd5a296
Gerrit-Change-Number: 42674
Gerrit-PatchSet: 7
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-CC: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: dexter.
osmith has posted comments on this change by osmith. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/42858?usp=email )
Change subject: contrib/jenkins: new script
......................................................................
Patch Set 1:
(1 comment)
File contrib/jenkins.sh:
https://gerrit.osmocom.org/c/onomondo-ipa/+/42858/comment/ccf47c1d_4108ed48… :
PS1, Line 6: cmake -DENABLE_SANITIZE=ON ../
> I would add -DSHOW_ASN_OUTPUT=ON as well since we also want to include the code that formats that ou […]
Done
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/42858?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I0305c3196896667f4963853099d0767e0acbdb30
Gerrit-Change-Number: 42858
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Mon, 22 Jun 2026 12:03:04 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Attention is currently required from: osmith.
Hello Jenkins Builder, dexter,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/onomondo-ipa/+/42860?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Verified+1 by Jenkins Builder
The change is no longer submittable: Verified is unsatisfied now.
Change subject: esipa: fix printf fmt str for ssize_t
......................................................................
esipa: fix printf fmt str for ssize_t
Fix for:
In file included from …/src/ipa/libipa/esipa.c:14:
…/src/ipa/libipa/esipa.c: In function ‘ipa_esipa_msg_to_eim_enc’:
…/src/ipa/libipa/esipa.h:16:33: error: format ‘%d’ expects argument of type ‘int’, but argument 7 has type ‘ssize_t’ {aka ‘long int’} [-Werror=form
at=]
16 | IPA_LOGP(SESIPA, level, "%s: " fmt, func, ## args)
| ^~~~~~
…/include/onomondo/ipa/log.h:18:53: note: in definition of macro ‘IPA_LOGP’
18 | ipa_logp(subsys, level, __FILE__, __LINE__, fmt, ## args)
| ^~~
…/src/ipa/libipa/esipa.c:129:17: note: in expansion of macro ‘IPA_LOGP_ESIPA’
129 | IPA_LOGP_ESIPA(function_name, LERROR, "cannot encode eIM request! rc = %d\n", rc.encoded);
| ^~~~~~~~~~~~~~
Change-Id: I5b210ae5acff362cf845f6a37073d2bffe69c76e
---
M src/ipa/libipa/esipa.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/onomondo-ipa refs/changes/60/42860/2
--
To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/42860?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: onomondo-ipa
Gerrit-Branch: master
Gerrit-Change-Id: I5b210ae5acff362cf845f6a37073d2bffe69c76e
Gerrit-Change-Number: 42860
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>