Osmocom Open Build Service

osmo-hlr.spec Changed

commit_5edf387353b1b684a695aa09c5d91815ecf24981.txt Deleted

commit_829713a69d26df1d1c7bb83dcdf370353175b296.txt Added

osmo-hlr_1.6.0.8.5edf.dsc -> osmo-hlr_1.6.0.9.8297.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-hlr
 Binary: osmo-hlr, osmo-hlr-dbg, libosmo-gsup-client0, libosmo-gsup-client-dev, libosmo-mslookup1, libosmo-mslookup-dev, osmo-mslookup-utils, osmo-hlr-doc
 Architecture: any all
-Version: 1.6.0.8.5edf
+Version: 1.6.0.9.8297
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-hlr
 Standards-Version: 3.9.6
@@ -19,8 +19,8 @@
  osmo-hlr-doc deb doc optional arch=all
  osmo-mslookup-utils deb utils optional arch=any
 Checksums-Sha1:
- 5679029a2bc47af16f27fd9c5354f674ce9165e2 171984 osmo-hlr_1.6.0.8.5edf.tar.xz
+ 317c931fc56a6aa71099cf051a44da0e78deb21d 172112 osmo-hlr_1.6.0.9.8297.tar.xz
 Checksums-Sha256:
- e5007f70daca0a5c3a8ef0b96fe43f1a662374e85573c9c0f95bd9846c68a8f5 171984 osmo-hlr_1.6.0.8.5edf.tar.xz
+ d60cf634efa086b388b9a916dbcf3cadabc421d28f489452ec423fc11c94d2a8 172112 osmo-hlr_1.6.0.9.8297.tar.xz
 Files:
- ff47859340922537189a14354eba1aad 171984 osmo-hlr_1.6.0.8.5edf.tar.xz
+ 2069258bba67090777e15b7c0b4c451d 172112 osmo-hlr_1.6.0.9.8297.tar.xz

osmo-hlr_1.6.0.8.5edf.tar.xz/.tarball-version -> osmo-hlr_1.6.0.9.8297.tar.xz/.tarball-version Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/TODO-RELEASE -> osmo-hlr_1.6.0.9.8297.tar.xz/TODO-RELEASE Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/debian/changelog -> osmo-hlr_1.6.0.9.8297.tar.xz/debian/changelog Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/include/osmocom/hlr/hlr_vty.h -> osmo-hlr_1.6.0.9.8297.tar.xz/include/osmocom/hlr/hlr_vty.h Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/src/db_hlr.c -> osmo-hlr_1.6.0.9.8297.tar.xz/src/db_hlr.c Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/src/hlr_vty_subscr.c -> osmo-hlr_1.6.0.9.8297.tar.xz/src/hlr_vty_subscr.c Changed

@@ -460,12 +460,12 @@
 	return false;
 }
 
-#define AUTH_ALG_TYPES_2G "(comp128v1|comp128v2|comp128v3|xor)"
+#define AUTH_ALG_TYPES_2G "(comp128v1|comp128v2|comp128v3|xor-2g)"
 #define AUTH_ALG_TYPES_2G_HELP \
 	"Use COMP128v1 algorithm\n" \
 	"Use COMP128v2 algorithm\n" \
 	"Use COMP128v3 algorithm\n" \
-	"Use XOR algorithm\n"
+	"Use XOR-2G algorithm\n"
 
 #define AUTH_ALG_TYPES_3G "milenage"
 #define AUTH_ALG_TYPES_3G_HELP \
