February 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: cosmetics around select_best_cipher()

by laforge

Attention is currently required from: neels. laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27250 ) Change subject: cosmetics around select_best_cipher() ...................................................................... Removed Verified+1 by laforge <laforge(a)osmocom.org> -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27250 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: deleteVote

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: cosmetics around select_best_cipher()

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27250 ) Change subject: cosmetics around select_best_cipher() ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27250 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:27:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: cosmetics around select_best_cipher()

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27250 ) Change subject: cosmetics around select_best_cipher() ...................................................................... Patch Set 4: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27250 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iaed6b97c31e4ccb1f28ca7e64596d5e20563b392 Gerrit-Change-Number: 27250 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:27:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27248 ) Change subject: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify ...................................................................... rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify The naming confused me so that I wrote buggy code again. Hopefully this clarifies which representations the code paths are using. In the macro code, highlight the error case of n <= -1 explicitly. Also add ALG_A5_NR_TO_PERM_ALG_BITS. I need the 1<<n case in an upcoming patch. Related: SYS#5839 Change-Id: I7557ae97764bba09c906748a18e9031dfb362611 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/osmo_bsc_bssap.c 4 files changed, 22 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 910c3d3..07d141d 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -528,7 +528,24 @@ #define A38_XOR_MIN_KEY_LEN 12 #define A38_XOR_MAX_KEY_LEN 16 #define A38_COMP128_KEY_LEN 16 -#define RSL_ENC_ALG_A5(x) (x+1) + +/* There are these representations of A5/n: + * + * - (uint8_t)(1<<n), either as a single bit, or combined as a list of + * permitted algorithms. + * A5/0 == 0x01, A5/3 == 0x08, none = 0 + * + * - n+1, used on the RSL wire. + * A5/0 == 1, A5/3 == 4, none = 0 + * + * - n, used for human interaction and returned by select_best_cipher(). + * A5/0 == 0, A5/3 == 3, none <= -1 + * + * These macros convert from n to the other representations: + */ +#define ALG_A5_NR_TO_RSL(A5_N) ((A5_N) >= 0 ? (A5_N)+1 : 0) +#define ALG_A5_NR_TO_PERM_ALG_BITS(A5_N) ((A5_N) >= 0 ? 1<<(A5_N) : 0) + /* Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the practical maximum is 3*16. * The real maximum that fits in a total of 16 SI2quater rest octets also depends on the bits left by other SI2quater * rest octets elements, so to really fit 48 EARFCNs most other SI2quater elements need to be omitted. */ diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 402ea27..a49cc65 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -660,7 +660,7 @@ msg->l3h = len + 1; *len = msgb_l3len(msg); - if (lchan->encr.alg_id > RSL_ENC_ALG_A5(0)) { + if (lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) { uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) @@ -764,7 +764,7 @@ msgb_tlv_put(msg, RSL_IE_CHAN_MODE, sizeof(cm), (uint8_t *) &cm); - if (lchan->encr.alg_id > RSL_ENC_ALG_A5(0)) { + if (lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) { uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 6c0615e..03b1e98 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -374,7 +374,7 @@ DEBUGP(DRR, "TX CIPHERING MODE CMD\n"); - if (lchan->encr.alg_id <= RSL_ENC_ALG_A5(0)) + if (lchan->encr.alg_id <= ALG_A5_NR_TO_RSL(0)) ciph_mod_set = 0; else ciph_mod_set = (lchan->encr.alg_id-2)<<1 | 1; diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 3f56052..b18627c 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -534,7 +534,7 @@ goto reject; } - conn->lchan->encr.alg_id = RSL_ENC_ALG_A5(chosen_cipher); + conn->lchan->encr.alg_id = ALG_A5_NR_TO_RSL(chosen_cipher); if (enc_key_len) { conn->lchan->encr.key_len = enc_key_len; memcpy(conn->lchan->encr.key, enc_key, enc_key_len); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7557ae97764bba09c906748a18e9031dfb362611 Gerrit-Change-Number: 27248 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27248 ) Change subject: rename RSL_ENC_ALG_A5 to ALG_A5_NR_TO_RSL, clarify ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27248 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I7557ae97764bba09c906748a18e9031dfb362611 Gerrit-Change-Number: 27248 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:26:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_ho_into_this_bsc_a5_mismatch

