- gerrit-log - lists.osmocom.org

Change in osmo-hnodeb[master]: audio: Introduce SAPI v1 with unordered RFCI support
by laforge 13 Jun '22

13 Jun '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28251 ) Change subject: audio: Introduce SAPI v1 with unordered RFCI support ...................................................................... audio: Introduce SAPI v1 with unordered RFCI support This commit introduces support for the new llsk_audio SAPI v1. This new version is almost the same as v0, with the exception that primitive <REQUEST,HNB_AUDIO_PRIM_CONN_ESTABLISH> wins an extra field appended at the end: """ uint8_t rfci[HNB_MAX_RFCIS]; /* values range 6 bits */ """ This allows lowerlayers to provide an unordered array of RFCIs, which was seen may happen under some conditions. For instance: """ rfci[HNB_MAX_RFCIS] = { 2, 3, 1}; [0] RFCI 2 [1] RFCI 3 [2] RFCI 1 """ OsmoHNodeB still supports v0 if the lowerlayer asks for it, and will continue having the exact behavior as before in this case (using position in the array as RFCI). Hence, no compatibility breakage occurs in this patch. New clients, on the other hand, can provide the extra information by announcing V1 support during version negotiation at startup. Related: SYS#5516 Change-Id: I860d18b80c1041bf63a1570d435e0568c0f6b01b --- M include/osmocom/hnodeb/hnb_prim.h M include/osmocom/hnodeb/llsk.h M src/osmo-hnodeb/llsk.c M src/osmo-hnodeb/llsk_audio.c M src/osmo-hnodeb/rtp.c 5 files changed, 64 insertions(+), 29 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/hnodeb/hnb_prim.h b/include/osmocom/hnodeb/hnb_prim.h index ba3223d..be5cba2 100644 --- a/include/osmocom/hnodeb/hnb_prim.h +++ b/include/osmocom/hnodeb/hnb_prim.h @@ -188,7 +188,7 @@ /* HNB_AUDIO_PRIM_CONN_ESTABLISH, UL */ #define HNB_MAX_RFCIS 64 #define HNB_MAX_SUBFLOWS 7 -struct hnb_audio_conn_establish_req_param { +struct hnb_audio_conn_establish_req_param_v0 { uint32_t context_id; uint16_t remote_rtp_port; uint8_t spare1; @@ -204,6 +204,16 @@ uint8_t IPTIs_present; /* 1=present; 0=not present */ uint8_t IPTIs[HNB_MAX_RFCIS]; /* values range 0-15, 4 bits */ } __attribute__ ((packed)); +struct hnb_audio_conn_establish_req_param_v1 { + struct hnb_audio_conn_establish_req_param_v0 v0; + uint8_t rfci[HNB_MAX_RFCIS]; /* values range 6 bits */ +} __attribute__ ((packed)); +struct hnb_audio_conn_establish_req_param { + union { + struct hnb_audio_conn_establish_req_param_v0 v0; + struct hnb_audio_conn_establish_req_param_v1 v1; + } __attribute__ ((packed)); +} __attribute__ ((packed)); /* HNB_AUDIO_PRIM_CONN_ESTABLISH, DL */ struct hnb_audio_conn_establish_cnf_param { diff --git a/include/osmocom/hnodeb/llsk.h b/include/osmocom/hnodeb/llsk.h index d9e1a69..bde531a 100644 --- a/include/osmocom/hnodeb/llsk.h +++ b/include/osmocom/hnodeb/llsk.h @@ -51,8 +51,9 @@ struct hnb_iuh_prim *hnb_iuh_makeprim_unitdata_ind(const uint8_t *data, uint32_t data_len); #define LLSK_SAPI_AUDIO_VERSION_MIN 0 -#define LLSK_SAPI_AUDIO_VERSION_MAX 0 +#define LLSK_SAPI_AUDIO_VERSION_MAX 1 extern const struct value_string hnb_audio_prim_type_names[]; +int llsk_audio_sapi_version_confirmed(uint16_t sapi_version); int llsk_rx_audio(struct hnb *hnb, struct osmo_prim_hdr *oph); int llsk_audio_tx_conn_data_ind(struct rtp_conn *conn, uint8_t frame_nr, uint8_t fqc, uint8_t rfci, const uint8_t *payload, uint32_t len); diff --git a/src/osmo-hnodeb/llsk.c b/src/osmo-hnodeb/llsk.c index b56cae7..f2d778f 100644 --- a/src/osmo-hnodeb/llsk.c +++ b/src/osmo-hnodeb/llsk.c @@ -167,6 +167,8 @@ return -1; if (rem_version > LLSK_SAPI_AUDIO_VERSION_MAX) return LLSK_SAPI_AUDIO_VERSION_MAX; + if (llsk_audio_sapi_version_confirmed(hnb->llsk.sapi_version_audio) < 0) + return -1; hnb->llsk.sapi_version_audio = rem_version; break; default: diff --git a/src/osmo-hnodeb/llsk_audio.c b/src/osmo-hnodeb/llsk_audio.c index a9fe858..a545ee7 100644 --- a/src/osmo-hnodeb/llsk_audio.c +++ b/src/osmo-hnodeb/llsk_audio.c @@ -68,6 +68,24 @@ { 0, NULL } }; +int llsk_audio_sapi_version_confirmed(uint16_t sapi_version) +{ + /* Update primitive size expectancies based on SAPI version: */ + switch (sapi_version) { + case 0: + llsk_audio_prim_size_tbl[PRIM_OP_REQUEST][HNB_AUDIO_PRIM_CONN_ESTABLISH] = + sizeof(struct hnb_audio_conn_establish_req_param_v0); + break; + case 1: + llsk_audio_prim_size_tbl[PRIM_OP_REQUEST][HNB_AUDIO_PRIM_CONN_ESTABLISH] = + sizeof(struct hnb_audio_conn_establish_req_param_v1); + break; + default: + return -1; + } + return 0; +} + static struct hnb_audio_prim *hnb_audio_prim_alloc(enum hnb_audio_prim_type ptype, enum osmo_prim_operation op, size_t extra_len) { struct osmo_prim_hdr *oph; @@ -159,34 +177,35 @@ union u_addr loc_uaddr = {0}; uint16_t loc_port = 0; struct rtp_conn *conn = NULL; + struct hnb_audio_conn_establish_req_param_v0 *v0 = &ce_req->v0; - rc = ll_addr2osa(ce_req->remote_rtp_address_type, &ce_req->remote_rtp_addr, ce_req->remote_rtp_port, &rem_osa); + rc = ll_addr2osa(v0->remote_rtp_address_type, &v0->remote_rtp_addr, v0->remote_rtp_port, &rem_osa); if (rc < 0) { LOGP(DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_ESTABLISH.req: ctx=%u with unexpected address type %u\n", - ce_req->context_id, ce_req->remote_rtp_address_type); - return _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 1); + v0->context_id, v0->remote_rtp_address_type); + return _send_conn_establish_cnf_failed(hnb, v0->context_id, 1); } osmo_sockaddr_to_str_buf(rem_addrstr, sizeof(rem_addrstr), &rem_osa); LOGP(DLLSK, LOGL_INFO, "Rx AUDIO-CONN_ESTABLISH.req ctx=%u rem_addr=%s\n", - ce_req->context_id, rem_addrstr); + v0->context_id, rem_addrstr); - if ((af = ll_addr_type2af(ce_req->remote_rtp_address_type)) < 0) { + if ((af = ll_addr_type2af(v0->remote_rtp_address_type)) < 0) { LOGP(DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_ESTABLISH.req: ctx=%u with unexpected address type %u\n", - ce_req->context_id, ce_req->remote_rtp_address_type); - return _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 1); + v0->context_id, v0->remote_rtp_address_type); + return _send_conn_establish_cnf_failed(hnb, v0->context_id, 1); } - ue = hnb_find_ue_by_id(hnb, ce_req->context_id); + ue = hnb_find_ue_by_id(hnb, v0->context_id); if (!ue) { LOGP(DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_ESTABLISH.req: UE not found! ctx=%u rem_addr=%s\n", - ce_req->context_id, rem_addrstr); - return _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 2); + v0->context_id, rem_addrstr); + return _send_conn_establish_cnf_failed(hnb, v0->context_id, 2); } if (!ue->conn_cs.active) { LOGUE(ue, DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_ESTABLISH.req: CS chan not active! rem_addr=%s\n", rem_addrstr); - return _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 3); + return _send_conn_establish_cnf_failed(hnb, v0->context_id, 3); } /* Create the socket: */ @@ -194,22 +213,22 @@ if ((rc = rtp_conn_setup(conn, &rem_osa, ce_req)) < 0) { LOGUE(ue, DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_ESTABLISH.req: Failed to set up audio socket rem_addr=%s\n", rem_addrstr); - return _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 4); + return _send_conn_establish_cnf_failed(hnb, v0->context_id, 4); } /* Convert resulting local address back to LLSK format: */ - if (osa2_ll_addr(&conn->loc_addr, &loc_uaddr, &loc_port) != ce_req->remote_rtp_address_type) { + if (osa2_ll_addr(&conn->loc_addr, &loc_uaddr, &loc_port) != v0->remote_rtp_address_type) { LOGUE(ue, DLLSK, LOGL_ERROR, "Rx AUDIO-CONN_ESTABLISH.req: Failed to provide proper local address rem_addr=%s\n", rem_addrstr); - rc = _send_conn_establish_cnf_failed(hnb, ce_req->context_id, 4); + rc = _send_conn_establish_cnf_failed(hnb, v0->context_id, 4); goto release_sock; } /* Submit successful confirmation */ LOGUE(ue, DLLSK, LOGL_INFO, "Tx AUDIO-CONN_ESTABLISH.cnf: error_code=0 rem_addr=%s loc_addr=%s\n", rem_addrstr, osmo_sockaddr_to_str(&conn->loc_addr)); - audio_prim = hnb_audio_makeprim_conn_establish_cnf(ce_req->context_id, conn->id, 0, loc_port, - ce_req->remote_rtp_address_type, &loc_uaddr); + audio_prim = hnb_audio_makeprim_conn_establish_cnf(v0->context_id, conn->id, 0, loc_port, + v0->remote_rtp_address_type, &loc_uaddr); if ((rc = osmo_prim_srv_send(hnb->llsk.srv, audio_prim->hdr.msg)) < 0) { LOGUE(ue, DLLSK, LOGL_ERROR, "Failed sending AUDIO-CONN_ESTABLISH.cnf error_code=0\n"); goto release_sock; diff --git a/src/osmo-hnodeb/rtp.c b/src/osmo-hnodeb/rtp.c index c0d96a9..422e043 100644 --- a/src/osmo-hnodeb/rtp.c +++ b/src/osmo-hnodeb/rtp.c @@ -31,30 +31,33 @@ #define HNB_IUUP_MSGB_SIZE 4096 -static struct osmo_iuup_rnl_prim *llsk_audio_ce_to_iuup_rnl_cfg(void *ctx, const struct hnb_audio_conn_establish_req_param *ce_req) +static struct osmo_iuup_rnl_prim *llsk_audio_ce_to_iuup_rnl_cfg(struct rtp_conn *conn, const struct hnb_audio_conn_establish_req_param *ce_req) { struct osmo_iuup_rnl_prim *irp; struct osmo_iuup_rnl_config *cfg; unsigned int i; + const struct hnb_audio_conn_establish_req_param_v0 *v0 = &ce_req->v0; + const struct hnb *hnb = conn->ue->hnb; - irp = osmo_iuup_rnl_prim_alloc(ctx, OSMO_IUUP_RNL_CONFIG, PRIM_OP_REQUEST, HNB_IUUP_MSGB_SIZE); + irp = osmo_iuup_rnl_prim_alloc(conn, OSMO_IUUP_RNL_CONFIG, PRIM_OP_REQUEST, HNB_IUUP_MSGB_SIZE); cfg = &irp->u.config; - cfg->transparent = !!ce_req->transparent; + cfg->transparent = !!v0->transparent; cfg->active = true; - cfg->data_pdu_type = ce_req->data_pdu_type; - cfg->supported_versions_mask = ce_req->supported_versions_mask; - cfg->num_rfci = ce_req->num_rfci; - cfg->num_subflows = ce_req->num_subflows; - cfg->IPTIs_present = ce_req->IPTIs_present; + cfg->data_pdu_type = v0->data_pdu_type; + cfg->supported_versions_mask = v0->supported_versions_mask; + cfg->num_rfci = v0->num_rfci; + cfg->num_subflows = v0->num_subflows; + cfg->IPTIs_present = v0->IPTIs_present; OSMO_ASSERT(cfg->num_rfci <= ARRAY_SIZE(cfg->rfci)); OSMO_ASSERT(cfg->num_subflows <= ARRAY_SIZE(cfg->rfci[0].subflow_sizes)); for (i = 0; i < cfg->num_rfci; i++) { cfg->rfci[i].used = true; - cfg->rfci[i].id = i; /* Assume RFC ID from position, llsk_audio doesn't provide info */ + /* llsk_audio v0 doesn't provide info, assume RFC ID from position: */ + cfg->rfci[i].id = (hnb->llsk.sapi_version_audio > 0) ? ce_req->v1.rfci[i] : i; if (cfg->IPTIs_present) - cfg->rfci[i].IPTI = ce_req->IPTIs[i]; + cfg->rfci[i].IPTI = v0->IPTIs[i]; if (cfg->num_subflows > 0) - memcpy(&cfg->rfci[i].subflow_sizes[0], &ce_req->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); + memcpy(&cfg->rfci[i].subflow_sizes[0], &v0->subflow_sizes[i][0], cfg->num_subflows*sizeof(uint16_t)); } cfg->t_init = (struct osmo_iuup_rnl_config_timer){ .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I860d18b80c1041bf63a1570d435e0568c0f6b01b Gerrit-Change-Number: 28251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-hnodeb[master]: audio: Introduce SAPI v1 with unordered RFCI support
by laforge 13 Jun '22

13 Jun '22

Attention is currently required from: osmith, pespin, fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnodeb/+/28251 ) Change subject: audio: Introduce SAPI v1 with unordered RFCI support ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnodeb/+/28251 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnodeb Gerrit-Branch: master Gerrit-Change-Id: I860d18b80c1041bf63a1570d435e0568c0f6b01b Gerrit-Change-Number: 28251 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 19:11:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-iuh[master]: move new_transp_layer_addr to public API
by laforge 13 Jun '22