@@ -486,10 +486,13 @@
 	} else if (!strcasecmp(alg_str, "comp128v3")) {
 		*algo = OSMO_AUTH_ALG_COMP128v3;
 		*minlen = *maxlen = A38_COMP128_KEY_LEN;
-	} else if (!strcasecmp(alg_str, "xor")) {
-		*algo = OSMO_AUTH_ALG_XOR;
+	} else if (!strcasecmp(alg_str, "xor-3g")) {
+		*algo = OSMO_AUTH_ALG_XOR_3G;
 		*minlen = A38_XOR_MIN_KEY_LEN;
 		*maxlen = A38_XOR_MAX_KEY_LEN;
+	} else if (!strcasecmp(alg_str, "xor-2g")) {
+		*algo = OSMO_AUTH_ALG_XOR_2G;
+		*minlen = *maxlen = A38_XOR2G_KEY_LEN;
 	} else if (!strcasecmp(alg_str, "milenage")) {
 		*algo = OSMO_AUTH_ALG_MILENAGE;
 		*minlen = *maxlen = MILENAGE_KEY_LEN;
@@ -659,11 +662,11 @@
 
 DEFUN(subscriber_aud3g_xor,
       subscriber_aud3g_xor_cmd,
-      SUBSCR_UPDATE "aud3g xor k K"
+      SUBSCR_UPDATE "aud3g xor-3g k K"
       " ind-bitlen <0-28>",
       SUBSCR_UPDATE_HELP
       "Set UMTS authentication data (3G, and 2G with UMTS AKA)\n"
-      "Use XOR algorithm\n"
+      "Use XOR-3G algorithm\n"
       "Set Encryption Key K\n" "K as 32 hexadecimal characters\n"
       "Set IND bit length\n" "IND bit length value (default: 5)\n")
 {
@@ -685,8 +688,8 @@
 		},
 	};
 
-	if (!auth_algo_parse("xor", &aud3g.algo, &minlen, &maxlen)) {
-		vty_out(vty, "%% Unknown auth algorithm: '%s'%s", "xor", VTY_NEWLINE);
+	if (!auth_algo_parse("xor-3g", &aud3g.algo, &minlen, &maxlen)) {
+		vty_out(vty, "%% Unknown auth algorithm: '%s'%s", "xor-3g", VTY_NEWLINE);
 		return CMD_WARNING;
 	}

osmo-hlr_1.6.0.8.5edf.tar.xz/tests/auc/auc_test.c -> osmo-hlr_1.6.0.9.8297.tar.xz/tests/auc/auc_test.c Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/tests/db/db_test.c -> osmo-hlr_1.6.0.9.8297.tar.xz/tests/db/db_test.c Changed

@@ -586,7 +586,7 @@
 	ASSERT_SEL_AUD(imsi0, 0, id);
 
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
-		mk_aud_2g(OSMO_AUTH_ALG_XOR, "CededEffacedAceFacedBadFadedBeef")),
+		mk_aud_2g(OSMO_AUTH_ALG_XOR_2G, "CededEffacedAceFacedBadFadedBeef")),
 		0);
 	ASSERT_SEL_AUD(imsi0, 0, id);
 
@@ -604,7 +604,7 @@
 		-ENOENT);
 
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
-		mk_aud_2g(OSMO_AUTH_ALG_XOR, "CededEffacedAceFacedBadFadedBeef")),
+		mk_aud_2g(OSMO_AUTH_ALG_XOR_2G, "CededEffacedAceFacedBadFadedBeef")),
 		0);
 	ASSERT_SEL_AUD(imsi0, 0, id);
 
@@ -707,12 +707,12 @@
 	ASSERT_SEL_AUD(imsi0, 0, id);
 
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
-		mk_aud_2g(OSMO_AUTH_ALG_XOR, "f000000000000f00000000000f000000f00000000")),
+		mk_aud_2g(OSMO_AUTH_ALG_XOR_2G, "f000000000000f00000000000f000000f00000000")),
 		-EINVAL);
 	ASSERT_SEL_AUD(imsi0, 0, id);
 
 	ASSERT_RC(db_subscr_update_aud_by_id(dbc, id,
-		mk_aud_2g(OSMO_AUTH_ALG_XOR, "f00")),
+		mk_aud_2g(OSMO_AUTH_ALG_XOR_2G, "f00")),
 		-EINVAL);
 	ASSERT_SEL_AUD(imsi0, 0, id);

