August 2026 - gerrit-log - lists.osmocom.org

[XS] Change in simtrace2[master]: contrib/jenkins.sh: pin libosmocore to the last release
by pespin 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, lynxis lazus. pespin has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email ) Change subject: contrib/jenkins.sh: pin libosmocore to the last release ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: But then you are also pinning it for host ones... In any case, if there's a specific jenkins job uploading the build to some published http server, then imho it probably makes sense to have an ENVVAR defaulting to master which that specific job pins to whatever libosmocore version we want to upload. -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c Gerrit-Change-Number: 43281 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 12:29:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[L] Change in onomondo-ipa[master]: V1.2: Add function ES10b.DisableEmergencyProfile
by jolly 18 Aug '26

18 Aug '26

jolly has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43044?usp=email ) Change subject: V1.2: Add function ES10b.DisableEmergencyProfile ...................................................................... V1.2: Add function ES10b.DisableEmergencyProfile Add new library function to disable emergency profile on IoT eUICC. Also add an option to the command line interface to call the library function. The optional refresh flag may be set via command line option. The function cannot be emulated with non-IoT eUICC. Reference: SGP.32 Section 5.9.23 Related: SYS#8101 Change-Id: I2af2077228fb8c5fa3f254acc15bd0afaa33fe43 --- M asn1/SGP32Definitions.asn M include/onomondo/ipa/ipad.h M src/ipa/libasn/CMakeLists.txt A src/ipa/libasn/DisableEmergencyProfileRequest.c A src/ipa/libasn/DisableEmergencyProfileRequest.h A src/ipa/libasn/DisableEmergencyProfileResponse.c A src/ipa/libasn/DisableEmergencyProfileResponse.h M src/ipa/libipa/CMakeLists.txt A src/ipa/libipa/es10b_dis_emerg_prfle.c A src/ipa/libipa/es10b_dis_emerg_prfle.h M src/ipa/libipa/ipad.c M src/ipa/main.c 12 files changed, 374 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve dexter: Looks good to me, approved diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index 9c06255..e691ba7 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -648,6 +648,23 @@ } -- ASN1STOP +-- Section 5.9.23 +-- ASN1START +DisableEmergencyProfileRequest ::= [92] SEQUENCE { -- Tag 'BF5C' + refreshFlag BOOLEAN -- indicating whether REFRESH is required +} +-- ASN1STOP +-- ASN1START +DisableEmergencyProfileResponse ::= [92] SEQUENCE { -- Tag 'BF5C' + disableEmergencyProfileResult [0] INTEGER { + ok(0), + profileNotInEnabledState(2), + catBusy(5), + undefinedError(127) + } +} +-- ASN1STOP + -- Section 5.9.25 -- ASN1START SGP32-SetDefaultDpAddressRequest ::= [101] SEQUENCE { -- Tag 'BF65' diff --git a/include/onomondo/ipa/ipad.h b/include/onomondo/ipa/ipad.h index db43fac..29bbd27 100644 --- a/include/onomondo/ipa/ipad.h +++ b/include/onomondo/ipa/ipad.h @@ -97,6 +97,7 @@ int ipa_execute_fallback_mechanism(struct ipa_context *ctx); int ipa_return_from_fallback(struct ipa_context *ctx); int ipa_enable_emerg_prfle(struct ipa_context *ctx); +int ipa_disable_emerg_prfle(struct ipa_context *ctx); int ipa_poll(struct ipa_context *ctx); void ipa_close(struct ipa_context *ctx); struct ipa_buf *ipa_free_ctx(struct ipa_context *ctx); diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt index f25fa19..209a5f3 100644 --- a/src/ipa/libasn/CMakeLists.txt +++ b/src/ipa/libasn/CMakeLists.txt @@ -247,6 +247,10 @@ DeviceInfo.h DirectoryString.c DirectoryString.h +DisableEmergencyProfileRequest.c +DisableEmergencyProfileRequest.h +DisableEmergencyProfileResponse.c +DisableEmergencyProfileResponse.h DisableProfileRequest.c DisableProfileRequest.h DisableProfileResponse.c diff --git a/src/ipa/libasn/DisableEmergencyProfileRequest.c b/src/ipa/libasn/DisableEmergencyProfileRequest.c new file mode 100644 index 0000000..d5a273f --- /dev/null +++ b/src/ipa/libasn/DisableEmergencyProfileRequest.c @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#include "DisableEmergencyProfileRequest.h" + +static asn_TYPE_member_t asn_MBR_DisableEmergencyProfileRequest_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct DisableEmergencyProfileRequest, refreshFlag), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_BOOLEAN, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "refreshFlag" + }, +}; +static const ber_tlv_tag_t asn_DEF_DisableEmergencyProfileRequest_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (92 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_DisableEmergencyProfileRequest_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* refreshFlag */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_DisableEmergencyProfileRequest_specs_1 = { + sizeof(struct DisableEmergencyProfileRequest), + offsetof(struct DisableEmergencyProfileRequest, _asn_ctx), + asn_MAP_DisableEmergencyProfileRequest_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_DisableEmergencyProfileRequest = { + "DisableEmergencyProfileRequest", + "DisableEmergencyProfileRequest", + &asn_OP_SEQUENCE, + asn_DEF_DisableEmergencyProfileRequest_tags_1, + sizeof(asn_DEF_DisableEmergencyProfileRequest_tags_1) + /sizeof(asn_DEF_DisableEmergencyProfileRequest_tags_1[0]) - 1, /* 1 */ + asn_DEF_DisableEmergencyProfileRequest_tags_1, /* Same as above */ + sizeof(asn_DEF_DisableEmergencyProfileRequest_tags_1) + /sizeof(asn_DEF_DisableEmergencyProfileRequest_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_DisableEmergencyProfileRequest_1, + 1, /* Elements count */ + &asn_SPC_DisableEmergencyProfileRequest_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/DisableEmergencyProfileRequest.h b/src/ipa/libasn/DisableEmergencyProfileRequest.h new file mode 100644 index 0000000..04c8057 --- /dev/null +++ b/src/ipa/libasn/DisableEmergencyProfileRequest.h @@ -0,0 +1,42 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#ifndef _DisableEmergencyProfileRequest_H_ +#define _DisableEmergencyProfileRequest_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <BOOLEAN.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* DisableEmergencyProfileRequest */ +typedef struct DisableEmergencyProfileRequest { + BOOLEAN_t refreshFlag; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} DisableEmergencyProfileRequest_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_DisableEmergencyProfileRequest; + +#ifdef __cplusplus +} +#endif + +#endif /* _DisableEmergencyProfileRequest_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/DisableEmergencyProfileResponse.c b/src/ipa/libasn/DisableEmergencyProfileResponse.c new file mode 100644 index 0000000..12e6527 --- /dev/null +++ b/src/ipa/libasn/DisableEmergencyProfileResponse.c @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#include "DisableEmergencyProfileResponse.h" + +static asn_TYPE_member_t asn_MBR_DisableEmergencyProfileResponse_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct DisableEmergencyProfileResponse, disableEmergencyProfileResult), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_NativeInteger, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "disableEmergencyProfileResult" + }, +}; +static const ber_tlv_tag_t asn_DEF_DisableEmergencyProfileResponse_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (92 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_DisableEmergencyProfileResponse_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* disableEmergencyProfileResult */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_DisableEmergencyProfileResponse_specs_1 = { + sizeof(struct DisableEmergencyProfileResponse), + offsetof(struct DisableEmergencyProfileResponse, _asn_ctx), + asn_MAP_DisableEmergencyProfileResponse_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_DisableEmergencyProfileResponse = { + "DisableEmergencyProfileResponse", + "DisableEmergencyProfileResponse", + &asn_OP_SEQUENCE, + asn_DEF_DisableEmergencyProfileResponse_tags_1, + sizeof(asn_DEF_DisableEmergencyProfileResponse_tags_1) + /sizeof(asn_DEF_DisableEmergencyProfileResponse_tags_1[0]) - 1, /* 1 */ + asn_DEF_DisableEmergencyProfileResponse_tags_1, /* Same as above */ + sizeof(asn_DEF_DisableEmergencyProfileResponse_tags_1) + /sizeof(asn_DEF_DisableEmergencyProfileResponse_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_DisableEmergencyProfileResponse_1, + 1, /* Elements count */ + &asn_SPC_DisableEmergencyProfileResponse_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/DisableEmergencyProfileResponse.h b/src/ipa/libasn/DisableEmergencyProfileResponse.h new file mode 100644 index 0000000..898b2c6 --- /dev/null +++ b/src/ipa/libasn/DisableEmergencyProfileResponse.h @@ -0,0 +1,50 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#ifndef _DisableEmergencyProfileResponse_H_ +#define _DisableEmergencyProfileResponse_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NativeInteger.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dependencies */ +typedef enum DisableEmergencyProfileResponse__disableEmergencyProfileResult { + DisableEmergencyProfileResponse__disableEmergencyProfileResult_ok = 0, + DisableEmergencyProfileResponse__disableEmergencyProfileResult_profileNotInEnabledState = 2, + DisableEmergencyProfileResponse__disableEmergencyProfileResult_catBusy = 5, + DisableEmergencyProfileResponse__disableEmergencyProfileResult_undefinedError = 127 +} e_DisableEmergencyProfileResponse__disableEmergencyProfileResult; + +/* DisableEmergencyProfileResponse */ +typedef struct DisableEmergencyProfileResponse { + long disableEmergencyProfileResult; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} DisableEmergencyProfileResponse_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_DisableEmergencyProfileResponse; + +#ifdef __cplusplus +} +#endif + +#endif /* _DisableEmergencyProfileResponse_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libipa/CMakeLists.txt b/src/ipa/libipa/CMakeLists.txt index 8b5b9f8..d25b35b 100644 --- a/src/ipa/libipa/CMakeLists.txt +++ b/src/ipa/libipa/CMakeLists.txt @@ -23,6 +23,7 @@ es10b_exec_fallback_mech.c es10b_ret_from_fallback.c es10b_en_emerg_prfle.c + es10b_dis_emerg_prfle.c es10c_delete_prfle.c es10c_disable_prfle.c es10c_enable_prfle.c diff --git a/src/ipa/libipa/es10b_dis_emerg_prfle.c b/src/ipa/libipa/es10b_dis_emerg_prfle.c new file mode 100644 index 0000000..e71cf94 --- /dev/null +++ b/src/ipa/libipa/es10b_dis_emerg_prfle.c @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved. + * + * SPDX-License-Identifier: AGPL-3.0-only + * + * Author: Philipp Maier <pmaier(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * Andreas Eversberg <aeversberg(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * + * See also: GSMA SGP.22, 5.9.23: Function (ES10b): DisableEmergencyProfile + */ + +#include <stdio.h> +#include <assert.h> +#include <onomondo/ipa/utils.h> +#include "context.h" +#include "utils.h" +#include "euicc.h" +#include "es10x.h" +#include "es10b_dis_emerg_prfle.h" + +static const struct num_str_map error_code_strings[] = { + { DisableEmergencyProfileResponse__disableEmergencyProfileResult_ok, "ok" }, + { DisableEmergencyProfileResponse__disableEmergencyProfileResult_profileNotInEnabledState, "profileNotInEnabledState" }, + { DisableEmergencyProfileResponse__disableEmergencyProfileResult_catBusy, "catBusy" }, + { DisableEmergencyProfileResponse__disableEmergencyProfileResult_undefinedError, "undefinedError" }, + { 0, NULL } +}; + +static int dec_dis_emerg_prfle_res(struct ipa_es10b_dis_emerg_prfle_res *res, const struct ipa_buf *es10b_res) +{ + struct DisableEmergencyProfileResponse *asn = NULL; + + asn = ipa_es10x_res_dec(&asn_DEF_DisableEmergencyProfileResponse, es10b_res, "DisableEmergencyProfile"); + if (!asn) + return -EINVAL; + + if (asn->disableEmergencyProfileResult != DisableEmergencyProfileResponse__disableEmergencyProfileResult_ok) { + IPA_LOGP_ES10X("DisableEmergencyProfile", LERROR, "function failed with error code %ld=%s!\n", + asn->disableEmergencyProfileResult, + ipa_str_from_num(error_code_strings, asn->disableEmergencyProfileResult, "(unknown)")); + } else { + IPA_LOGP_ES10X("DisableEmergencyProfile", LERROR, "function succeeded with status code %ld=%s!\n", + asn->disableEmergencyProfileResult, + ipa_str_from_num(error_code_strings, asn->disableEmergencyProfileResult, "(unknown)")); + } + + res->res = asn; + return 0; +} + +static struct DisableEmergencyProfileResponse *generate_dis_emerg_prfle_err(void) +{ + struct DisableEmergencyProfileResponse *res = IPA_ALLOC_ZERO(struct DisableEmergencyProfileResponse); + + assert(res); + res->disableEmergencyProfileResult = DisableEmergencyProfileResponse__disableEmergencyProfileResult_undefinedError; + return res; +} + +/*! Function (Es10b): DisableEmergencyProfile. + * \param[inout] ctx pointer to ipa_context. + * \param[in] refresh_flag send a CAT refresh after enabling profile. + * \returns pointer newly allocated struct with function result, NULL on error. */ +struct ipa_es10b_dis_emerg_prfle_res *ipa_es10b_dis_emerg_prfle(struct ipa_context *ctx, bool refresh_flag) +{ + struct ipa_buf *es10b_req = NULL; + struct ipa_buf *es10b_res = NULL; + struct DisableEmergencyProfileRequest req = { 0 }; + struct ipa_es10b_dis_emerg_prfle_res *res = IPA_ALLOC_ZERO(struct ipa_es10b_dis_emerg_prfle_res); + int rc; + + if (ctx->cfg->iot_euicc_emu_enabled) { + IPA_LOGP_ES10X("DisableEmergencyProfile", LERROR, + "Unable to emulate switching back from emergency profile.\n"); + res->res = generate_dis_emerg_prfle_err(); + return res; + } + + req.refreshFlag = refresh_flag; + + es10b_req = ipa_es10x_req_enc(&asn_DEF_DisableEmergencyProfileRequest, &req, "DisableEmergencyProfile"); + if (!es10b_req) { + IPA_LOGP_ES10X("DisableEmergencyProfile", LERROR, "unable to encode Es10b request\n"); + goto error; + } + + es10b_res = ipa_euicc_transceive_es10x(ctx, es10b_req); + if (!es10b_res) { + IPA_LOGP_ES10X("DisableEmergencyProfile", LERROR, "no Es10b response\n"); + goto error; + } + + rc = dec_dis_emerg_prfle_res(res, es10b_res); + if (rc < 0) + goto error; + + IPA_FREE(es10b_req); + IPA_FREE(es10b_res); + return res; +error: + IPA_FREE(es10b_req); + IPA_FREE(es10b_res); + ipa_es10b_dis_emerg_prfle_res_free(res); + return NULL; +} + +/*! Free results of function (Es10b): DisableEmergencyProfile. + * \param[in] res pointer to function result. */ +void ipa_es10b_dis_emerg_prfle_res_free(struct ipa_es10b_dis_emerg_prfle_res *res) +{ + IPA_ES10X_RES_FREE(asn_DEF_DisableEmergencyProfileResponse, res); +} diff --git a/src/ipa/libipa/es10b_dis_emerg_prfle.h b/src/ipa/libipa/es10b_dis_emerg_prfle.h new file mode 100644 index 0000000..b5a68c0 --- /dev/null +++ b/src/ipa/libipa/es10b_dis_emerg_prfle.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved. + * + * SPDX-License-Identifier: AGPL-3.0-only + */ + +#pragma once + +#include <DisableEmergencyProfileRequest.h> +#include <DisableEmergencyProfileResponse.h> +struct ipa_context; + +struct ipa_es10b_dis_emerg_prfle_res { + struct DisableEmergencyProfileResponse *res; +}; + +struct ipa_es10b_dis_emerg_prfle_res *ipa_es10b_dis_emerg_prfle(struct ipa_context *ctx, bool refresh_flag); +void ipa_es10b_dis_emerg_prfle_res_free(struct ipa_es10b_dis_emerg_prfle_res *res); diff --git a/src/ipa/libipa/ipad.c b/src/ipa/libipa/ipad.c index e79592c..a465444 100644 --- a/src/ipa/libipa/ipad.c +++ b/src/ipa/libipa/ipad.c @@ -28,6 +28,7 @@ #include "es10b_exec_fallback_mech.h" #include "es10b_ret_from_fallback.h" #include "es10b_en_emerg_prfle.h" +#include "es10b_dis_emerg_prfle.h" #include "proc_euicc_pkg_dwnld_exec.h" #include "proc_notif_delivery.h" @@ -322,6 +323,24 @@ return rc; } +/*! Trigger enabling of fallback profile. + * \param[inout] ctx pointer to ipa_context. + * \returns 0 on success, negative on error. */ +int ipa_disable_emerg_prfle(struct ipa_context *ctx) +{ + struct ipa_es10b_dis_emerg_prfle_res *res; + int rc = -EINVAL; + + res = ipa_es10b_dis_emerg_prfle(ctx, ctx->cfg->refresh_flag); + if (!res) + return -EIO; + if (res->res->disableEmergencyProfileResult == DisableEmergencyProfileResponse__disableEmergencyProfileResult_ok) + rc = 0; + ipa_es10b_dis_emerg_prfle_res_free(res); + + return rc; +} + static int check_canaries(struct ipa_context *ctx) { if (ctx->check_http) diff --git a/src/ipa/main.c b/src/ipa/main.c index c422fa7..d5ec942 100644 --- a/src/ipa/main.c +++ b/src/ipa/main.c @@ -31,6 +31,7 @@ OPER_EXEC_FALLBACK_MECH, OPER_RETURN_FROM_FALLBACK, OPER_ENABLE_EMERG_PRFLE, + OPER_DISABLE_EMERG_PRFLE, }; bool running = true; @@ -74,6 +75,7 @@ printf(" execute-fallback-mechanism .. Trigger enabling of fallback profile\n"); printf(" return-from-fallback ........ Trigger return from fallback profile to previous profile\n"); printf(" enable-emergency-profile .... Trigger enabling of emergency profile\n"); + printf(" disable-emergency-profile ... Trigger return from emergency profile to previous profile\n"); } struct ipa_buf *load_ber_from_file(char *dir, char *file) @@ -248,6 +250,8 @@ operation = OPER_RETURN_FROM_FALLBACK; } else if (!strcmp(argv[optind], "enable-emergency-profile")) { operation = OPER_ENABLE_EMERG_PRFLE; + } else if (!strcmp(argv[optind], "disable-emergency-profile")) { + operation = OPER_DISABLE_EMERG_PRFLE; } else if (!!strcmp(argv[optind], "get-eim-package")) { printf("unknown operation: %s\n", argv[optind]); exit(-1); @@ -371,6 +375,10 @@ /* Trigger enabling of emergency profile */ ipa_enable_emerg_prfle(ctx); break; + case OPER_DISABLE_EMERG_PRFLE: + /* Trigger return from emergency profile to previous profile */ + ipa_disable_emerg_prfle(ctx); + break; } leave: -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43044?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: I2af2077228fb8c5fa3f254acc15bd0afaa33fe43 Gerrit-Change-Number: 43044 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[L] Change in onomondo-ipa[master]: V1.2: Add function ES10b.EnableEmergencyProfile
by jolly 18 Aug '26