13 Jun '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/28264 ) Change subject: move new_transp_layer_addr to public API ...................................................................... move new_transp_layer_addr to public API osmo-hnbgw will use this function in Ic9bc30f322c4c6c6e82462d1da50cb15b336c63a. Related: SYS#5859 Change-Id: Icc61620b4d11c4ba6823b40abc7c300f0533c058 --- M include/osmocom/ranap/iu_helpers.h M src/iu_helpers.c 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/include/osmocom/ranap/iu_helpers.h b/include/osmocom/ranap/iu_helpers.h index bf2a580..3a06c4b 100644 --- a/include/osmocom/ranap/iu_helpers.h +++ b/include/osmocom/ranap/iu_helpers.h @@ -20,3 +20,4 @@ RANAP_TransportLayerInformation_t *ranap_new_transp_info_rtp(struct osmo_sockaddr *addr, bool use_x213_nsap); RANAP_TransportLayerInformation_t *ranap_new_transp_info_gtp(struct osmo_sockaddr *addr, uint32_t tei, bool use_x213_nsap); +int ranap_new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap); diff --git a/src/iu_helpers.c b/src/iu_helpers.c index 1591f7d..6e2c203 100644 --- a/src/iu_helpers.c +++ b/src/iu_helpers.c @@ -143,7 +143,7 @@ if (len == 20 && buf[0] == 0x35) { /* For an X.213 NSAP encoded address we expect a buffer of exactly 20 bytes (3 bytes IDP + 17 bytes * DSP). we also expect AFI = 0x35, which means that two byte IDI and an IP address follows. (see also - * comments in function new_transp_layer_addr below) */ + * comments in function ranap_new_transp_layer_addr below) */ x213_nsap = true; icp = osmo_load16be(&buf[1]); switch (icp) { @@ -176,7 +176,7 @@ return 0; } -static int new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap) +int ranap_new_transp_layer_addr(BIT_STRING_t *out, struct osmo_sockaddr *addr, bool use_x213_nsap) { uint8_t *buf; unsigned int len; @@ -242,7 +242,7 @@ } tli = CALLOC(1, sizeof(*tli)); - rc = new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap); + rc = ranap_new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap); if (rc < 0) { ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); return NULL; @@ -262,7 +262,7 @@ uint32_t binding_buf = htonl(tei); int rc; - rc = new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap); + rc = ranap_new_transp_layer_addr(&tli->transportLayerAddress, addr, use_x213_nsap); if (rc < 0) { ASN_STRUCT_FREE(asn_DEF_RANAP_TransportLayerInformation, tli); return NULL; -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/28264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Icc61620b4d11c4ba6823b40abc7c300f0533c058 Gerrit-Change-Number: 28264 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-iuh[master]: move new_transp_layer_addr to public API
by laforge 13 Jun '22

