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

[S] Change in libosmo-sccp[master]: fixup for: add osmo_scu_prim_name_c() / _buf()

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/31434 ) Change subject: fixup for: add osmo_scu_prim_name_c() / _buf() ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: "undefined reference to osmo_prim_operation_name()" -- it's a static inline function fully defined in the .h file?? do i need to wait for nightly packages? -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/31434 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: If381f537ab91af1feef7f0e51921217f27e18e6a Gerrit-Change-Number: 31434 Gerrit-PatchSet: 4 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Wed, 22 Feb 2023 17:44:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in libosmocore[master]: add osmo_prim_operation_name()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31435 ) Change subject: add osmo_prim_operation_name() ...................................................................... add osmo_prim_operation_name() Also remove the explicit array dimension from the .h file. Change-Id: I9f43428af654a5674ac3035fe4db1394aac7a7af --- M include/osmocom/core/prim.h 1 file changed, 16 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/core/prim.h b/include/osmocom/core/prim.h index 99eabff..8e6b436 100644 --- a/include/osmocom/core/prim.h +++ b/include/osmocom/core/prim.h @@ -30,7 +30,11 @@ PRIM_OP_CONFIRM, /*!< confirm */ }; -extern const struct value_string osmo_prim_op_names[5]; +extern const struct value_string osmo_prim_op_names[]; +static inline const char *osmo_prim_operation_name(enum osmo_prim_operation val) +{ + return get_value_string(osmo_prim_op_names, val); +} /*!< The upper 8 byte of the technology, the lower 24 bits for the SAP */ #define _SAP_GSM_SHIFT 24 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9f43428af654a5674ac3035fe4db1394aac7a7af Gerrit-Change-Number: 31435 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 4 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_client: mgcp_msg_gen: add more error logs

by osmith

Attention is currently required from: osmith. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/31457 to look at the new patch set (#2). Change subject: mgcp_client: mgcp_msg_gen: add more error logs ...................................................................... mgcp_client: mgcp_msg_gen: add more error logs While adding CSD, this failed for me in add_lco without a descriptive log message, so add more error messages. Related: OS#4393 Change-Id: I4873a2db95525aab3e13046b645dd8f90e951466 --- M src/libosmo-mgcp-client/mgcp_client.c M tests/mgcp_client/mgcp_client_test.err 2 files changed, 20 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/57/31457/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4873a2db95525aab3e13046b645dd8f90e951466 Gerrit-Change-Number: 31457 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 4 months

1
0
0 0

[S] Change in osmo-hlr[master]: tests/db/db_test.err: adjust to XOR-3G rename

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hlr/+/31458 ) Change subject: tests/db/db_test.err: adjust to XOR-3G rename ...................................................................... tests/db/db_test.err: adjust to XOR-3G rename Adjust the test to the related libosmocore change. Related: libosmocore I446e54d0ddf4a18c46ee022b1249af73552e3ce1 Change-Id: I68878d24340659f888e5e348b937161cffbd54e2 --- M tests/db/db_test.err M tests/test_subscriber.ctrl M tests/test_subscriber.vty 3 files changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/58/31458/1 diff --git a/tests/db/db_test.err b/tests/db/db_test.err index 186af77..b4373cd 100644 --- a/tests/db/db_test.err +++ b/tests/db/db_test.err @@ -879,7 +879,7 @@ 2G: struct osmo_sub_auth_data { .type = GSM, - .algo = XOR, + .algo = XOR-3G, .u.gsm.ki = 'cededeffacedacefacedbadfadedbeef', } 3G: none @@ -907,7 +907,7 @@ 2G: struct osmo_sub_auth_data { .type = GSM, - .algo = XOR, + .algo = XOR-3G, .u.gsm.ki = 'cededeffacedacefacedbadfadedbeef', } 3G: none diff --git a/tests/test_subscriber.ctrl b/tests/test_subscriber.ctrl index ff26d4c..fba7458 100644 --- a/tests/test_subscriber.ctrl +++ b/tests/test_subscriber.ctrl @@ -678,7 +678,7 @@ SET_REPLY 113 subscriber.by-imsi-901991234567891.aud2g OK GET 114 subscriber.by-imsi-901991234567891.aud2g -GET_REPLY 114 subscriber.by-imsi-901991234567891.aud2g XOR,c01ffedc1cadaeac1d1f1edacac1ab0a +GET_REPLY 114 subscriber.by-imsi-901991234567891.aud2g XOR-3G,c01ffedc1cadaeac1d1f1edacac1ab0a SET 115 subscriber.by-imsi-901991234567891.aud2g none SET_REPLY 115 subscriber.by-imsi-901991234567891.aud2g OK diff --git a/tests/test_subscriber.vty b/tests/test_subscriber.vty index fe7499c..a119cee 100644 --- a/tests/test_subscriber.vty +++ b/tests/test_subscriber.vty @@ -160,7 +160,7 @@ ID: 101 IMSI: 123456789023000 MSISDN: 423 - 2G auth: XOR + 2G auth: XOR-3G KI=deaf0ff1ced0d0dabbedd1ced1cef00d OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki BeefedCafeFaceAcedAddedDecadeFee -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/31458 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I68878d24340659f888e5e348b937161cffbd54e2 Gerrit-Change-Number: 31458 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[S] Change in osmo-mgw[master]: mgcp_client: mgcp_msg_gen: add more error logs

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31457 ) Change subject: mgcp_client: mgcp_msg_gen: add more error logs ...................................................................... mgcp_client: mgcp_msg_gen: add more error logs While adding CSD, this failed for me in add_lco without a descriptive log message, so add more error messages. Related: OS#4393 Change-Id: I4873a2db95525aab3e13046b645dd8f90e951466 --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 19 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/57/31457/1 diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index c3ecc9f..0434e70 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -1392,8 +1392,10 @@ if (!use_sdp && (mgcp_msg->verb == MGCP_VERB_CRCX || mgcp_msg->verb == MGCP_VERB_MDCX)) { - if (add_lco(msg, mgcp_msg) < 0) + if (add_lco(msg, mgcp_msg) < 0) { + LOGPMGW(mgcp, LOGL_ERROR, "Failed to add LCO, can not generate MGCP message\n"); return NULL; + } } /* Add mode */ @@ -1428,8 +1430,10 @@ if (use_sdp && (mgcp_msg->verb == MGCP_VERB_CRCX || mgcp_msg->verb == MGCP_VERB_MDCX)) { - if (add_sdp(msg, mgcp_msg, mgcp) < 0) + if (add_sdp(msg, mgcp_msg, mgcp) < 0) { + LOGPMGW(mgcp, LOGL_ERROR, "Failed to add SDP, can not generate MGCP message\n"); return NULL; + } } if (rc != 0) { -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31457 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4873a2db95525aab3e13046b645dd8f90e951466 Gerrit-Change-Number: 31457 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 4 months