18 Aug '26

jolly has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43043?usp=email ) Change subject: V1.2: Add function ES10b.EnableEmergencyProfile ...................................................................... V1.2: Add function ES10b.EnableEmergencyProfile Add new library function to enable emergency profile on IoT eUICC. Also add an option to the command line interface to call the library function. The optional refresh flag may be set via command line option. The function cannot be emulated with non-IoT eUICC. Reference: SGP.32 Section 5.9.22 Related: SYS#8101 Change-Id: I0304b869a14a36b82cc2d1676b2a5f613e1da171 --- M asn1/SGP32Definitions.asn M include/onomondo/ipa/ipad.h M src/ipa/libasn/CMakeLists.txt A src/ipa/libasn/EnableEmergencyProfileRequest.c A src/ipa/libasn/EnableEmergencyProfileRequest.h A src/ipa/libasn/EnableEmergencyProfileResponse.c A src/ipa/libasn/EnableEmergencyProfileResponse.h M src/ipa/libipa/CMakeLists.txt A src/ipa/libipa/es10b_en_emerg_prfle.c A src/ipa/libipa/es10b_en_emerg_prfle.h M src/ipa/libipa/ipad.c M src/ipa/main.c 12 files changed, 377 insertions(+), 0 deletions(-) Approvals: dexter: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index 9f3ce9c..9c06255 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -630,6 +630,24 @@ } -- ASN1STOP +-- Section 5.9.22 +-- ASN1START +EnableEmergencyProfileRequest ::= [91] SEQUENCE { -- Tag 'BF5B' + refreshFlag BOOLEAN -- indicating whether REFRESH is required +} +-- ASN1STOP +-- ASN1START +EnableEmergencyProfileResponse ::= [91] SEQUENCE { -- Tag 'BF5B' + enableEmergencyProfileResult [0] INTEGER { + ok(0), + profileNotInDisabledState(2), + catBusy(5), + ecallNotAvailable(8), -- Emergency Profile does not exist + undefinedError(127) + } +} +-- ASN1STOP + -- Section 5.9.25 -- ASN1START SGP32-SetDefaultDpAddressRequest ::= [101] SEQUENCE { -- Tag 'BF65' diff --git a/include/onomondo/ipa/ipad.h b/include/onomondo/ipa/ipad.h index 8474097..db43fac 100644 --- a/include/onomondo/ipa/ipad.h +++ b/include/onomondo/ipa/ipad.h @@ -96,6 +96,7 @@ bool eim_cfg_data, bool immediate_enable_cfg); int ipa_execute_fallback_mechanism(struct ipa_context *ctx); int ipa_return_from_fallback(struct ipa_context *ctx); +int ipa_enable_emerg_prfle(struct ipa_context *ctx); int ipa_poll(struct ipa_context *ctx); void ipa_close(struct ipa_context *ctx); struct ipa_buf *ipa_free_ctx(struct ipa_context *ctx); diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt index 859578a..f25fa19 100644 --- a/src/ipa/libasn/CMakeLists.txt +++ b/src/ipa/libasn/CMakeLists.txt @@ -283,6 +283,10 @@ EimSupportedProtocol.h EmailAddress.c EmailAddress.h +EnableEmergencyProfileRequest.c +EnableEmergencyProfileRequest.h +EnableEmergencyProfileResponse.c +EnableEmergencyProfileResponse.h EnableProfileRequest.c EnableProfileRequest.h EnableProfileResponse.c diff --git a/src/ipa/libasn/EnableEmergencyProfileRequest.c b/src/ipa/libasn/EnableEmergencyProfileRequest.c new file mode 100644 index 0000000..2bbadb5 --- /dev/null +++ b/src/ipa/libasn/EnableEmergencyProfileRequest.c @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#include "EnableEmergencyProfileRequest.h" + +static asn_TYPE_member_t asn_MBR_EnableEmergencyProfileRequest_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct EnableEmergencyProfileRequest, refreshFlag), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_BOOLEAN, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "refreshFlag" + }, +}; +static const ber_tlv_tag_t asn_DEF_EnableEmergencyProfileRequest_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (91 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_EnableEmergencyProfileRequest_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* refreshFlag */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_EnableEmergencyProfileRequest_specs_1 = { + sizeof(struct EnableEmergencyProfileRequest), + offsetof(struct EnableEmergencyProfileRequest, _asn_ctx), + asn_MAP_EnableEmergencyProfileRequest_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_EnableEmergencyProfileRequest = { + "EnableEmergencyProfileRequest", + "EnableEmergencyProfileRequest", + &asn_OP_SEQUENCE, + asn_DEF_EnableEmergencyProfileRequest_tags_1, + sizeof(asn_DEF_EnableEmergencyProfileRequest_tags_1) + /sizeof(asn_DEF_EnableEmergencyProfileRequest_tags_1[0]) - 1, /* 1 */ + asn_DEF_EnableEmergencyProfileRequest_tags_1, /* Same as above */ + sizeof(asn_DEF_EnableEmergencyProfileRequest_tags_1) + /sizeof(asn_DEF_EnableEmergencyProfileRequest_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_EnableEmergencyProfileRequest_1, + 1, /* Elements count */ + &asn_SPC_EnableEmergencyProfileRequest_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/EnableEmergencyProfileRequest.h b/src/ipa/libasn/EnableEmergencyProfileRequest.h new file mode 100644 index 0000000..2eeb5a8 --- /dev/null +++ b/src/ipa/libasn/EnableEmergencyProfileRequest.h @@ -0,0 +1,42 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#ifndef _EnableEmergencyProfileRequest_H_ +#define _EnableEmergencyProfileRequest_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <BOOLEAN.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* EnableEmergencyProfileRequest */ +typedef struct EnableEmergencyProfileRequest { + BOOLEAN_t refreshFlag; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} EnableEmergencyProfileRequest_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_EnableEmergencyProfileRequest; + +#ifdef __cplusplus +} +#endif + +#endif /* _EnableEmergencyProfileRequest_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/EnableEmergencyProfileResponse.c b/src/ipa/libasn/EnableEmergencyProfileResponse.c new file mode 100644 index 0000000..4e8c04e --- /dev/null +++ b/src/ipa/libasn/EnableEmergencyProfileResponse.c @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#include "EnableEmergencyProfileResponse.h" + +static asn_TYPE_member_t asn_MBR_EnableEmergencyProfileResponse_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct EnableEmergencyProfileResponse, enableEmergencyProfileResult), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_NativeInteger, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "enableEmergencyProfileResult" + }, +}; +static const ber_tlv_tag_t asn_DEF_EnableEmergencyProfileResponse_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (91 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_EnableEmergencyProfileResponse_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* enableEmergencyProfileResult */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_EnableEmergencyProfileResponse_specs_1 = { + sizeof(struct EnableEmergencyProfileResponse), + offsetof(struct EnableEmergencyProfileResponse, _asn_ctx), + asn_MAP_EnableEmergencyProfileResponse_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_EnableEmergencyProfileResponse = { + "EnableEmergencyProfileResponse", + "EnableEmergencyProfileResponse", + &asn_OP_SEQUENCE, + asn_DEF_EnableEmergencyProfileResponse_tags_1, + sizeof(asn_DEF_EnableEmergencyProfileResponse_tags_1) + /sizeof(asn_DEF_EnableEmergencyProfileResponse_tags_1[0]) - 1, /* 1 */ + asn_DEF_EnableEmergencyProfileResponse_tags_1, /* Same as above */ + sizeof(asn_DEF_EnableEmergencyProfileResponse_tags_1) + /sizeof(asn_DEF_EnableEmergencyProfileResponse_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_EnableEmergencyProfileResponse_1, + 1, /* Elements count */ + &asn_SPC_EnableEmergencyProfileResponse_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/EnableEmergencyProfileResponse.h b/src/ipa/libasn/EnableEmergencyProfileResponse.h new file mode 100644 index 0000000..7ff7e36 --- /dev/null +++ b/src/ipa/libasn/EnableEmergencyProfileResponse.h @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#ifndef _EnableEmergencyProfileResponse_H_ +#define _EnableEmergencyProfileResponse_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NativeInteger.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dependencies */ +typedef enum EnableEmergencyProfileResponse__enableEmergencyProfileResult { + EnableEmergencyProfileResponse__enableEmergencyProfileResult_ok = 0, + EnableEmergencyProfileResponse__enableEmergencyProfileResult_profileNotInDisabledState = 2, + EnableEmergencyProfileResponse__enableEmergencyProfileResult_catBusy = 5, + EnableEmergencyProfileResponse__enableEmergencyProfileResult_ecallNotAvailable = 8, + EnableEmergencyProfileResponse__enableEmergencyProfileResult_undefinedError = 127 +} e_EnableEmergencyProfileResponse__enableEmergencyProfileResult; + +/* EnableEmergencyProfileResponse */ +typedef struct EnableEmergencyProfileResponse { + long enableEmergencyProfileResult; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} EnableEmergencyProfileResponse_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_EnableEmergencyProfileResponse; + +#ifdef __cplusplus +} +#endif + +#endif /* _EnableEmergencyProfileResponse_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libipa/CMakeLists.txt b/src/ipa/libipa/CMakeLists.txt index 45d8f4a..8b5b9f8 100644 --- a/src/ipa/libipa/CMakeLists.txt +++ b/src/ipa/libipa/CMakeLists.txt @@ -22,6 +22,7 @@ es10b_rm_notif_from_lst.c es10b_exec_fallback_mech.c es10b_ret_from_fallback.c + es10b_en_emerg_prfle.c es10c_delete_prfle.c es10c_disable_prfle.c es10c_enable_prfle.c diff --git a/src/ipa/libipa/es10b_en_emerg_prfle.c b/src/ipa/libipa/es10b_en_emerg_prfle.c new file mode 100644 index 0000000..d9db952 --- /dev/null +++ b/src/ipa/libipa/es10b_en_emerg_prfle.c @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved. + * + * SPDX-License-Identifier: AGPL-3.0-only + * + * Author: Philipp Maier <pmaier(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * Andreas Eversberg <aeversberg(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * + * See also: GSMA SGP.22, 5.9.22: Function (ES10b): EnableEmergencyProfile + */ + +#include <stdio.h> +#include <assert.h> +#include <onomondo/ipa/utils.h> +#include "context.h" +#include "utils.h" +#include "euicc.h" +#include "es10x.h" +#include "es10b_en_emerg_prfle.h" + +static const struct num_str_map error_code_strings[] = { + { EnableEmergencyProfileResponse__enableEmergencyProfileResult_ok, "ok" }, + { EnableEmergencyProfileResponse__enableEmergencyProfileResult_profileNotInDisabledState, "profileNotInDisabledState" }, + { EnableEmergencyProfileResponse__enableEmergencyProfileResult_catBusy, "catBusy" }, + { EnableEmergencyProfileResponse__enableEmergencyProfileResult_ecallNotAvailable, "ecallNotAvailable" }, + { EnableEmergencyProfileResponse__enableEmergencyProfileResult_undefinedError, "undefinedError" }, + { 0, NULL } +}; + +static int dec_en_emerg_prfle_res(struct ipa_es10b_en_emerg_prfle_res *res, const struct ipa_buf *es10b_res) +{ + struct EnableEmergencyProfileResponse *asn = NULL; + + asn = ipa_es10x_res_dec(&asn_DEF_EnableEmergencyProfileResponse, es10b_res, "EnableEmergencyProfile"); + if (!asn) + return -EINVAL; + + if (asn->enableEmergencyProfileResult != EnableEmergencyProfileResponse__enableEmergencyProfileResult_ok) { + IPA_LOGP_ES10X("EnableEmergencyProfile", LERROR, "function failed with error code %ld=%s!\n", + asn->enableEmergencyProfileResult, + ipa_str_from_num(error_code_strings, asn->enableEmergencyProfileResult, "(unknown)")); + } else { + IPA_LOGP_ES10X("EnableEmergencyProfile", LERROR, "function succeeded with status code %ld=%s!\n", + asn->enableEmergencyProfileResult, + ipa_str_from_num(error_code_strings, asn->enableEmergencyProfileResult, "(unknown)")); + } + + res->res = asn; + return 0; +} + +static struct EnableEmergencyProfileResponse *generate_en_emerg_prfle_err(void) +{ + struct EnableEmergencyProfileResponse *res = IPA_ALLOC_ZERO(struct EnableEmergencyProfileResponse); + + assert(res); + res->enableEmergencyProfileResult = EnableEmergencyProfileResponse__enableEmergencyProfileResult_undefinedError; + return res; +} + +/*! Function (Es10b): EnableEmergencyProfile. + * \param[inout] ctx pointer to ipa_context. + * \param[in] refresh_flag send a CAT refresh after enabling profile. + * \returns pointer newly allocated struct with function result, NULL on error. */ +struct ipa_es10b_en_emerg_prfle_res *ipa_es10b_en_emerg_prfle(struct ipa_context *ctx, bool refresh_flag) +{ + struct ipa_buf *es10b_req = NULL; + struct ipa_buf *es10b_res = NULL; + struct EnableEmergencyProfileRequest req = { 0 }; + struct ipa_es10b_en_emerg_prfle_res *res = IPA_ALLOC_ZERO(struct ipa_es10b_en_emerg_prfle_res); + int rc; + + if (ctx->cfg->iot_euicc_emu_enabled) { + IPA_LOGP_ES10X("EnableEmergencyProfile", LERROR, + "Unable to emulate switching to emergency profile.\n"); + res->res = generate_en_emerg_prfle_err(); + return res; + } + + req.refreshFlag = refresh_flag; + + es10b_req = ipa_es10x_req_enc(&asn_DEF_EnableEmergencyProfileRequest, &req, "EnableEmergencyProfile"); + if (!es10b_req) { + IPA_LOGP_ES10X("EnableEmergencyProfile", LERROR, "unable to encode Es10b request\n"); + goto error; + } + + es10b_res = ipa_euicc_transceive_es10x(ctx, es10b_req); + if (!es10b_res) { + IPA_LOGP_ES10X("EnableEmergencyProfile", LERROR, "no Es10b response\n"); + goto error; + } + + rc = dec_en_emerg_prfle_res(res, es10b_res); + if (rc < 0) + goto error; + + IPA_FREE(es10b_req); + IPA_FREE(es10b_res); + return res; +error: + IPA_FREE(es10b_req); + IPA_FREE(es10b_res); + ipa_es10b_en_emerg_prfle_res_free(res); + return NULL; +} + +/*! Free results of function (Es10b): EnableEmergencyProfile. + * \param[in] res pointer to function result. */ +void ipa_es10b_en_emerg_prfle_res_free(struct ipa_es10b_en_emerg_prfle_res *res) +{ + IPA_ES10X_RES_FREE(asn_DEF_EnableEmergencyProfileResponse, res); +} diff --git a/src/ipa/libipa/es10b_en_emerg_prfle.h b/src/ipa/libipa/es10b_en_emerg_prfle.h new file mode 100644 index 0000000..e40cb53 --- /dev/null +++ b/src/ipa/libipa/es10b_en_emerg_prfle.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved. + * + * SPDX-License-Identifier: AGPL-3.0-only + */ + +#pragma once + +#include <EnableEmergencyProfileRequest.h> +#include <EnableEmergencyProfileResponse.h> +struct ipa_context; + +struct ipa_es10b_en_emerg_prfle_res { + struct EnableEmergencyProfileResponse *res; +}; + +struct ipa_es10b_en_emerg_prfle_res *ipa_es10b_en_emerg_prfle(struct ipa_context *ctx, bool refresh_flag); +void ipa_es10b_en_emerg_prfle_res_free(struct ipa_es10b_en_emerg_prfle_res *res); diff --git a/src/ipa/libipa/ipad.c b/src/ipa/libipa/ipad.c index d151969..e79592c 100644 --- a/src/ipa/libipa/ipad.c +++ b/src/ipa/libipa/ipad.c @@ -27,6 +27,7 @@ #include "es10b_load_euicc_pkg.h" #include "es10b_exec_fallback_mech.h" #include "es10b_ret_from_fallback.h" +#include "es10b_en_emerg_prfle.h" #include "proc_euicc_pkg_dwnld_exec.h" #include "proc_notif_delivery.h" @@ -303,6 +304,24 @@ return rc; } +/*! Trigger return from emergency profile to previous profile. + * \param[inout] ctx pointer to ipa_context. + * \returns 0 on success, negative on error. */ +int ipa_enable_emerg_prfle(struct ipa_context *ctx) +{ + struct ipa_es10b_en_emerg_prfle_res *res; + int rc = -EINVAL; + + res = ipa_es10b_en_emerg_prfle(ctx, ctx->cfg->refresh_flag); + if (!res) + return -EIO; + if (res->res->enableEmergencyProfileResult == EnableEmergencyProfileResponse__enableEmergencyProfileResult_ok) + rc = 0; + ipa_es10b_en_emerg_prfle_res_free(res); + + return rc; +} + static int check_canaries(struct ipa_context *ctx) { if (ctx->check_http) diff --git a/src/ipa/main.c b/src/ipa/main.c index bf54f56..c422fa7 100644 --- a/src/ipa/main.c +++ b/src/ipa/main.c @@ -30,6 +30,7 @@ OPER_EUICC_MEMORY_RESET, OPER_EXEC_FALLBACK_MECH, OPER_RETURN_FROM_FALLBACK, + OPER_ENABLE_EMERG_PRFLE, }; bool running = true; @@ -72,6 +73,7 @@ printf(" euicc-memory-reset .......... reset eUICC memory\n"); printf(" execute-fallback-mechanism .. Trigger enabling of fallback profile\n"); printf(" return-from-fallback ........ Trigger return from fallback profile to previous profile\n"); + printf(" enable-emergency-profile .... Trigger enabling of emergency profile\n"); } struct ipa_buf *load_ber_from_file(char *dir, char *file) @@ -244,6 +246,8 @@ operation = OPER_EXEC_FALLBACK_MECH; } else if (!strcmp(argv[optind], "return-from-fallback")) { operation = OPER_RETURN_FROM_FALLBACK; + } else if (!strcmp(argv[optind], "enable-emergency-profile")) { + operation = OPER_ENABLE_EMERG_PRFLE; } else if (!!strcmp(argv[optind], "get-eim-package")) { printf("unknown operation: %s\n", argv[optind]); exit(-1); @@ -363,6 +367,10 @@ /* Trigger return from fallback profile to previous profile */ ipa_return_from_fallback(ctx); break; + case OPER_ENABLE_EMERG_PRFLE: + /* Trigger enabling of emergency profile */ + ipa_enable_emerg_prfle(ctx); + break; } leave: -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43043?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: I0304b869a14a36b82cc2d1676b2a5f613e1da171 Gerrit-Change-Number: 43043 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: laforge <laforge(a)gnumonks.org>