by laforge

Attention is currently required from: neels, fixeria. laforge has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_mismatch ...................................................................... Removed Code-Review+2 by laforge <laforge(a)osmocom.org> -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I44b464a0bedbff09c467c4bccd7c985480fb883a Gerrit-Change-Number: 27247 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: deleteVote

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_ho_into_this_bsc_a5_mismatch

by laforge

Attention is currently required from: neels, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_mismatch ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27247 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I44b464a0bedbff09c467c4bccd7c985480fb883a Gerrit-Change-Number: 27247 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Feb 2022 11:23:12 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ci[master]: jobs/gerrit-lint: don't verify dahdi-linux

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/27282 ) Change subject: jobs/gerrit-lint: don't verify dahdi-linux ...................................................................... jobs/gerrit-lint: don't verify dahdi-linux Closes: OS#5465 Change-Id: I41ede04849da033a497daf39b34828bed00ab724 --- M jobs/gerrit-lint.yml 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/82/27282/1 diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 69b1c0e..2256e60 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -14,7 +14,6 @@ repos: - asn1c - cellmgr-ng - - dahdi-linux - docker-playground - libasn1c - libgtpnl -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27282 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I41ede04849da033a497daf39b34828bed00ab724 Gerrit-Change-Number: 27282 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in pysim[master]: Initial support for GlobalPlatform

by laforge

Attention is currently required from: laforge. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/pysim/+/27271 to look at the new patch set (#2). Change subject: Initial support for GlobalPlatform ...................................................................... Initial support for GlobalPlatform One can now select the Issuer Security Domain (hard-coded to a000000003000000) and issue get_data requests. FCI and other TLV objects are dcoded, e.g. pySIM-shell (MF)> select ADF.ISD { "application_id": "a000000003000000", "proprietary_data": { "maximum_length_of_data_field_in_command_message": 255 } } pySIM-shell (MF/ADF.ISD)> get_data CardData { "card_data": [ { "card_recognition_data": [ { "object_identifier": "2a864886fc6b01" }, { "card_management_type_and_version": [ { "object_identifier": "2a864886fc6b02020101" } ] }, { "card_identification_scheme": [ { "object_identifier": "2a864886fc6b03" } ] }, { "secure_channel_protocol_of_isd": [ { "object_identifier": "2a864886fc6b040215" } ] } ] } ] } Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 --- M pySim-shell.py M pySim/commands.py A pySim/global_platform.py 3 files changed, 262 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/71/27271/2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/27271 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: If11267d45ab7aa371eea8c143abd9320c32b54d0 Gerrit-Change-Number: 27271 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTP_Codec_Port: Check length field of GTPV1C received packets

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27270 ) Change subject: GTP_Codec_Port: Check length field of GTPV1C received packets ...................................................................... GTP_Codec_Port: Check length field of GTPV1C received packets Change-Id: Ie9447b7ec7f7f5ee35cd0393265f5edb5578bdaf --- M library/GTP_CodecPort.ttcn 1 file changed, 5 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/GTP_CodecPort.ttcn b/library/GTP_CodecPort.ttcn index 317210e..b516611 100644 --- a/library/GTP_CodecPort.ttcn +++ b/library/GTP_CodecPort.ttcn @@ -14,6 +14,7 @@ import from IPL4asp_Types all; import from GTPC_Types all; import from GTPU_Types all; + import from Misc_Helpers all; modulepar { SystemUnderTest mp_pl_SystemUnderTest := SGSN; @@ -63,6 +64,10 @@ out_ud.peer.remName := in_ud.remName; out_ud.peer.remPort := in_ud.remPort; out_ud.gtpc := dec_PDU_GTPC(in_ud.msg, pl_SystemUnderTest := mp_pl_SystemUnderTest); + if (lengthof(in_ud.msg) != out_ud.gtpc.lengthf + 8) { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + log2str("Rx GTPv1-C with field length ", out_ud.gtpc.lengthf, " + 8 != exp ", lengthof(in_ud.msg))); + } } with { extension "prototype(fast)" }; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27270 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ie9447b7ec7f7f5ee35cd0393265f5edb5578bdaf Gerrit-Change-Number: 27270 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022