1
0
0 0

[M] Change in libosmocore[master]: Implement the XOR-2G authentication algorithm

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31451 ) Change subject: Implement the XOR-2G authentication algorithm ...................................................................... Implement the XOR-2G authentication algorithm We've so far only been supporting XOR-3G algorithm as specified in TS 34.108 (in both 3G and 2G-derivation mode). However, XOR-3G used for 2G auth is different from the XOR-2G algorithm as defined in Annex A of TS 51.010-1. Let's add support for that one, too. Change-Id: I0ee0565382c1e4515d44ff9b1752685c0a66ae39 --- M include/osmocom/crypt/auth.h M src/gsm/Makefile.am M src/gsm/auth_core.c A src/gsm/auth_xor_2g.c 4 files changed, 98 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/crypt/auth.h b/include/osmocom/crypt/auth.h index c653b61..4af8ca8 100644 --- a/include/osmocom/crypt/auth.h +++ b/include/osmocom/crypt/auth.h @@ -32,6 +32,7 @@ OSMO_AUTH_ALG_COMP128v3, OSMO_AUTH_ALG_XOR, OSMO_AUTH_ALG_MILENAGE, + OSMO_AUTH_ALG_XOR_2G, _OSMO_AUTH_ALG_NUM, }; diff --git a/src/gsm/Makefile.am b/src/gsm/Makefile.am index 798f11a..cff089b 100644 --- a/src/gsm/Makefile.am +++ b/src/gsm/Makefile.am @@ -26,7 +26,7 @@ gprs_cipher_core.c gprs_rlc.c gsm0480.c abis_nm.c gsm0502.c \ gsm0411_utils.c gsm0411_smc.c gsm0411_smr.c gsm0414.c \ lapdm.c kasumi.c gsm29205.c gsm_04_08_gprs.c \ - auth_core.c auth_comp128v1.c auth_comp128v23.c auth_xor.c \ + auth_core.c auth_comp128v1.c auth_comp128v23.c auth_xor.c auth_xor_2g.c \ auth_milenage.c milenage/aes-encblock.c gea.c \ milenage/aes-internal.c milenage/aes-internal-enc.c \ milenage/milenage.c gan.c ipa.c gsm0341.c apn.c \ diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c index f450850..af03ace 100644 --- a/src/gsm/auth_core.c +++ b/src/gsm/auth_core.c @@ -210,6 +210,7 @@ { OSMO_AUTH_ALG_COMP128v3, "COMP128v3" }, { OSMO_AUTH_ALG_XOR, "XOR" }, { OSMO_AUTH_ALG_MILENAGE, "MILENAGE" }, + { OSMO_AUTH_ALG_XOR_2G, "XOR-2G" }, { 0, NULL } }; diff --git a/src/gsm/auth_xor_2g.c b/src/gsm/auth_xor_2g.c new file mode 100644 index 0000000..9efe5cc --- /dev/null +++ b/src/gsm/auth_xor_2g.c @@ -0,0 +1,79 @@ +/*! \file auth_xor.c + * GSM XOR-2G algorithm as specified in Annex 4 (A.4.1.2) of 3GPP TS 51.010-1. + * This is implemented by typical GSM MS tester */ + +/* + * (C) 2023 by Harald Welte <laforge(a)gnumonks.org> + * + * All Rights Reserved + * + * Author: Daniel Willmann <dwillmann(a)sysmocom.de> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + */ + +#include <string.h> +#include <stdint.h> +#include <errno.h> + +#include <osmocom/crypt/auth.h> + +/*! \addtogroup auth + * @{ + */ + +static void xor(uint8_t *out, const uint8_t *a, const uint8_t *b, size_t len) +{ + size_t i; + + for (i = 0; i < len; i++) + out[i] = a[i] ^ b[i]; +} + +/* GSM XOR-2G algorithm as specified in Annex 4 (A.4.1.2) of 3GPP TS 51.010-1. */ +static int xor2g_gen_vec(struct osmo_auth_vector *vec, + struct osmo_sub_auth_data *aud, + const uint8_t *_rand) +{ + uint8_t res1[16]; + + if (aud->type != OSMO_AUTH_TYPE_GSM) + return -ENOTSUP; + + /* Step 1: XOR to the challenge RAND, a predefined number Ki, having the same bit length (128 bits) as + * RAND. */ + xor(res1, aud->u.gsm.ki, _rand, sizeof(res1)); + + /* Step 2: The most significant 32 bits of RES1 form SRES. */ + memcpy(vec->sres, res1, 4); + /* The next 64 bits of RES1 form Kc */ + memcpy(vec->kc, res1+4, 8); + + vec->auth_types = OSMO_AUTH_TYPE_GSM; + return 0; +} + +static struct osmo_auth_impl xor2g_alg = { + .algo = OSMO_AUTH_ALG_XOR_2G, + .name = "XOR-2G (libosmogsm built-in)", + .priority = 1000, + .gen_vec = &xor2g_gen_vec, +}; + +static __attribute__((constructor)) void on_dso_load_xor(void) +{ + osmo_auth_register(&xor2g_alg); +} + +/*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31451 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ee0565382c1e4515d44ff9b1752685c0a66ae39 Gerrit-Change-Number: 31451 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-MessageType: merged