1 0

[L] Change in onomondo-ipa[master]: V1.2: Add function ES10b.ReturnFromFallback
by jolly 18 Aug '26

18 Aug '26

jolly has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43042?usp=email ) Change subject: V1.2: Add function ES10b.ReturnFromFallback ...................................................................... V1.2: Add function ES10b.ReturnFromFallback Add new library function to return from fallback profile on IoT eUICC. Also add an option to the command line interface to call the library function. The optional refresh flag may be set via command line option. The function cannot be emulated with non-IoT eUICC. Reference: SGP.32 Section 5.9.21 Related: SYS#8101 Change-Id: Ib49a8ef3a5ea5639d881ca51eaeeea24f083fe0e --- M asn1/SGP32Definitions.asn M include/onomondo/ipa/ipad.h M src/ipa/libasn/CMakeLists.txt A src/ipa/libasn/ReturnFromFallbackRequest.c A src/ipa/libasn/ReturnFromFallbackRequest.h A src/ipa/libasn/ReturnFromFallbackResponse.c A src/ipa/libasn/ReturnFromFallbackResponse.h M src/ipa/libipa/CMakeLists.txt A src/ipa/libipa/es10b_ret_from_fallback.c A src/ipa/libipa/es10b_ret_from_fallback.h M src/ipa/libipa/ipad.c M src/ipa/main.c 12 files changed, 378 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified dexter: Looks good to me, approved laforge: Looks good to me, but someone else must approve diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index 99b26e6..9f3ce9c 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -612,6 +612,24 @@ } -- ASN1STOP +-- Section 5.9.21 +-- ASN1START +ReturnFromFallbackRequest ::= [94] SEQUENCE { -- Tag 'BF5E' + refreshFlag BOOLEAN -- indicating whether REFRESH is required +} +-- ASN1STOP +-- ASN1START +ReturnFromFallbackResponse ::= [94] SEQUENCE { -- Tag 'BF5E' + returnFromFallbackResult [0] INTEGER { + ok(0), + catBusy(5), + fallbackNotAvailable(6), -- Fallback Attribute not set + commandError(7), + undefinedError(127) + } +} +-- ASN1STOP + -- Section 5.9.25 -- ASN1START SGP32-SetDefaultDpAddressRequest ::= [101] SEQUENCE { -- Tag 'BF65' diff --git a/include/onomondo/ipa/ipad.h b/include/onomondo/ipa/ipad.h index 55c64e3..8474097 100644 --- a/include/onomondo/ipa/ipad.h +++ b/include/onomondo/ipa/ipad.h @@ -95,6 +95,7 @@ int ipa_euicc_mem_rst(struct ipa_context *ctx, bool operatnl_profiles, bool test_profiles, bool default_smdp_addr, bool eim_cfg_data, bool immediate_enable_cfg); int ipa_execute_fallback_mechanism(struct ipa_context *ctx); +int ipa_return_from_fallback(struct ipa_context *ctx); int ipa_poll(struct ipa_context *ctx); void ipa_close(struct ipa_context *ctx); struct ipa_buf *ipa_free_ctx(struct ipa_context *ctx); diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt index 166d7f2..859578a 100644 --- a/src/ipa/libasn/CMakeLists.txt +++ b/src/ipa/libasn/CMakeLists.txt @@ -780,6 +780,10 @@ RetrieveNotificationsListRequest.h RetrieveNotificationsListResponse.c RetrieveNotificationsListResponse.h +ReturnFromFallbackRequest.c +ReturnFromFallbackRequest.h +ReturnFromFallbackResponse.c +ReturnFromFallbackResponse.h RollbackProfileResult.c RollbackProfileResult.h RspCapability.c diff --git a/src/ipa/libasn/ReturnFromFallbackRequest.c b/src/ipa/libasn/ReturnFromFallbackRequest.c new file mode 100644 index 0000000..69bd3a3 --- /dev/null +++ b/src/ipa/libasn/ReturnFromFallbackRequest.c @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#include "ReturnFromFallbackRequest.h" + +static asn_TYPE_member_t asn_MBR_ReturnFromFallbackRequest_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct ReturnFromFallbackRequest, refreshFlag), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_BOOLEAN, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "refreshFlag" + }, +}; +static const ber_tlv_tag_t asn_DEF_ReturnFromFallbackRequest_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (94 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_ReturnFromFallbackRequest_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* refreshFlag */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_ReturnFromFallbackRequest_specs_1 = { + sizeof(struct ReturnFromFallbackRequest), + offsetof(struct ReturnFromFallbackRequest, _asn_ctx), + asn_MAP_ReturnFromFallbackRequest_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_ReturnFromFallbackRequest = { + "ReturnFromFallbackRequest", + "ReturnFromFallbackRequest", + &asn_OP_SEQUENCE, + asn_DEF_ReturnFromFallbackRequest_tags_1, + sizeof(asn_DEF_ReturnFromFallbackRequest_tags_1) + /sizeof(asn_DEF_ReturnFromFallbackRequest_tags_1[0]) - 1, /* 1 */ + asn_DEF_ReturnFromFallbackRequest_tags_1, /* Same as above */ + sizeof(asn_DEF_ReturnFromFallbackRequest_tags_1) + /sizeof(asn_DEF_ReturnFromFallbackRequest_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_ReturnFromFallbackRequest_1, + 1, /* Elements count */ + &asn_SPC_ReturnFromFallbackRequest_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/ReturnFromFallbackRequest.h b/src/ipa/libasn/ReturnFromFallbackRequest.h new file mode 100644 index 0000000..5a43ff0 --- /dev/null +++ b/src/ipa/libasn/ReturnFromFallbackRequest.h @@ -0,0 +1,42 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#ifndef _ReturnFromFallbackRequest_H_ +#define _ReturnFromFallbackRequest_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <BOOLEAN.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* ReturnFromFallbackRequest */ +typedef struct ReturnFromFallbackRequest { + BOOLEAN_t refreshFlag; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ReturnFromFallbackRequest_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ReturnFromFallbackRequest; + +#ifdef __cplusplus +} +#endif + +#endif /* _ReturnFromFallbackRequest_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/ReturnFromFallbackResponse.c b/src/ipa/libasn/ReturnFromFallbackResponse.c new file mode 100644 index 0000000..a1d21ce --- /dev/null +++ b/src/ipa/libasn/ReturnFromFallbackResponse.c @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#include "ReturnFromFallbackResponse.h" + +static asn_TYPE_member_t asn_MBR_ReturnFromFallbackResponse_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct ReturnFromFallbackResponse, returnFromFallbackResult), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_NativeInteger, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "returnFromFallbackResult" + }, +}; +static const ber_tlv_tag_t asn_DEF_ReturnFromFallbackResponse_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (94 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_ReturnFromFallbackResponse_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* returnFromFallbackResult */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_ReturnFromFallbackResponse_specs_1 = { + sizeof(struct ReturnFromFallbackResponse), + offsetof(struct ReturnFromFallbackResponse, _asn_ctx), + asn_MAP_ReturnFromFallbackResponse_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_ReturnFromFallbackResponse = { + "ReturnFromFallbackResponse", + "ReturnFromFallbackResponse", + &asn_OP_SEQUENCE, + asn_DEF_ReturnFromFallbackResponse_tags_1, + sizeof(asn_DEF_ReturnFromFallbackResponse_tags_1) + /sizeof(asn_DEF_ReturnFromFallbackResponse_tags_1[0]) - 1, /* 1 */ + asn_DEF_ReturnFromFallbackResponse_tags_1, /* Same as above */ + sizeof(asn_DEF_ReturnFromFallbackResponse_tags_1) + /sizeof(asn_DEF_ReturnFromFallbackResponse_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_ReturnFromFallbackResponse_1, + 1, /* Elements count */ + &asn_SPC_ReturnFromFallbackResponse_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/ReturnFromFallbackResponse.h b/src/ipa/libasn/ReturnFromFallbackResponse.h new file mode 100644 index 0000000..c4a7ae0 --- /dev/null +++ b/src/ipa/libasn/ReturnFromFallbackResponse.h @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#ifndef _ReturnFromFallbackResponse_H_ +#define _ReturnFromFallbackResponse_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NativeInteger.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dependencies */ +typedef enum ReturnFromFallbackResponse__returnFromFallbackResult { + ReturnFromFallbackResponse__returnFromFallbackResult_ok = 0, + ReturnFromFallbackResponse__returnFromFallbackResult_catBusy = 5, + ReturnFromFallbackResponse__returnFromFallbackResult_fallbackNotAvailable = 6, + ReturnFromFallbackResponse__returnFromFallbackResult_commandError = 7, + ReturnFromFallbackResponse__returnFromFallbackResult_undefinedError = 127 +} e_ReturnFromFallbackResponse__returnFromFallbackResult; + +/* ReturnFromFallbackResponse */ +typedef struct ReturnFromFallbackResponse { + long returnFromFallbackResult; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ReturnFromFallbackResponse_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ReturnFromFallbackResponse; + +#ifdef __cplusplus +} +#endif + +#endif /* _ReturnFromFallbackResponse_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libipa/CMakeLists.txt b/src/ipa/libipa/CMakeLists.txt index a46e22b..45d8f4a 100644 --- a/src/ipa/libipa/CMakeLists.txt +++ b/src/ipa/libipa/CMakeLists.txt @@ -21,6 +21,7 @@ es10b_retr_notif_from_lst.c es10b_rm_notif_from_lst.c es10b_exec_fallback_mech.c + es10b_ret_from_fallback.c es10c_delete_prfle.c es10c_disable_prfle.c es10c_enable_prfle.c diff --git a/src/ipa/libipa/es10b_ret_from_fallback.c b/src/ipa/libipa/es10b_ret_from_fallback.c new file mode 100644 index 0000000..7d9a835 --- /dev/null +++ b/src/ipa/libipa/es10b_ret_from_fallback.c @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved. + * + * SPDX-License-Identifier: AGPL-3.0-only + * + * Author: Philipp Maier <pmaier(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * Andreas Eversberg <aeversberg(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * + * See also: GSMA SGP.22, 5.9.21: Function (ES10b): ReturnFromFallback + */ + +#include <stdio.h> +#include <assert.h> +#include <onomondo/ipa/utils.h> +#include "context.h" +#include "utils.h" +#include "euicc.h" +#include "es10x.h" +#include "es10b_ret_from_fallback.h" + +static const struct num_str_map error_code_strings[] = { + { ReturnFromFallbackResponse__returnFromFallbackResult_ok, "ok" }, + { ReturnFromFallbackResponse__returnFromFallbackResult_catBusy, "catBusy" }, + { ReturnFromFallbackResponse__returnFromFallbackResult_fallbackNotAvailable, "fallbackNotAvailable" }, + { ReturnFromFallbackResponse__returnFromFallbackResult_commandError, "commandError" }, + { ReturnFromFallbackResponse__returnFromFallbackResult_undefinedError, "undefinedError" }, + + { 0, NULL } +}; + +static int dec_ret_from_fallback_res(struct ipa_es10b_ret_from_fallback_res *res, const struct ipa_buf *es10b_res) +{ + struct ReturnFromFallbackResponse *asn = NULL; + + asn = ipa_es10x_res_dec(&asn_DEF_ReturnFromFallbackResponse, es10b_res, "ReturnFromFallback"); + if (!asn) + return -EINVAL; + + if (asn->returnFromFallbackResult != ReturnFromFallbackResponse__returnFromFallbackResult_ok) { + IPA_LOGP_ES10X("ReturnFromFallback", LERROR, "function failed with error code %ld=%s!\n", + asn->returnFromFallbackResult, + ipa_str_from_num(error_code_strings, asn->returnFromFallbackResult, "(unknown)")); + } else { + IPA_LOGP_ES10X("ReturnFromFallback", LERROR, "function succeeded with status code %ld=%s!\n", + asn->returnFromFallbackResult, + ipa_str_from_num(error_code_strings, asn->returnFromFallbackResult, "(unknown)")); + } + + res->res = asn; + return 0; +} + +static struct ReturnFromFallbackResponse *generate_ret_from_fallback_err(void) +{ + struct ReturnFromFallbackResponse *res = IPA_ALLOC_ZERO(struct ReturnFromFallbackResponse); + + assert(res); + res->returnFromFallbackResult = ReturnFromFallbackResponse__returnFromFallbackResult_undefinedError; + return res; +} + +/*! Function (Es10b): ReturnFromFallback. + * \param[inout] ctx pointer to ipa_context. + * \param[in] refresh_flag send a CAT refresh after enabling profile. + * \returns pointer newly allocated struct with function result, NULL on error. */ +struct ipa_es10b_ret_from_fallback_res *ipa_es10b_ret_from_fallback(struct ipa_context *ctx, bool refresh_flag) +{ + struct ipa_buf *es10b_req = NULL; + struct ipa_buf *es10b_res = NULL; + struct ReturnFromFallbackRequest req = { 0 }; + struct ipa_es10b_ret_from_fallback_res *res = IPA_ALLOC_ZERO(struct ipa_es10b_ret_from_fallback_res); + int rc; + + if (ctx->cfg->iot_euicc_emu_enabled) { + IPA_LOGP_ES10X("ReturnFromFallback", LERROR, + "Unable to emulate switching back from fallback profile.\n"); + res->res = generate_ret_from_fallback_err(); + return res; + } + + req.refreshFlag = refresh_flag; + + es10b_req = ipa_es10x_req_enc(&asn_DEF_ReturnFromFallbackRequest, &req, "ReturnFromFallback"); + if (!es10b_req) { + IPA_LOGP_ES10X("ReturnFromFallback", LERROR, "unable to encode Es10b request\n"); + goto error; + } + + es10b_res = ipa_euicc_transceive_es10x(ctx, es10b_req); + if (!es10b_res) { + IPA_LOGP_ES10X("ReturnFromFallback", LERROR, "no Es10b response\n"); + goto error; + } + + rc = dec_ret_from_fallback_res(res, es10b_res); + if (rc < 0) + goto error; + + IPA_FREE(es10b_req); + IPA_FREE(es10b_res); + return res; +error: + IPA_FREE(es10b_req); + IPA_FREE(es10b_res); + ipa_es10b_ret_from_fallback_res_free(res); + return NULL; +} + +/*! Free results of function (Es10b): ReturnFromFallback. + * \param[in] res pointer to function result. */ +void ipa_es10b_ret_from_fallback_res_free(struct ipa_es10b_ret_from_fallback_res *res) +{ + IPA_ES10X_RES_FREE(asn_DEF_ReturnFromFallbackResponse, res); +} diff --git a/src/ipa/libipa/es10b_ret_from_fallback.h b/src/ipa/libipa/es10b_ret_from_fallback.h new file mode 100644 index 0000000..ff93b35 --- /dev/null +++ b/src/ipa/libipa/es10b_ret_from_fallback.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved. + * + * SPDX-License-Identifier: AGPL-3.0-only + */ + +#pragma once + +#include <ReturnFromFallbackRequest.h> +#include <ReturnFromFallbackResponse.h> +struct ipa_context; + +struct ipa_es10b_ret_from_fallback_res { + struct ReturnFromFallbackResponse *res; +}; + +struct ipa_es10b_ret_from_fallback_res *ipa_es10b_ret_from_fallback(struct ipa_context *ctx, bool refresh_flag); +void ipa_es10b_ret_from_fallback_res_free(struct ipa_es10b_ret_from_fallback_res *res); diff --git a/src/ipa/libipa/ipad.c b/src/ipa/libipa/ipad.c index 0dffd12..d151969 100644 --- a/src/ipa/libipa/ipad.c +++ b/src/ipa/libipa/ipad.c @@ -26,6 +26,7 @@ #include "es10b_euicc_mem_rst.h" #include "es10b_load_euicc_pkg.h" #include "es10b_exec_fallback_mech.h" +#include "es10b_ret_from_fallback.h" #include "proc_euicc_pkg_dwnld_exec.h" #include "proc_notif_delivery.h" @@ -284,6 +285,24 @@ return rc; } +/*! Trigger enabling of emergency profile. + * \param[inout] ctx pointer to ipa_context. + * \returns 0 on success, negative on error. */ +int ipa_return_from_fallback(struct ipa_context *ctx) +{ + struct ipa_es10b_ret_from_fallback_res *res; + int rc = -EINVAL; + + res = ipa_es10b_ret_from_fallback(ctx, ctx->cfg->refresh_flag); + if (!res) + return -EIO; + if (res->res->returnFromFallbackResult == ReturnFromFallbackResponse__returnFromFallbackResult_ok) + rc = 0; + ipa_es10b_ret_from_fallback_res_free(res); + + return rc; +} + static int check_canaries(struct ipa_context *ctx) { if (ctx->check_http) diff --git a/src/ipa/main.c b/src/ipa/main.c index 39412c3..bf54f56 100644 --- a/src/ipa/main.c +++ b/src/ipa/main.c @@ -29,6 +29,7 @@ OPER_ADD_INITIAL_EIM, OPER_EUICC_MEMORY_RESET, OPER_EXEC_FALLBACK_MECH, + OPER_RETURN_FROM_FALLBACK, }; bool running = true; @@ -70,6 +71,7 @@ printf(" add-initial-eim PATH ........ set initial eIM configuration from given file\n"); printf(" euicc-memory-reset .......... reset eUICC memory\n"); printf(" execute-fallback-mechanism .. Trigger enabling of fallback profile\n"); + printf(" return-from-fallback ........ Trigger return from fallback profile to previous profile\n"); } struct ipa_buf *load_ber_from_file(char *dir, char *file) @@ -240,6 +242,8 @@ operation = OPER_EUICC_MEMORY_RESET; } else if (!strcmp(argv[optind], "execute-fallback-mechanism")) { operation = OPER_EXEC_FALLBACK_MECH; + } else if (!strcmp(argv[optind], "return-from-fallback")) { + operation = OPER_RETURN_FROM_FALLBACK; } else if (!!strcmp(argv[optind], "get-eim-package")) { printf("unknown operation: %s\n", argv[optind]); exit(-1); @@ -355,6 +359,10 @@ /* Trigger enabling of fallback profile */ ipa_execute_fallback_mechanism(ctx); break; + case OPER_RETURN_FROM_FALLBACK: + /* Trigger return from fallback profile to previous profile */ + ipa_return_from_fallback(ctx); + break; } leave: -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43042?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: Ib49a8ef3a5ea5639d881ca51eaeeea24f083fe0e Gerrit-Change-Number: 43042 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[L] Change in onomondo-ipa[master]: V1.2: Add function ES10b.ExecuteFallbackMechanism
by jolly 18 Aug '26