osmo-hlr_1.6.0.8.5edf.tar.xz/tests/db/db_test.err -> osmo-hlr_1.6.0.9.8297.tar.xz/tests/db/db_test.err Changed

@@ -872,14 +872,14 @@
 }
 3G: none
 
-db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_XOR, "CededEffacedAceFacedBadFadedBeef")) --> 0
+db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_XOR_2G, "CededEffacedAceFacedBadFadedBeef")) --> 0
 
 db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> 0
 DAUC IMSI='123456789000000': No 3G Auth Data
 
 2G: struct osmo_sub_auth_data {
   .type = GSM,
-  .algo = XOR-3G,
+  .algo = XOR-2G,
   .u.gsm.ki = 'cededeffacedacefacedbadfadedbeef',
 }
 3G: none
@@ -900,14 +900,14 @@
 
 db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_NONE, NULL)) --> -ENOENT
 
-db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_XOR, "CededEffacedAceFacedBadFadedBeef")) --> 0
+db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_XOR_2G, "CededEffacedAceFacedBadFadedBeef")) --> 0
 
 db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> 0
 DAUC IMSI='123456789000000': No 3G Auth Data
 
 2G: struct osmo_sub_auth_data {
   .type = GSM,
-  .algo = XOR-3G,
+  .algo = XOR-2G,
   .u.gsm.ki = 'cededeffacedacefacedbadfadedbeef',
 }
 3G: none
@@ -1112,7 +1112,7 @@
   .u.umts.ind_bitlen = 5,
 }
 
-db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_XOR, "f000000000000f00000000000f000000f00000000")) --> -EINVAL
+db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_XOR_2G, "f000000000000f00000000000f000000f00000000")) --> -EINVAL
 DAUC Cannot update auth tokens: Invalid KI: 'f000000000000f00000000000f000000f00000000'
 
 db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> 0
@@ -1132,7 +1132,7 @@
   .u.umts.ind_bitlen = 5,
 }
 
-db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_XOR, "f00")) --> -EINVAL
+db_subscr_update_aud_by_id(dbc, id, mk_aud_2g(OSMO_AUTH_ALG_XOR_2G, "f00")) --> -EINVAL
 DAUC Cannot update auth tokens: Invalid KI: 'f00'
 
 db_get_auth_data(dbc, imsi0, &g_aud2g, &g_aud3g, &g_id) --> 0

osmo-hlr_1.6.0.8.5edf.tar.xz/tests/db_upgrade/create_subscribers.vty -> osmo-hlr_1.6.0.9.8297.tar.xz/tests/db_upgrade/create_subscribers.vty Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/tests/db_upgrade/db_upgrade_test.ok -> osmo-hlr_1.6.0.9.8297.tar.xz/tests/db_upgrade/db_upgrade_test.ok Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/tests/db_upgrade/hlr_db_v0.sql -> osmo-hlr_1.6.0.9.8297.tar.xz/tests/db_upgrade/hlr_db_v0.sql Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/tests/test_subscriber.ctrl -> osmo-hlr_1.6.0.9.8297.tar.xz/tests/test_subscriber.ctrl Changed

osmo-hlr_1.6.0.8.5edf.tar.xz/tests/test_subscriber.vty -> osmo-hlr_1.6.0.9.8297.tar.xz/tests/test_subscriber.vty Changed

@@ -8,10 +8,10 @@
   subscriber (imsi|msisdn|id|imei) IDENT delete
   subscriber (imsi|msisdn|id|imei) IDENT update msisdn (none|MSISDN)
   subscriber (imsi|msisdn|id|imei) IDENT update aud2g none