13 Jun '22

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-iuh/+/28264 ) Change subject: move new_transp_layer_addr to public API ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/28264 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: Icc61620b4d11c4ba6823b40abc7c300f0533c058 Gerrit-Change-Number: 28264 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 19:09:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: APDU parsing support for GlobalPlatform
by laforge 13 Jun '22

13 Jun '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28248 ) Change subject: APDU parsing support for GlobalPlatform ...................................................................... APDU parsing support for GlobalPlatform This patch addes support for GlobalPlatform command. Android is using STORE DATA commands on a logical channel. simtrace2-cardem-pcsc is failing otherwise e.g. on an Pixel 4 with Android 12. Change-Id: Ib734fc852e7b63b9efdc414adccbd796a572eb55 --- M src/sim/class_tables.c 1 file changed, 63 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/sim/class_tables.c b/src/sim/class_tables.c index 534ef53..34f22dd 100644 --- a/src/sim/class_tables.c +++ b/src/sim/class_tables.c @@ -173,6 +173,24 @@ return 0; } +static int gp_cla_ins_helper(const struct osim_cla_ins_case *cic, + const uint8_t *hdr) +{ + uint8_t ins = hdr[1]; + uint8_t p1 = hdr[2]; + + switch (ins) { + case 0xE2: /* STORE DATA */ + switch (p1 & 0x01) { + case 1: + return 4; + default: + return 3; + } + } + return 0; +} + /* ETSI TS 102 221, Table 10.5, CLA = 0x8x, 0xCx or 0xEx */ static const uint8_t uicc_ins_tbl_8ce[256] = { [0xF2] = 2, /* STATUS */ @@ -190,6 +208,19 @@ [0x14] = 3, /* TERMINAL RESPONSE */ }; +/* Card Specification v2.3.1*/ +static const uint8_t gp_ins_tbl_8ce[256] = { + [0xE4] = 4, /* DELETE */ + [0xE2] = 0x80, /* STORE DATA */ + [0xCA] = 4, /* GET DATA */ + [0xCB] = 4, /* GET DATA */ + [0xF2] = 4, /* GET STATUS */ + [0xE6] = 4, /* INSTALL */ + [0xE8] = 4, /* LOAD */ + [0xD8] = 4, /* PUT KEY */ + [0xF0] = 3, /* SET STATUS */ +}; + static const struct osim_cla_ins_case uicc_ins_case[] = { { .cla = 0x80, @@ -222,6 +253,21 @@ .cla = 0xE0, .cla_mask = 0xF0, .ins_tbl = uicc_ins_tbl_8ce, + }, { + .cla = 0x80, + .cla_mask = 0xF0, + .helper = gp_cla_ins_helper, + .ins_tbl = gp_ins_tbl_8ce, + }, { + .cla = 0xC0, + .cla_mask = 0xF0, + .helper = gp_cla_ins_helper, + .ins_tbl = gp_ins_tbl_8ce, + }, { + .cla = 0xE0, + .cla_mask = 0xF0, + .helper = gp_cla_ins_helper, + .ins_tbl = gp_ins_tbl_8ce, }, }; @@ -269,7 +315,23 @@ .cla = 0xE0, .cla_mask = 0xF0, .ins_tbl = uicc_ins_tbl_8ce, + }, { + .cla = 0x80, + .cla_mask = 0xF0, + .helper = gp_cla_ins_helper, + .ins_tbl = gp_ins_tbl_8ce, + }, { + .cla = 0xC0, + .cla_mask = 0xF0, + .helper = gp_cla_ins_helper, + .ins_tbl = gp_ins_tbl_8ce, + }, { + .cla = 0xE0, + .cla_mask = 0xF0, + .helper = gp_cla_ins_helper, + .ins_tbl = gp_ins_tbl_8ce, }, + }; const struct osim_cla_ins_card_profile osim_uicc_sim_cic_profile = { @@ -301,7 +363,7 @@ case 0x80: return cic->helper(cic, hdr); case 0x00: - /* continue with fruther cic, rather than abort + /* continue with further cic, rather than abort * now */ continue; default: -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib734fc852e7b63b9efdc414adccbd796a572eb55 Gerrit-Change-Number: 28248 Gerrit-PatchSet: 2 Gerrit-Owner: k_o_ <wider.stand(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