18 Aug '26

jolly has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43041?usp=email ) Change subject: V1.2: Add function ES10b.ExecuteFallbackMechanism ...................................................................... V1.2: Add function ES10b.ExecuteFallbackMechanism Add new library function to enable the fallback profile on IoT eUICC. Also add an option to the command line interface to call the library function. The optional refresh flag may be set via command line option. The function cannot be emulated with non-IoT eUICC. Reference: SGP.32 Section 5.9.20 Related: SYS#8101 Change-Id: Ia751f0888c36f39ddfadf7f8bb923a8ee50178dc --- M asn1/SGP32Definitions.asn M include/onomondo/ipa/ipad.h M src/ipa/libasn/CMakeLists.txt A src/ipa/libasn/ExecuteFallbackMechanismRequest.c A src/ipa/libasn/ExecuteFallbackMechanismRequest.h A src/ipa/libasn/ExecuteFallbackMechanismResponse.c A src/ipa/libasn/ExecuteFallbackMechanismResponse.h M src/ipa/libipa/CMakeLists.txt A src/ipa/libipa/es10b_exec_fallback_mech.c A src/ipa/libipa/es10b_exec_fallback_mech.h M src/ipa/libipa/ipad.c M src/ipa/main.c 12 files changed, 383 insertions(+), 0 deletions(-) Approvals: dexter: Looks good to me, approved laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/asn1/SGP32Definitions.asn b/asn1/SGP32Definitions.asn index 0c3766f..99b26e6 100644 --- a/asn1/SGP32Definitions.asn +++ b/asn1/SGP32Definitions.asn @@ -592,6 +592,26 @@ } -- ASN1STOP +-- Section 5.9.20 +-- ASN1START +ExecuteFallbackMechanismRequest ::= [93] SEQUENCE { -- Tag ' BF5D' + refreshFlag BOOLEAN -- indicating whether REFRESH is required +} +-- ASN1STOP +-- ASN1START +ExecuteFallbackMechanismResponse ::= [93] SEQUENCE { -- Tag ' BF5D' + executeFallbackMechanismResult [0] INTEGER { + ok(0), + profileNotInDisabledState(2), + catBusy(5), + fallbackNotAvailable(6), -- Fallback Attribute not set + commandError(7), + ecallActive(104), + undefinedError(127) + } +} +-- ASN1STOP + -- Section 5.9.25 -- ASN1START SGP32-SetDefaultDpAddressRequest ::= [101] SEQUENCE { -- Tag 'BF65' diff --git a/include/onomondo/ipa/ipad.h b/include/onomondo/ipa/ipad.h index bb4a05a..55c64e3 100644 --- a/include/onomondo/ipa/ipad.h +++ b/include/onomondo/ipa/ipad.h @@ -94,6 +94,7 @@ int ipa_add_init_eim_cfg(struct ipa_context *ctx, struct ipa_buf *cfg); int ipa_euicc_mem_rst(struct ipa_context *ctx, bool operatnl_profiles, bool test_profiles, bool default_smdp_addr, bool eim_cfg_data, bool immediate_enable_cfg); +int ipa_execute_fallback_mechanism(struct ipa_context *ctx); int ipa_poll(struct ipa_context *ctx); void ipa_close(struct ipa_context *ctx); struct ipa_buf *ipa_free_ctx(struct ipa_context *ctx); diff --git a/src/ipa/libasn/CMakeLists.txt b/src/ipa/libasn/CMakeLists.txt index 3c84951..166d7f2 100644 --- a/src/ipa/libasn/CMakeLists.txt +++ b/src/ipa/libasn/CMakeLists.txt @@ -347,6 +347,10 @@ EuiccSignPIR.h EventEntries.c EventEntries.h +ExecuteFallbackMechanismRequest.c +ExecuteFallbackMechanismRequest.h +ExecuteFallbackMechanismResponse.c +ExecuteFallbackMechanismResponse.h ExpirationDate.c ExpirationDate.h ExtendedNetworkAddress.c diff --git a/src/ipa/libasn/ExecuteFallbackMechanismRequest.c b/src/ipa/libasn/ExecuteFallbackMechanismRequest.c new file mode 100644 index 0000000..2df0b3b --- /dev/null +++ b/src/ipa/libasn/ExecuteFallbackMechanismRequest.c @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#include "ExecuteFallbackMechanismRequest.h" + +static asn_TYPE_member_t asn_MBR_ExecuteFallbackMechanismRequest_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct ExecuteFallbackMechanismRequest, refreshFlag), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_BOOLEAN, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "refreshFlag" + }, +}; +static const ber_tlv_tag_t asn_DEF_ExecuteFallbackMechanismRequest_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (93 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_ExecuteFallbackMechanismRequest_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* refreshFlag */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_ExecuteFallbackMechanismRequest_specs_1 = { + sizeof(struct ExecuteFallbackMechanismRequest), + offsetof(struct ExecuteFallbackMechanismRequest, _asn_ctx), + asn_MAP_ExecuteFallbackMechanismRequest_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_ExecuteFallbackMechanismRequest = { + "ExecuteFallbackMechanismRequest", + "ExecuteFallbackMechanismRequest", + &asn_OP_SEQUENCE, + asn_DEF_ExecuteFallbackMechanismRequest_tags_1, + sizeof(asn_DEF_ExecuteFallbackMechanismRequest_tags_1) + /sizeof(asn_DEF_ExecuteFallbackMechanismRequest_tags_1[0]) - 1, /* 1 */ + asn_DEF_ExecuteFallbackMechanismRequest_tags_1, /* Same as above */ + sizeof(asn_DEF_ExecuteFallbackMechanismRequest_tags_1) + /sizeof(asn_DEF_ExecuteFallbackMechanismRequest_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_ExecuteFallbackMechanismRequest_1, + 1, /* Elements count */ + &asn_SPC_ExecuteFallbackMechanismRequest_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/ExecuteFallbackMechanismRequest.h b/src/ipa/libasn/ExecuteFallbackMechanismRequest.h new file mode 100644 index 0000000..2f122fe --- /dev/null +++ b/src/ipa/libasn/ExecuteFallbackMechanismRequest.h @@ -0,0 +1,42 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#ifndef _ExecuteFallbackMechanismRequest_H_ +#define _ExecuteFallbackMechanismRequest_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <BOOLEAN.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* ExecuteFallbackMechanismRequest */ +typedef struct ExecuteFallbackMechanismRequest { + BOOLEAN_t refreshFlag; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ExecuteFallbackMechanismRequest_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ExecuteFallbackMechanismRequest; + +#ifdef __cplusplus +} +#endif + +#endif /* _ExecuteFallbackMechanismRequest_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libasn/ExecuteFallbackMechanismResponse.c b/src/ipa/libasn/ExecuteFallbackMechanismResponse.c new file mode 100644 index 0000000..ba2e27e --- /dev/null +++ b/src/ipa/libasn/ExecuteFallbackMechanismResponse.c @@ -0,0 +1,51 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#include "ExecuteFallbackMechanismResponse.h" + +static asn_TYPE_member_t asn_MBR_ExecuteFallbackMechanismResponse_1[] = { + { ATF_NOFLAGS, 0, offsetof(struct ExecuteFallbackMechanismResponse, executeFallbackMechanismResult), + (ASN_TAG_CLASS_CONTEXT | (0 << 2)), + -1, /* IMPLICIT tag at current level */ + &asn_DEF_NativeInteger, + 0, + { 0, 0, 0 }, + 0, 0, /* No default value */ + "executeFallbackMechanismResult" + }, +}; +static const ber_tlv_tag_t asn_DEF_ExecuteFallbackMechanismResponse_tags_1[] = { + (ASN_TAG_CLASS_CONTEXT | (93 << 2)), + (ASN_TAG_CLASS_UNIVERSAL | (16 << 2)) +}; +static const asn_TYPE_tag2member_t asn_MAP_ExecuteFallbackMechanismResponse_tag2el_1[] = { + { (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 } /* executeFallbackMechanismResult */ +}; +static asn_SEQUENCE_specifics_t asn_SPC_ExecuteFallbackMechanismResponse_specs_1 = { + sizeof(struct ExecuteFallbackMechanismResponse), + offsetof(struct ExecuteFallbackMechanismResponse, _asn_ctx), + asn_MAP_ExecuteFallbackMechanismResponse_tag2el_1, + 1, /* Count of tags in the map */ + 0, 0, 0, /* Optional elements (not needed) */ + 1, /* First extension addition */ +}; +asn_TYPE_descriptor_t asn_DEF_ExecuteFallbackMechanismResponse = { + "ExecuteFallbackMechanismResponse", + "ExecuteFallbackMechanismResponse", + &asn_OP_SEQUENCE, + asn_DEF_ExecuteFallbackMechanismResponse_tags_1, + sizeof(asn_DEF_ExecuteFallbackMechanismResponse_tags_1) + /sizeof(asn_DEF_ExecuteFallbackMechanismResponse_tags_1[0]) - 1, /* 1 */ + asn_DEF_ExecuteFallbackMechanismResponse_tags_1, /* Same as above */ + sizeof(asn_DEF_ExecuteFallbackMechanismResponse_tags_1) + /sizeof(asn_DEF_ExecuteFallbackMechanismResponse_tags_1[0]), /* 2 */ + { 0, 0, SEQUENCE_constraint }, + asn_MBR_ExecuteFallbackMechanismResponse_1, + 1, /* Elements count */ + &asn_SPC_ExecuteFallbackMechanismResponse_specs_1 /* Additional specs */ +}; + diff --git a/src/ipa/libasn/ExecuteFallbackMechanismResponse.h b/src/ipa/libasn/ExecuteFallbackMechanismResponse.h new file mode 100644 index 0000000..823708c --- /dev/null +++ b/src/ipa/libasn/ExecuteFallbackMechanismResponse.h @@ -0,0 +1,53 @@ +/* + * Generated by asn1c-0.9.29 (http://lionet.info/asn1c) + * From ASN.1 module "SGP32Definitions" + * found in "../../../asn1/SGP32Definitions.asn" + * `asn1c -fcompound-names -no-gen-example` + */ + +#ifndef _ExecuteFallbackMechanismResponse_H_ +#define _ExecuteFallbackMechanismResponse_H_ + + +#include <asn_application.h> + +/* Including external dependencies */ +#include <NativeInteger.h> +#include <constr_SEQUENCE.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* Dependencies */ +typedef enum ExecuteFallbackMechanismResponse__executeFallbackMechanismResult { + ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_ok = 0, + ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_profileNotInDisabledState = 2, + ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_catBusy = 5, + ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_fallbackNotAvailable = 6, + ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_commandError = 7, + ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_ecallActive = 104, + ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_undefinedError = 127 +} e_ExecuteFallbackMechanismResponse__executeFallbackMechanismResult; + +/* ExecuteFallbackMechanismResponse */ +typedef struct ExecuteFallbackMechanismResponse { + long executeFallbackMechanismResult; + /* + * This type is extensible, + * possible extensions are below. + */ + + /* Context for parsing across buffer boundaries */ + asn_struct_ctx_t _asn_ctx; +} ExecuteFallbackMechanismResponse_t; + +/* Implementation */ +extern asn_TYPE_descriptor_t asn_DEF_ExecuteFallbackMechanismResponse; + +#ifdef __cplusplus +} +#endif + +#endif /* _ExecuteFallbackMechanismResponse_H_ */ +#include <asn_internal.h> diff --git a/src/ipa/libipa/CMakeLists.txt b/src/ipa/libipa/CMakeLists.txt index 7a6ac28..a46e22b 100644 --- a/src/ipa/libipa/CMakeLists.txt +++ b/src/ipa/libipa/CMakeLists.txt @@ -20,6 +20,7 @@ es10b_prfle_rollback.c es10b_retr_notif_from_lst.c es10b_rm_notif_from_lst.c + es10b_exec_fallback_mech.c es10c_delete_prfle.c es10c_disable_prfle.c es10c_enable_prfle.c diff --git a/src/ipa/libipa/es10b_exec_fallback_mech.c b/src/ipa/libipa/es10b_exec_fallback_mech.c new file mode 100644 index 0000000..23b6858 --- /dev/null +++ b/src/ipa/libipa/es10b_exec_fallback_mech.c @@ -0,0 +1,115 @@ +/* + * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved. + * + * SPDX-License-Identifier: AGPL-3.0-only + * + * Author: Philipp Maier <pmaier(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * Andreas Eversberg <pmaier(a)sysmocom.de> / sysmocom - s.f.m.c. GmbH + * + * See also: GSMA SGP.22, 5.9.20: Function (ES10b): ExecuteFallbackMechanism + */ + +#include <stdio.h> +#include <assert.h> +#include <onomondo/ipa/utils.h> +#include "context.h" +#include "utils.h" +#include "euicc.h" +#include "es10x.h" +#include "es10b_exec_fallback_mech.h" + +static const struct num_str_map error_code_strings[] = { + { ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_ok, "ok" }, + { ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_profileNotInDisabledState, "profileNotInDisabledState" }, + { ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_catBusy, "catBusy" }, + { ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_fallbackNotAvailable, "fallbackNotAvailable" }, + { ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_commandError, "commandError" }, + { ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_ecallActive, "ecallActive" }, + { ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_undefinedError, "undefinedError" }, + { 0, NULL } +}; + +static int dec_exec_fallback_mech_res(struct ipa_es10b_exec_fallback_mech_res *res, const struct ipa_buf *es10b_res) +{ + struct ExecuteFallbackMechanismResponse *asn = NULL; + + asn = ipa_es10x_res_dec(&asn_DEF_ExecuteFallbackMechanismResponse, es10b_res, "ExecuteFallbackMechanism"); + if (!asn) + return -EINVAL; + + if (asn->executeFallbackMechanismResult != ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_ok) { + IPA_LOGP_ES10X("ExecuteFallbackMechanism", LERROR, "function failed with error code %ld=%s!\n", + asn->executeFallbackMechanismResult, + ipa_str_from_num(error_code_strings, asn->executeFallbackMechanismResult, "(unknown)")); + } else { + IPA_LOGP_ES10X("ExecuteFallbackMechanism", LERROR, "function succeeded with status code %ld=%s!\n", + asn->executeFallbackMechanismResult, + ipa_str_from_num(error_code_strings, asn->executeFallbackMechanismResult, "(unknown)")); + } + + res->res = asn; + return 0; +} + +static struct ExecuteFallbackMechanismResponse *generate_exec_fallback_mech_err(void) +{ + struct ExecuteFallbackMechanismResponse *res = IPA_ALLOC_ZERO(struct ExecuteFallbackMechanismResponse); + + assert(res); + res->executeFallbackMechanismResult = ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_undefinedError; + return res; +} + +/*! Function (Es10b): ExecuteFallbackMechanism. + * \param[inout] ctx pointer to ipa_context. + * \param[in] refresh_flag send a CAT refresh after enabling profile. + * \returns pointer newly allocated struct with function result, NULL on error. */ +struct ipa_es10b_exec_fallback_mech_res *ipa_es10b_exec_fallback_mech(struct ipa_context *ctx, bool refresh_flag) +{ + struct ipa_buf *es10b_req = NULL; + struct ipa_buf *es10b_res = NULL; + struct ExecuteFallbackMechanismRequest req = { 0 }; + struct ipa_es10b_exec_fallback_mech_res *res = IPA_ALLOC_ZERO(struct ipa_es10b_exec_fallback_mech_res); + int rc; + + if (ctx->cfg->iot_euicc_emu_enabled) { + IPA_LOGP_ES10X("ExecuteFallbackMechanism", LERROR, + "Unable to emulate switching to fallback profile.\n"); + res->res = generate_exec_fallback_mech_err(); + return res; + } + + req.refreshFlag = refresh_flag; + + es10b_req = ipa_es10x_req_enc(&asn_DEF_ExecuteFallbackMechanismRequest, &req, "ExecuteFallbackMechanism"); + if (!es10b_req) { + IPA_LOGP_ES10X("ExecuteFallbackMechanism", LERROR, "unable to encode Es10b request\n"); + goto error; + } + + es10b_res = ipa_euicc_transceive_es10x(ctx, es10b_req); + if (!es10b_res) { + IPA_LOGP_ES10X("ExecuteFallbackMechanism", LERROR, "no Es10b response\n"); + goto error; + } + + rc = dec_exec_fallback_mech_res(res, es10b_res); + if (rc < 0) + goto error; + + IPA_FREE(es10b_req); + IPA_FREE(es10b_res); + return res; +error: + IPA_FREE(es10b_req); + IPA_FREE(es10b_res); + ipa_es10b_exec_fallback_mech_res_free(res); + return NULL; +} + +/*! Free results of function (Es10b): ExecuteFallbackMechanism. + * \param[in] res pointer to function result. */ +void ipa_es10b_exec_fallback_mech_res_free(struct ipa_es10b_exec_fallback_mech_res *res) +{ + IPA_ES10X_RES_FREE(asn_DEF_ExecuteFallbackMechanismResponse, res); +} diff --git a/src/ipa/libipa/es10b_exec_fallback_mech.h b/src/ipa/libipa/es10b_exec_fallback_mech.h new file mode 100644 index 0000000..f150e67 --- /dev/null +++ b/src/ipa/libipa/es10b_exec_fallback_mech.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2026 sysmocom - s.f.m.c. GmbH. All rights reserved. + * + * SPDX-License-Identifier: AGPL-3.0-only + */ + +#pragma once + +#include <ExecuteFallbackMechanismRequest.h> +#include <ExecuteFallbackMechanismResponse.h> +struct ipa_context; + +struct ipa_es10b_exec_fallback_mech_res { + struct ExecuteFallbackMechanismResponse *res; +}; + +struct ipa_es10b_exec_fallback_mech_res *ipa_es10b_exec_fallback_mech(struct ipa_context *ctx, bool refresh_flag); +void ipa_es10b_exec_fallback_mech_res_free(struct ipa_es10b_exec_fallback_mech_res *res); diff --git a/src/ipa/libipa/ipad.c b/src/ipa/libipa/ipad.c index 2d4f685..0dffd12 100644 --- a/src/ipa/libipa/ipad.c +++ b/src/ipa/libipa/ipad.c @@ -25,6 +25,7 @@ #include "es10b_add_init_eim.h" #include "es10b_euicc_mem_rst.h" #include "es10b_load_euicc_pkg.h" +#include "es10b_exec_fallback_mech.h" #include "proc_euicc_pkg_dwnld_exec.h" #include "proc_notif_delivery.h" @@ -265,6 +266,24 @@ return ipa_es10b_euicc_mem_rst(ctx, &euicc_mem_rst); } +/*! Trigger return from fallback profile to previous profile. + * \param[inout] ctx pointer to ipa_context. + * \returns 0 on success, negative on error. */ +int ipa_execute_fallback_mechanism(struct ipa_context *ctx) +{ + struct ipa_es10b_exec_fallback_mech_res *res; + int rc = -EINVAL; + + res = ipa_es10b_exec_fallback_mech(ctx, ctx->cfg->refresh_flag); + if (!res) + return -EIO; + if (res->res->executeFallbackMechanismResult == ExecuteFallbackMechanismResponse__executeFallbackMechanismResult_ok) + rc = 0; + ipa_es10b_exec_fallback_mech_res_free(res); + + return rc; +} + static int check_canaries(struct ipa_context *ctx) { if (ctx->check_http) diff --git a/src/ipa/main.c b/src/ipa/main.c index 93e8c60..39412c3 100644 --- a/src/ipa/main.c +++ b/src/ipa/main.c @@ -28,6 +28,7 @@ OPER_GET_EIM_PACKAGE, OPER_ADD_INITIAL_EIM, OPER_EUICC_MEMORY_RESET, + OPER_EXEC_FALLBACK_MECH, }; bool running = true; @@ -68,6 +69,7 @@ printf(" get-eim-package ............. Ask eIM for eIM package and process it (default operation)\n"); printf(" add-initial-eim PATH ........ set initial eIM configuration from given file\n"); printf(" euicc-memory-reset .......... reset eUICC memory\n"); + printf(" execute-fallback-mechanism .. Trigger enabling of fallback profile\n"); } struct ipa_buf *load_ber_from_file(char *dir, char *file) @@ -236,6 +238,8 @@ initial_eim_cfg_file = argv[++optind]; } else if (!strcmp(argv[optind], "euicc-memory-reset")) { operation = OPER_EUICC_MEMORY_RESET; + } else if (!strcmp(argv[optind], "execute-fallback-mechanism")) { + operation = OPER_EXEC_FALLBACK_MECH; } else if (!!strcmp(argv[optind], "get-eim-package")) { printf("unknown operation: %s\n", argv[optind]); exit(-1); @@ -347,6 +351,10 @@ /* Perform an eUICC memory reset */ ipa_euicc_mem_rst(ctx, true, true, true, true, true); break; + case OPER_EXEC_FALLBACK_MECH: + /* Trigger enabling of fallback profile */ + ipa_execute_fallback_mechanism(ctx); + break; } leave: -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43041?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: Ia751f0888c36f39ddfadf7f8bb923a8ee50178dc Gerrit-Change-Number: 43041 Gerrit-PatchSet: 6 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[M] Change in onomondo-ipa[master]: Introduce 'operation' parameters to main file
by jolly 18 Aug '26