-  subscriber (imsi|msisdn|id|imei) IDENT update aud2g (comp128v1|comp128v2|comp128v3|xor) ki KI
+  subscriber (imsi|msisdn|id|imei) IDENT update aud2g (comp128v1|comp128v2|comp128v3|xor-2g) ki KI
   subscriber (imsi|msisdn|id|imei) IDENT update aud3g none
   subscriber (imsi|msisdn|id|imei) IDENT update aud3g milenage k K (op|opc) OP_C ind-bitlen <0-28>
-  subscriber (imsi|msisdn|id|imei) IDENT update aud3g xor k K ind-bitlen <0-28>
+  subscriber (imsi|msisdn|id|imei) IDENT update aud3g xor-3g k K ind-bitlen <0-28>
   subscriber (imsi|msisdn|id|imei) IDENT update imei (none|IMEI)
   subscriber (imsi|msisdn|id|imei) IDENT update network-access-mode (none|cs|ps|cs+ps)
   show mslookup services
@@ -144,7 +144,7 @@
   comp128v1  Use COMP128v1 algorithm
   comp128v2  Use COMP128v2 algorithm
   comp128v3  Use COMP128v3 algorithm
-  xor        Use XOR algorithm
+  xor-2g     Use XOR-2G algorithm
 
 OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ?
   ki  Set Ki Encryption Key
@@ -155,12 +155,12 @@
 OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki val ?
   <cr>  
 
-OsmoHLR# subscriber imsi 123456789023000 update aud2g xor ki Deaf0ff1ceD0d0DabbedD1ced1ceF00d
+OsmoHLR# subscriber imsi 123456789023000 update aud2g xor-2g ki Deaf0ff1ceD0d0DabbedD1ced1ceF00d
 OsmoHLR# subscriber imsi 123456789023000 show
     ID: 101
     IMSI: 123456789023000
     MSISDN: 423
-    2G auth: XOR-3G
+    2G auth: XOR-2G
              KI=deaf0ff1ced0d0dabbedd1ced1cef00d
 
 OsmoHLR# subscriber imsi 123456789023000 update aud2g comp128v1 ki BeefedCafeFaceAcedAddedDecadeFee
@@ -241,7 +241,7 @@
     2G auth: COMP128v3
              KI=c01ffedc1cadaeac1d1f1edacac1ab0a
 
-OsmoHLR# subscriber id 101 update aud2g xor ki CoiffedCicadaeAcidifiedAcaciaBoa
+OsmoHLR# subscriber id 101 update aud2g xor-2g ki CoiffedCicadaeAcidifiedAcaciaBoa
 % Invalid value for KI: 'CoiffedCicadaeAcidifiedAcaciaBoa'
 OsmoHLR# subscriber id 101 show
     ID: 101
@@ -250,7 +250,7 @@
     2G auth: COMP128v3
              KI=c01ffedc1cadaeac1d1f1edacac1ab0a
 
-OsmoHLR# subscriber id 101 update aud2g xor ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX
+OsmoHLR# subscriber id 101 update aud2g xor-2g ki C01ffedC1cadaeAc1d1f1edAcac1aB0aX
 % Invalid value for KI: 'C01ffedC1cadaeAc1d1f1edAcac1aB0aX'
 OsmoHLR# subscriber id 101 show
     ID: 101
@@ -269,7 +269,7 @@
 OsmoHLR# subscriber imsi 123456789023000 update aud3g ?
   none      Delete 3G authentication data
   milenage  Use Milenage algorithm
-  xor       Use XOR algorithm
+  xor-3g    Use XOR-3G algorithm
 
 OsmoHLR# subscriber imsi 123456789023000 update aud3g milenage ?
   k  Set Encryption Key K

osmo-hlr_1.6.0.8.5edf.tar.xz/tests/test_subscriber_errors.ctrl -> osmo-hlr_1.6.0.9.8297.tar.xz/tests/test_subscriber_errors.ctrl Changed

Changes of Revision 20