1 0

Change in libosmocore[master]: APDU parsing support for GlobalPlatform
by laforge 13 Jun '22

13 Jun '22

Attention is currently required from: k_o_. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28248 ) Change subject: APDU parsing support for GlobalPlatform ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: > I think it is related the the Android carrier privileges using the GlobalPlatform access rules which […] I don't think there really is any way to know the "direction" of the data phase without knowing the related command. Both parties (card and phone) must have a-priori knowledge on which of the two parties sends after the 5-byte TPDU header... -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib734fc852e7b63b9efdc414adccbd796a572eb55 Gerrit-Change-Number: 28248 Gerrit-PatchSet: 1 Gerrit-Owner: k_o_ <wider.stand(a)gmx.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: k_o_ <wider.stand(a)gmx.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 19:09:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: k_o_ <wider.stand(a)gmx.de> Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: ansible: get OBS pub key from proper URL
by laforge 13 Jun '22

13 Jun '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28266 ) Change subject: ansible: get OBS pub key from proper URL ...................................................................... ansible: get OBS pub key from proper URL Same reasoning as in previous patch Idd0fb6e07cba959a36269244b0c7b5c62aaffeee. Change-Id: I630654ade0edddd23f9fe7c578d1f329f5f49603 --- M ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml index fc4fcc3..457d01e 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/ttcn3-slave.yml @@ -16,7 +16,7 @@ - name: add apt.key apt_key: - url: https://download.opensuse.org/repositories/network:/osmocom:/latest/{{ obs_distro }}/Release.key + url: https://build.opensuse.org/projects/network:osmocom/public_key - name: add apt repository apt_repository: -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I630654ade0edddd23f9fe7c578d1f329f5f49603 Gerrit-Change-Number: 28266 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: repo-install-test: get OBS pub key from proper URL
by laforge 13 Jun '22