18 Aug '26

jolly has submitted this change. ( https://gerrit.osmocom.org/c/onomondo-ipa/+/43202?usp=email ) Change subject: Introduce 'operation' parameters to main file ...................................................................... Introduce 'operation' parameters to main file Instead of having several command line options to trigger various operations, operational argument(s) are used. Because an operation runs exclusively, arguments for only one operation can be given at the same time. New operations are added in later patches, so they can use the operational arguments as well and do not need to introduce new command line options. Revert from getopt_long() back to getopt(), because long options are not required for this approach. Related: SYS#8101 Change-Id: I6b960f840820990de40fb07332669ddbfcdf1e7d --- M src/ipa/main.c 1 file changed, 70 insertions(+), 49 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve dexter: Looks good to me, approved diff --git a/src/ipa/main.c b/src/ipa/main.c index fae8476..93e8c60 100644 --- a/src/ipa/main.c +++ b/src/ipa/main.c @@ -24,6 +24,12 @@ #define DEFAULT_NVSTATE_PATH "./nvstate.bin" #define DEFAULT_ESIPA_REQ_RETRIES 3 +enum operation { + OPER_GET_EIM_PACKAGE, + OPER_ADD_INITIAL_EIM, + OPER_EUICC_MEMORY_RESET, +}; + bool running = true; bool prfle_inst_consent(char *sm_dp_plus_address, char *ac_token) @@ -39,26 +45,29 @@ return false; } -static void print_help(void) +static void print_help(const char *prog_name) { + printf("Usage: %s [OPTIONS] [OPERATION]\n", prog_name); printf("options:\n"); - printf(" -h ......................... print this text.\n"); - printf(" -t TAC ..................... set TAC (default: %s)\n", DEFAULT_TAC); - printf(" -e eimId ................... set preferred eIM (in case the eUICC has multiple)\n"); - printf(" -r N ....................... set reader number (default: %d)\n", DEFAULT_READER_NUMBER); - printf(" -c N ....................... set logical channel number (default: %d)\n", DEFAULT_CHANNEL_NUMBER); - printf(" -f PATH .................... set initial eIM configuration\n"); - printf(" -m ......................... reset eUICC memory\n"); - printf(" --refresh-flag.............. Make eUICC send a CAT refresh after switching profile\n"); - printf(" -n PATH .................... path to nvstate file (default: %s)\n", DEFAULT_NVSTATE_PATH); - printf(" -y NUM ..................... number of retries for ESipa requests (default: %u)\n", + printf(" -h .......................... print this text.\n"); + printf(" -t TAC ...................... set TAC (default: %s)\n", DEFAULT_TAC); + printf(" -e eimId .................... set preferred eIM (in case the eUICC has multiple)\n"); + printf(" -r N ........................ set reader number (default: %d)\n", DEFAULT_READER_NUMBER); + printf(" -c N ........................ set logical channel number (default: %d)\n", DEFAULT_CHANNEL_NUMBER); + printf(" -R .......................... Make eUICC send a CAT refresh after switching profile\n"); + printf(" -n PATH ..................... path to nvstate file (default: %s)\n", DEFAULT_NVSTATE_PATH); + printf(" -y NUM ...................... number of retries for ESipa requests (default: %u)\n", DEFAULT_ESIPA_REQ_RETRIES); - printf(" -a ......................... ask end user for consent\n"); - printf(" -C ......................... CA (Certificate Authority) Bundle file\n"); - printf(" -S ......................... disable HTTPS\n"); - printf(" -I ......................... disable SSL certificate verification (insecure)\n"); - printf(" -E ......................... emulate IoT eUICC (compatibility mode to use consumer eUICCs)\n"); - printf(" -1 ......................... force the IPAd to process only one eUICC package (debug, use with caution)\n"); + printf(" -a .......................... ask end user for consent\n"); + printf(" -C .......................... CA (Certificate Authority) Bundle file\n"); + printf(" -S .......................... disable HTTPS\n"); + printf(" -I .......................... disable SSL certificate verification (insecure)\n"); + printf(" -E .......................... emulate IoT eUICC (compatibility mode to use consumer eUICCs)\n"); + printf(" -1 .......................... force the IPAd to process only one eUICC package (debug, use with caution)\n"); + printf("operation:\n"); + printf(" get-eim-package ............. Ask eIM for eIM package and process it (default operation)\n"); + printf(" add-initial-eim PATH ........ set initial eIM configuration from given file\n"); + printf(" euicc-memory-reset .......... reset eUICC memory\n"); } struct ipa_buf *load_ber_from_file(char *dir, char *file) @@ -141,13 +150,12 @@ struct ipa_context *ctx = NULL; int opt; int rc; - char *getopt_initial_eim_cfg_file = NULL; - bool getopt_euicc_memory_reset = false; + enum operation operation = OPER_GET_EIM_PACKAGE; + char *initial_eim_cfg_file = NULL; char *getopt_nvstate_path = DEFAULT_NVSTATE_PATH; struct ipa_buf *nvstate_load = NULL; struct ipa_buf *nvstate_save = NULL; bool getopt_one_euicc_pkg_only = false; - int option_index = 0; signal(SIGUSR1, sig_usr1); @@ -159,24 +167,15 @@ ipa_binary_from_hexstr(cfg.tac, sizeof(cfg.tac), DEFAULT_TAC); cfg.esipa_req_retries = DEFAULT_ESIPA_REQ_RETRIES; - enum { - OPT_REFRESHFLAG = 256, - }; - - struct option long_options[] = { - { "refresh-flag", no_argument, NULL, OPT_REFRESHFLAG}, - { NULL, 0, NULL, 0} - }; - /* Overwrite configuration values with user defined parameters */ while (1) { - opt = getopt_long(argc, argv, "ht:e:r:c:f:mn:C:SIEy:a1", long_options, &option_index); + opt = getopt(argc, argv, "ht:e:r:c:Rn:C:SIEy:a1"); if (opt == -1) break; switch (opt) { case 'h': - print_help(); + print_help(argv[0]); exit(0); break; case 't': @@ -191,13 +190,7 @@ case 'c': cfg.euicc_channel = atoi(optarg); break; - case 'f': - getopt_initial_eim_cfg_file = optarg; - break; - case 'm': - getopt_euicc_memory_reset = true; - break; - case OPT_REFRESHFLAG: + case 'R': cfg.refresh_flag = true; break; case 'n': @@ -225,9 +218,33 @@ getopt_one_euicc_pkg_only = true; break; default: - printf("unhandled option: %c!\n", opt); + printf("unsupported option: %c!\n", opt); + opt = -1; break; - }; + } + if (opt == -1) + exit(opt); + } + + if (optind < argc) { + if (!strcmp(argv[optind], "add-initial-eim")) { + if (optind + 1 >= argc) { + printf("operation requires two parameters: %s PATH\n", argv[optind]); + exit(-1); + } + operation = OPER_ADD_INITIAL_EIM; + initial_eim_cfg_file = argv[++optind]; + } else if (!strcmp(argv[optind], "euicc-memory-reset")) { + operation = OPER_EUICC_MEMORY_RESET; + } else if (!!strcmp(argv[optind], "get-eim-package")) { + printf("unknown operation: %s\n", argv[optind]); + exit(-1); + } + optind++; + if (optind < argc) { + printf("illegal extra operation parameter: %s\n", argv[optind]); + exit(-1); + } } /* Display current config */ @@ -273,15 +290,8 @@ goto leave; } - if (getopt_initial_eim_cfg_file) { - /* Load initial eIM configuration */ - struct ipa_buf *eim_cfg = load_ber_from_file(NULL, getopt_initial_eim_cfg_file); - ipa_add_init_eim_cfg(ctx, eim_cfg); - IPA_FREE(eim_cfg); - } else if (getopt_euicc_memory_reset) { - /* Perform an eUICC memory reset */ - ipa_euicc_mem_rst(ctx, true, true, true, true, true); - } else { + switch (operation) { + case OPER_GET_EIM_PACKAGE: IPA_LOGP(SMAIN, LINFO, "-----------------------------8<-----------------------------\n"); rc = eim_init(ctx); if (rc < 0) { @@ -326,6 +336,17 @@ goto leave; } } + break; + case OPER_ADD_INITIAL_EIM: + /* Load initial eIM configuration */ + struct ipa_buf *eim_cfg = load_ber_from_file(NULL, initial_eim_cfg_file); + ipa_add_init_eim_cfg(ctx, eim_cfg); + IPA_FREE(eim_cfg); + break; + case OPER_EUICC_MEMORY_RESET: + /* Perform an eUICC memory reset */ + ipa_euicc_mem_rst(ctx, true, true, true, true, true); + break; } leave: -- To view, visit https://gerrit.osmocom.org/c/onomondo-ipa/+/43202?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: I6b960f840820990de40fb07332669ddbfcdf1e7d Gerrit-Change-Number: 43202 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org>

1 0

[S] Change in osmo-ttcn3-hacks[master]: fixup Add close function to HTTP_Server_Emulation
by jolly 18 Aug '26

18 Aug '26

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43282?usp=email ) Change subject: fixup Add close function to HTTP_Server_Emulation ...................................................................... fixup Add close function to HTTP_Server_Emulation Change-Id: I8c82f0063770cd6d6a1a98c229d4122c5aa2b4bd --- M library/HTTP_Server_Emulation.ttcn 1 file changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/82/43282/1 diff --git a/library/HTTP_Server_Emulation.ttcn b/library/HTTP_Server_Emulation.ttcn index d604dd3..73a93bc 100644 --- a/library/HTTP_Server_Emulation.ttcn +++ b/library/HTTP_Server_Emulation.ttcn @@ -33,9 +33,9 @@ port HTTPmsg_PT HTTP_server_port; /* Communication with Clients */ - port HTTP_SRV_PT CLIENT; - port HTTP_SRV_PROC_PT CLIENT_PROC; - port HTTP_SRV_PT CLIENT_DEFAULT; + port HTTP_CLNT_PT CLIENT; + port HTTP_CLNT_PROC_PT CLIENT_PROC; + port HTTP_CLNT_PT CLIENT_DEFAULT; /* Configuration by the user */ var HttpServerEmulationCfg g_http_cfg; @@ -122,7 +122,13 @@ * Interaction between Main and Client Components ***********************************************************************/ type port HTTP_SRV_PT message { - inout HTTPMessage, Close; + inout HTTPMessage; + out Close; +} with { extension "internal" }; + +type port HTTP_CLNT_PT message { + inout HTTPMessage; + in Close; } with { extension "internal" }; signature HTTPEM_register(); @@ -131,6 +137,10 @@ inout HTTPEM_register; } with { extension "internal" }; +type port HTTP_CLNT_PROC_PT procedure { + inout HTTPEM_register; +} with { extension "internal" }; + /*********************************************************************** * Client Component -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43282?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I8c82f0063770cd6d6a1a98c229d4122c5aa2b4bd Gerrit-Change-Number: 43282 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu>

1 0

[M] Change in osmo-ttcn3-hacks[master]: IPAd: A test to verify PSMO forwarding
by jolly 18 Aug '26

18 Aug '26

Attention is currently required from: jolly. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43276?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified-1 by Jenkins Builder Change subject: IPAd: A test to verify PSMO forwarding ...................................................................... IPAd: A test to verify PSMO forwarding Related: SYS#8101 Change-Id: I38cccc34456eb7654b15582d952b6a1957305a74 --- M eim/eIM_Tests.ttcn M ipad/IPAd_Tests.ttcn M library/euicc/RSPDefinitions_Templates.ttcn M library/euicc/SGP32Definitions_Templates.ttcn M library/euicc/SGP32Definitions_Types.ttcn 5 files changed, 85 insertions(+), 17 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/43276/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/43276?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I38cccc34456eb7654b15582d952b6a1957305a74 Gerrit-Change-Number: 43276 Gerrit-PatchSet: 2 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: jolly <andreas(a)eversberg.eu>

1 0

[XS] Change in simtrace2[master]: contrib/jenkins.sh: pin libosmocore to the last release
by osmith 18 Aug '26

18 Aug '26

Attention is currently required from: laforge, lynxis lazus, pespin. osmith has posted comments on this change by lynxis lazus. ( https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email ) Change subject: contrib/jenkins.sh: pin libosmocore to the last release ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c Gerrit-Change-Number: 43281 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Tue, 18 Aug 2026 11:33:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

[XS] Change in simtrace2[master]: contrib/jenkins.sh: pin libosmocore to the last release
by lynxis lazus 18 Aug '26

18 Aug '26

lynxis lazus has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email ) Change subject: contrib/jenkins.sh: pin libosmocore to the last release ...................................................................... contrib/jenkins.sh: pin libosmocore to the last release Ensure the libosmocore version doesn't move while building firmwares which are published. This improve reproducible builds. Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c --- M contrib/jenkins.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/81/43281/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index e53a450..adbc412 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -19,7 +19,8 @@ mkdir "$deps" || true -osmo-build-dep.sh libosmocore "" '--disable-doxygen --enable-gnutls' +# pin the libosmocore to have more reproducible builds of our published firmwares +osmo-build-dep.sh libosmocore "1.14.1" '--disable-doxygen --enable-gnutls' # verify only after building the dependency (to ensure we have most recent source of dependency) verify_value_string_arrays_are_terminated.py $(find . -name "*.[hc]") -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/43281?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: simtrace2 Gerrit-Branch: master Gerrit-Change-Id: I753d634674f76c50e1a9cf67e5adc43201d54f0c Gerrit-Change-Number: 43281 Gerrit-PatchSet: 1 Gerrit-Owner: lynxis lazus <lynxis(a)fe80.eu>

1 0

2026

2025

2024

2023

2022

gerrit-log August 2026