2 years, 4 months

1
0
0 0

[M] Change in libosmocore[master]: New unit test for XOR-2G authentication

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31452 ) Change subject: New unit test for XOR-2G authentication ...................................................................... New unit test for XOR-2G authentication Let's test if the XOR-2G algorithm does what it's supposed to do. Change-Id: I7014258751624ff18c51912b6348c3cd876bb23f --- M tests/Makefile.am A tests/auth/xor2g_test.c A tests/auth/xor2g_test.ok M tests/testsuite.at 4 files changed, 105 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/tests/Makefile.am b/tests/Makefile.am index c637c16..eeefd3e 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -49,6 +49,7 @@ smscb/smscb_test \ smscb/gsm0341_test \ smscb/cbsp_test \ + auth/xor2g_test \ $(NULL) if ENABLE_MSGFILE @@ -110,6 +111,9 @@ auth_milenage_test_SOURCES = auth/milenage_test.c auth_milenage_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la +auth_xor2g_test_SOURCES = auth/xor2g_test.c +auth_xor2g_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la + abis_abis_test_SOURCES = abis/abis_test.c abis_abis_test_LDADD = $(LDADD) $(top_builddir)/src/gsm/libosmogsm.la @@ -357,6 +361,7 @@ timer/timer_test.ok sms/sms_test.ok ussd/ussd_test.ok \ bits/bitrev_test.ok a5/a5_test.ok \ conv/conv_test.ok auth/milenage_test.ok ctrl/ctrl_test.ok \ + auth/xor2g_test.ok \ lapd/lapd_test.ok \ gsm0408/gsm0408_test.ok gsm0408/gsm0408_test.err \ gsm0808/gsm0808_test.ok gb/bssgp_fc_tests.err \ diff --git a/tests/auth/xor2g_test.c b/tests/auth/xor2g_test.c new file mode 100644 index 0000000..82ab25a --- /dev/null +++ b/tests/auth/xor2g_test.c @@ -0,0 +1,77 @@ + +#include <stdlib.h> +#include <stdio.h> +#include <errno.h> +#include <string.h> +#include <inttypes.h> + +#include <osmocom/crypt/auth.h> +#include <osmocom/core/utils.h> + +static void dump_auth_vec(struct osmo_auth_vector *vec) +{ + printf("RAND:\t%s\n", osmo_hexdump(vec->rand, sizeof(vec->rand))); + + if (vec->auth_types & OSMO_AUTH_TYPE_UMTS) { + printf("AUTN:\t%s\n", osmo_hexdump(vec->autn, sizeof(vec->autn))); + printf("IK:\t%s\n", osmo_hexdump(vec->ik, sizeof(vec->ik))); + printf("CK:\t%s\n", osmo_hexdump(vec->ck, sizeof(vec->ck))); + printf("RES:\t%s\n", osmo_hexdump(vec->res, vec->res_len)); + } + + if (vec->auth_types & OSMO_AUTH_TYPE_GSM) { + printf("SRES:\t%s\n", osmo_hexdump(vec->sres, sizeof(vec->sres))); + /* According to 3GPP TS 55.205 Sec. 4 the GSM-MILENAGE output is limited to 64 bits. + According to 3GPP TS 33.102 Annex. B5 in UMTS security context Kc can be 128 bits. + Here we test the former, so make sure we only print interesting Kc bits. */ + printf("Kc:\t%s\n", osmo_hexdump(vec->kc, OSMO_A5_MAX_KEY_LEN_BYTES/2)); + } +} + +static struct osmo_sub_auth_data test_aud = { + .type = OSMO_AUTH_TYPE_GSM, + .algo = OSMO_AUTH_ALG_XOR_2G, + .u.gsm = { + .ki = { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f }, + }, +}; + +int main(int argc, char **argv) +{ + struct osmo_auth_vector _vec; + struct osmo_auth_vector *vec = &_vec; + uint8_t _rand[16]; + int rc; + +#if 0 + srand(time(NULL)); + *(uint32_t *)&_rand[0] = rand(); + *(uint32_t *)(&_rand[4]) = rand(); + *(uint32_t *)(&_rand[8]) = rand(); + *(uint32_t *)(&_rand[12]) = rand(); +#else + memset(_rand, 0, sizeof(_rand)); +#endif + memset(vec, 0, sizeof(*vec)); + + rc = osmo_auth_gen_vec(vec, &test_aud, _rand); + if (rc < 0) { + fprintf(stderr, "error generating auth vector\n"); + exit(1); + } + dump_auth_vec(vec); + + /* test once more with non-zero RAND to see it show in result */ + for (int i = 0; i < sizeof(_rand); i++) + _rand[i] = i << 4; + + rc = osmo_auth_gen_vec(vec, &test_aud, _rand); + if (rc < 0) { + fprintf(stderr, "error generating auth vector\n"); + exit(1); + } + dump_auth_vec(vec); + + exit(0); +} diff --git a/tests/auth/xor2g_test.ok b/tests/auth/xor2g_test.ok new file mode 100644 index 0000000..58becf6 --- /dev/null +++ b/tests/auth/xor2g_test.ok @@ -0,0 +1,6 @@ +RAND: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +SRES: 00 01 02 03 +Kc: 04 05 06 07 08 09 0a 0b +RAND: 00 10 20 30 40 50 60 70 80 90 a0 b0 c0 d0 e0 f0 +SRES: 00 11 22 33 +Kc: 44 55 66 77 88 99 aa bb diff --git a/tests/testsuite.at b/tests/testsuite.at index 6b2e75f..e447cdc 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -126,6 +126,12 @@ AT_CHECK([$abs_top_builddir/tests/auth/milenage_test], [0], [expout], [ignore]) AT_CLEANUP +AT_SETUP([auth_xor2g]) +AT_KEYWORDS([auth_xor2g]) +cat $abs_srcdir/auth/xor2g_test.ok > expout +AT_CHECK([$abs_top_builddir/tests/auth/xor2g_test], [0], [expout], [ignore]) +AT_CLEANUP + AT_SETUP([comp128]) AT_KEYWORDS([comp128]) cat $abs_srcdir/comp128/comp128_test.ok > expout -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31452 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7014258751624ff18c51912b6348c3cd876bb23f Gerrit-Change-Number: 31452 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-MessageType: merged