13 Jun '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28265 ) Change subject: repo-install-test: get OBS pub key from proper URL ...................................................................... repo-install-test: get OBS pub key from proper URL The public OBS key expired on 2022-05-22 and was replaced with a key that was only shortly valid until 2022-06-08. Shortly after it was replaced with a key that is valid longer, until 2024-08-02. On 2022-06-09, one of the osmocom-repo-install tests started failing. For some reason, the key in the latest/Debian_10 directory was not updated to the latest one: https://download.opensuse.org/repositories/network:/osmocom:/latest/Debian_… Since the key is the same for all of network:osmocom, adjust the function to download it from a place that the OBS web UI links to when attempting to download the public GPG key. I guess the latest/Debian_10/Release.key will get updated once making a new release and updating the packages in the repository. But sinc there's a lot of other tasks to do, just use this practical solution for now. Change-Id: Idd0fb6e07cba959a36269244b0c7b5c62aaffeee --- M scripts/repo-install-test/run-inside-docker.sh 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/repo-install-test/run-inside-docker.sh b/scripts/repo-install-test/run-inside-docker.sh index e44c609..933adef 100755 --- a/scripts/repo-install-test/run-inside-docker.sh +++ b/scripts/repo-install-test/run-inside-docker.sh @@ -100,7 +100,6 @@ configure_osmocom_repo_debian() { local proj="$1" local obs_repo="download.opensuse.org/repositories/$(proj_with_slashes "$proj")/$DISTRO_OBSDIR/" - local release_key="/var/cache/apt/${proj}_Release.key" echo "Configuring Osmocom repository" @@ -108,9 +107,9 @@ if ! [ -e "$release_key" ]; then apt-get update apt install -y wget - wget -O "$release_key" "https://$obs_repo/Release.key" + wget -O /tmp/Release.key "https://build.opensuse.org/projects/network:osmocom/public_key" fi - apt-key add "$release_key" + apt-key add /tmp/Release.key echo "deb http://$obs_repo ./" > "/etc/apt/sources.list.d/$proj.list" apt-get update -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idd0fb6e07cba959a36269244b0c7b5c62aaffeee Gerrit-Change-Number: 28265 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in osmo-ci[master]: ansible: get OBS pub key from proper URL
by laforge 13 Jun '22

13 Jun '22

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28266 ) Change subject: ansible: get OBS pub key from proper URL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28266 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I630654ade0edddd23f9fe7c578d1f329f5f49603 Gerrit-Change-Number: 28266 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 19:06:01 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ci[master]: repo-install-test: get OBS pub key from proper URL
by laforge 13 Jun '22

13 Jun '22

Attention is currently required from: osmith. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/28265 ) Change subject: repo-install-test: get OBS pub key from proper URL ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/28265 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Idd0fb6e07cba959a36269244b0c7b5c62aaffeee Gerrit-Change-Number: 28265 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Mon, 13 Jun 2022 19:05:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

2025

2024

2023

2022

gerrit-log