2 years, 4 months

1
0
0 0

[S] Change in libosmocore[master]: Rename OSMO_AUTH_ALG_XOR to OSMO_AUTH_ALG_XOR_3G

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31453 ) Change subject: Rename OSMO_AUTH_ALG_XOR to OSMO_AUTH_ALG_XOR_3G ...................................................................... Rename OSMO_AUTH_ALG_XOR to OSMO_AUTH_ALG_XOR_3G Let's disambiguate. Our existing OSMO_AUTH_ALG_XOR was always only the XOR-3G algorithm. Now that we recently introduced XOR-2G, let's rename (with backwards compatibility #define). Change-Id: I446e54d0ddf4a18c46ee022b1249af73552e3ce1 --- M include/osmocom/crypt/auth.h M src/gsm/auth_core.c M src/gsm/auth_xor.c 3 files changed, 20 insertions(+), 4 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmocom/crypt/auth.h b/include/osmocom/crypt/auth.h index 4af8ca8..d872f64 100644 --- a/include/osmocom/crypt/auth.h +++ b/include/osmocom/crypt/auth.h @@ -30,11 +30,14 @@ OSMO_AUTH_ALG_COMP128v1, OSMO_AUTH_ALG_COMP128v2, OSMO_AUTH_ALG_COMP128v3, - OSMO_AUTH_ALG_XOR, + OSMO_AUTH_ALG_XOR_3G, OSMO_AUTH_ALG_MILENAGE, OSMO_AUTH_ALG_XOR_2G, _OSMO_AUTH_ALG_NUM, }; +/* Backwards-compatibility. We used to call XOR-3G just "XOR" which became ambiguous when + * we started to add XOR-2G support. */ +#define OSMO_AUTH_ALG_XOR OSMO_AUTH_ALG_XOR_3G /*! permanent (secret) subscriber auth data */ struct osmo_sub_auth_data { diff --git a/src/gsm/auth_core.c b/src/gsm/auth_core.c index af03ace..ce6ba7d 100644 --- a/src/gsm/auth_core.c +++ b/src/gsm/auth_core.c @@ -208,7 +208,7 @@ { OSMO_AUTH_ALG_COMP128v1, "COMP128v1" }, { OSMO_AUTH_ALG_COMP128v2, "COMP128v2" }, { OSMO_AUTH_ALG_COMP128v3, "COMP128v3" }, - { OSMO_AUTH_ALG_XOR, "XOR" }, + { OSMO_AUTH_ALG_XOR_3G, "XOR-3G" }, { OSMO_AUTH_ALG_MILENAGE, "MILENAGE" }, { OSMO_AUTH_ALG_XOR_2G, "XOR-2G" }, { 0, NULL } diff --git a/src/gsm/auth_xor.c b/src/gsm/auth_xor.c index 4507542..81076bd 100644 --- a/src/gsm/auth_xor.c +++ b/src/gsm/auth_xor.c @@ -168,8 +168,8 @@ } static struct osmo_auth_impl xor_alg = { - .algo = OSMO_AUTH_ALG_XOR, - .name = "XOR (libosmogsm built-in)", + .algo = OSMO_AUTH_ALG_XOR_3G, + .name = "XOR-3G (libosmogsm built-in)", .priority = 1000, .gen_vec = &xor_gen_vec, .gen_vec_auts = &xor_gen_vec_auts, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31453 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I446e54d0ddf4a18c46ee022b1249af73552e3ce1 Gerrit-Change-Number: 31453 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> 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-MessageType: merged

2 years, 4 months

1
0
0 0

[S] Change in libosmocore[master]: add osmo_prim_operation_name()

by laforge

Attention is currently required from: neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31435 ) Change subject: add osmo_prim_operation_name() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31435 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I9f43428af654a5674ac3035fe4db1394aac7a7af Gerrit-Change-Number: 31435 Gerrit-PatchSet: 2 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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Feb 2023 15:04:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcu_l1_if_phy: add new API call l1if_disconnect_pdch

by pespin

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31438 ) Change subject: pcu_l1_if_phy: add new API call l1if_disconnect_pdch ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > I am using it in the follow up patch that integrates the Ericsson support. […] Yes, I don't see the point in having the separate, makes it revert the whole thing more complex. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31438 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4cc72f032f0abdd5833cdd3b1fe68c69394d89a4 Gerrit-Change-Number: 31438 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 22 Feb 2023 13:39:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2023