Changes of Revision 357

View file
commit_5061a3aec0422b91c025537225e860c87e6999a0.txt Deleted
View file
commit_7728172a835d584c6b4c75c03917b5b7cd96c4db.txt Added
View file
open5gs_2.7.0.14.5061a.dsc -> open5gs_2.7.0.16.77281.dsc Changed
​x
 
1
@@ -2,7 +2,7 @@
2
 Source: open5gs
3
 Binary: open5gs-common, open5gs-mme, open5gs-sgwc, open5gs-smf, open5gs-amf, open5gs-sgwu, open5gs-upf, open5gs-hss, open5gs-pcrf, open5gs-nrf, open5gs-scp, open5gs-sepp, open5gs-ausf, open5gs-udm, open5gs-pcf, open5gs-nssf, open5gs-bsf, open5gs-udr, open5gs, open5gs-dbg
4
 Architecture: any
5
-Version: 2.7.0.14.5061a
6
+Version: 2.7.0.16.77281
7
 Maintainer: Harald Welte <laforge@gnumonks.org>
8
 Uploaders: Sukchan Lee <acetcom@gmail.com>
9
 Homepage: https://open5gs.org
10
@@ -32,8 +32,8 @@
11
  open5gs-udr deb net optional arch=any
12
  open5gs-upf deb net optional arch=any
13
 Checksums-Sha1:
14
- 1a66190dc5ad53b4d71156c054480dcd6100701d 14460220 open5gs_2.7.0.14.5061a.tar.xz
15
+ 7bcada54a4c4faa53a4a552ecf240d6ea4af7de4 14460332 open5gs_2.7.0.16.77281.tar.xz
16
 Checksums-Sha256:
17
- b1c4fd7ae9894357b8304c04b89687ddaf7b88c9fbe7240b76775ed8f78af402 14460220 open5gs_2.7.0.14.5061a.tar.xz
18
+ c2d2377b3625596231518856919250477e08ee0117c45844fad7579163016b39 14460332 open5gs_2.7.0.16.77281.tar.xz
19
 Files:
20
- a4809a9e81f7c133e0f0bd79cc7f51f4 14460220 open5gs_2.7.0.14.5061a.tar.xz
21
+ 8bb5870f0415c3889d675316987d9ff7 14460332 open5gs_2.7.0.16.77281.tar.xz
22
​
View file
open5gs_2.7.0.14.5061a.tar.xz/.tarball-version -> open5gs_2.7.0.16.77281.tar.xz/.tarball-version Changed
4
 
1
@@ -1 +1 @@
2
-2.7.0.14-5061a
3
+2.7.0.16-77281
4
​
View file
open5gs_2.7.0.14.5061a.tar.xz/debian/changelog -> open5gs_2.7.0.16.77281.tar.xz/debian/changelog Changed
12
 
1
@@ -1,8 +1,8 @@
2
-open5gs (2.7.0.14.5061a) unstable; urgency=medium
3
+open5gs (2.7.0.16.77281) unstable; urgency=medium
4
5
   * Automatically generated changelog entry for building the Osmocom master feed
6
7
- -- Osmocom OBS scripts <info@osmocom.org>  Mon, 18 Dec 2023 22:42:02 +0000
8
+ -- Osmocom OBS scripts <info@osmocom.org>  Wed, 20 Dec 2023 12:03:55 +0000
9
10
 open5gs (2.7.0) unstable; urgency=medium
11
12
​
View file
open5gs_2.7.0.14.5061a.tar.xz/lib/crypt/ogs-kdf.c -> open5gs_2.7.0.16.77281.tar.xz/lib/crypt/ogs-kdf.c Changed
130
 
1
@@ -36,12 +36,12 @@
2
 #define FC_FOR_EPS_ALGORITHM_KEY_DERIVATION     0x15
3
4
 typedef struct kdf_param_s {
5
-    uint8_t *buf;
6
+    const uint8_t *buf;
7
     uint16_t len;
8
 } kdf_param_tMAX_NUM_OF_KDF_PARAM;
9
10
 /* KDF function : TS.33220 cluase B.2.0 */
11
-static void ogs_kdf_common(uint8_t *key, uint32_t key_size,
12
+static void ogs_kdf_common(const uint8_t *key, uint32_t key_size,
13
         uint8_t fc, kdf_param_t param, uint8_t *output)
14
 {
15
     int i = 0, pos;
16
@@ -164,7 +164,7 @@
17
 }
18
19
 /* TS33.501 Annex A.6 : Kseaf derivation function */
20
-void ogs_kdf_kseaf(char *serving_network_name, uint8_t *kausf, uint8_t *kseaf)
21
+void ogs_kdf_kseaf(char *serving_network_name, const uint8_t *kausf, uint8_t *kseaf)
22
 {
23
     kdf_param_t param;
24
25
@@ -181,10 +181,11 @@
26
 }
27
28
 /* TS33.501 Annex A.7 : Kamf derivation function */
29
-void ogs_kdf_kamf(char *supi, uint8_t *abba, uint8_t abba_len,
30
-        uint8_t *kseaf, uint8_t *kamf)
31
+void ogs_kdf_kamf(const char *supi, const uint8_t *abba, uint8_t abba_len,
32
+        const uint8_t *kseaf, uint8_t *kamf)
33
 {
34
     kdf_param_t param;
35
+    char *val;
36
37
     ogs_assert(supi);
38
     ogs_assert(abba);
39
@@ -192,22 +193,23 @@
40
     ogs_assert(kseaf);
41
     ogs_assert(kamf);
42
43
+    val = ogs_id_get_value(supi);
44
     memset(param, 0, sizeof(param));
45
-    param0.buf = (uint8_t *)ogs_id_get_value(supi);
46
+    param0.buf = (const uint8_t*) val;
47
     ogs_assert(param0.buf);
48
-    param0.len = strlen((char *)param0.buf);
49
+    param0.len = strlen(val);
50
     param1.buf = abba;
51
     param1.len = abba_len;
52
53
     ogs_kdf_common(kseaf, OGS_SHA256_DIGEST_SIZE,
54
             FC_FOR_KAMF_DERIVATION, param, kamf);
55
56
-    ogs_free(param0.buf);
57
+    ogs_free(val);
58
 }
59
60
 /* TS33.501 Annex A.8 : Algorithm key derivation functions */
61
 void ogs_kdf_nas_5gs(uint8_t algorithm_type_distinguishers,
62
-    uint8_t algorithm_identity, uint8_t *kamf, uint8_t *knas)
63
+    uint8_t algorithm_identity, const uint8_t *kamf, uint8_t *knas)
64
 {
65
     kdf_param_t param;
66
     uint8_t outputOGS_SHA256_DIGEST_SIZE;
67
@@ -227,7 +229,7 @@
68
 }
69
70
 /* TS33.501 Annex A.9 KgNB and Kn3iwf derivation function */
71
-void ogs_kdf_kgnb_and_kn3iwf(uint8_t *kamf, uint32_t ul_count,
72
+void ogs_kdf_kgnb_and_kn3iwf(const uint8_t *kamf, uint32_t ul_count,
73
         uint8_t access_type_distinguisher, uint8_t *kgnb)
74
 {
75
     kdf_param_t param;
76
@@ -247,7 +249,7 @@
77
 }
78
79
 /* TS33.501 Annex A.10 NH derivation function */
80
-void ogs_kdf_nh_gnb(uint8_t *kamf, uint8_t *sync_input, uint8_t *kgnb)
81
+void ogs_kdf_nh_gnb(const uint8_t *kamf, uint8_t *sync_input, uint8_t *kgnb)
82
 {
83
     kdf_param_t param;
84
85
@@ -268,7 +270,7 @@
86
  * ANSI-X9.63-KDF
87
  */
88
 void ogs_kdf_ansi_x963(
89
-        uint8_t *z, size_t z_len, uint8_t *info, size_t info_len,
90
+        const uint8_t *z, size_t z_len, const uint8_t *info, size_t info_len,
91
         uint8_t *ek, uint8_t *icb, uint8_t *mk)
92
 {
93
     uint8_t inputECC_BYTES+4+ECC_BYTES+1;
94
@@ -333,7 +335,7 @@
95
 }
96
97
 /* TS33.401 Annex A.3 KeNB derivation function */
98
-void ogs_kdf_kenb(uint8_t *kasme, uint32_t ul_count, uint8_t *kenb)
99
+void ogs_kdf_kenb(const uint8_t *kasme, uint32_t ul_count, uint8_t *kenb)
100
 {
101
     kdf_param_t param;
102
103
@@ -347,7 +349,7 @@
104
 }
105
106
 /* TS33.401 Annex A.4 NH derivation function */
107
-void ogs_kdf_nh_enb(uint8_t *kasme, uint8_t *sync_input, uint8_t *kenb)
108
+void ogs_kdf_nh_enb(const uint8_t *kasme, const uint8_t *sync_input, uint8_t *kenb)
109
 {
110
     kdf_param_t param;
111
112
@@ -361,7 +363,7 @@
113
114
 /* TS33.401 Annex A.7 Algorithm key derivation functions */
115
 void ogs_kdf_nas_eps(uint8_t algorithm_type_distinguishers,
116
-    uint8_t algorithm_identity, uint8_t *kasme, uint8_t *knas)
117
+    uint8_t algorithm_identity, const uint8_t *kasme, uint8_t *knas)
118
 {
119
     kdf_param_t param;
120
     uint8_t outputOGS_SHA256_DIGEST_SIZE;
121
@@ -381,7 +383,7 @@
122
  * TS33.401 Annex I Hash Functions
123
  * Use the KDF given in TS33.220
124
  */
125
-void ogs_kdf_hash_mme(uint8_t *message, uint8_t message_len, uint8_t *hash_mme)
126
+void ogs_kdf_hash_mme(const uint8_t *message, uint8_t message_len, uint8_t *hash_mme)
127
 {
128
     uint8_t key32;
129
     uint8_t outputOGS_SHA256_DIGEST_SIZE;
130
​
View file
open5gs_2.7.0.14.5061a.tar.xz/lib/crypt/ogs-kdf.h -> open5gs_2.7.0.16.77281.tar.xz/lib/crypt/ogs-kdf.h Changed
70
 
1
@@ -45,11 +45,11 @@
2
 void ogs_kdf_hxres_star(uint8_t *rand, uint8_t *xres_star, uint8_t *hxres_star);
3
4
 /* TS33.501 Annex A.6 : Kseaf derivation function */
5
-void ogs_kdf_kseaf(char *serving_network_name, uint8_t *kausf, uint8_t *kseaf);
6
+void ogs_kdf_kseaf(char *serving_network_name, const uint8_t *kausf, uint8_t *kseaf);
7
8
 /* TS33.501 Annex A.7 : Kamf derivation function */
9
-void ogs_kdf_kamf(char *supi, uint8_t *abba, uint8_t abba_len,
10
-        uint8_t *kseaf, uint8_t *kamf);
11
+void ogs_kdf_kamf(const char *supi, const uint8_t *abba, uint8_t abba_len,
12
+        const uint8_t *kseaf, uint8_t *kamf);
13
14
 /* Algorithm Type Distinguishers */
15
 #define OGS_KDF_NAS_ENC_ALG 0x01
16
@@ -68,14 +68,14 @@
17
18
 /* TS33.501 Annex A.8 : Algorithm key derivation functions */
19
 void ogs_kdf_nas_5gs(uint8_t algorithm_type_distinguishers,
20
-    uint8_t algorithm_identity, uint8_t *kamf, uint8_t *knas);
21
+    uint8_t algorithm_identity, const uint8_t *kamf, uint8_t *knas);
22
23
 /* TS33.501 Annex A.9 KgNB and Kn3iwf derivation function */
24
-void ogs_kdf_kgnb_and_kn3iwf(uint8_t *kamf, uint32_t ul_count,
25
+void ogs_kdf_kgnb_and_kn3iwf(const uint8_t *kamf, uint32_t ul_count,
26
         uint8_t access_type_distinguisher, uint8_t *kgnb);
27
28
 /* TS33.501 Annex A.10 NH derivation function */
29
-void ogs_kdf_nh_gnb(uint8_t *kamf, uint8_t *sync_input, uint8_t *kgnb);
30
+void ogs_kdf_nh_gnb(const uint8_t *kamf, uint8_t *sync_input, uint8_t *kgnb);
31
32
 /*
33
  * TS33.501 Annex C.3.4.1 Profile A
34
@@ -83,29 +83,29 @@
35
  * ANSI-X9.63-KDF
36
  */
37
 void ogs_kdf_ansi_x963(
38
-        uint8_t *z, size_t z_len, uint8_t *info, size_t info_len,
39
+        const uint8_t *z, size_t z_len, const uint8_t *info, size_t info_len,
40
         uint8_t *ek, uint8_t *icb, uint8_t *mk);
41
42
 /* TS33.401 Annex A.2 KASME derivation function */
43
-void ogs_auc_kasme(const uint8_t *ck, const uint8_t *ik,
44
+void ogs_auc_kasme(const uint8_t *ck, const uint8_t *ik,
45
         const uint8_t *plmn_id, const uint8_t *sqn,  const uint8_t *ak,
46
         uint8_t *kasme);
47
48
 /* TS33.401 Annex A.3 KeNB derivation function */
49
-void ogs_kdf_kenb(uint8_t *kasme, uint32_t ul_count, uint8_t *kenb);
50
+void ogs_kdf_kenb(const uint8_t *kasme, uint32_t ul_count, uint8_t *kenb);
51
52
 /* TS33.401 Annex A.4 NH derivation function */
53
-void ogs_kdf_nh_enb(uint8_t *kasme, uint8_t *sync_input, uint8_t *kenb);
54
+void ogs_kdf_nh_enb(const uint8_t *kasme, const uint8_t *sync_input, uint8_t *kenb);
55
56
 /* TS33.401 Annex A.7 Algorithm key derivation functions */
57
 void ogs_kdf_nas_eps(uint8_t algorithm_type_distinguishers,
58
-    uint8_t algorithm_identity, uint8_t *kasme, uint8_t *knas);
59
+    uint8_t algorithm_identity, const uint8_t *kasme, uint8_t *knas);
60
61
 /*
62
  * TS33.401 Annex I Hash Functions
63
  * Use the KDF given in TS33.220
64
  */
65
-void ogs_kdf_hash_mme(uint8_t *message, uint8_t message_len, uint8_t *hash_mme);
66
+void ogs_kdf_hash_mme(const uint8_t *message, uint8_t message_len, uint8_t *hash_mme);
67
68
 /*
69
  * TS33.102
70
​
View file
open5gs_2.7.0.14.5061a.tar.xz/lib/proto/types.c -> open5gs_2.7.0.16.77281.tar.xz/lib/proto/types.c Changed
19
 
1
@@ -305,7 +305,7 @@
2
     return amf_id;
3
 }
4
5
-char *ogs_id_get_type(char *str)
6
+char *ogs_id_get_type(const char *str)
7
 {
8
     char *token, *p, *tmp;
9
     char *type = NULL;
10
@@ -335,7 +335,7 @@
11
     return type;
12
 }
13
14
-char *ogs_id_get_value(char *str)
15
+char *ogs_id_get_value(const char *str)
16
 {
17
     char *token, *p, *tmp;
18
     char *ueid = NULL;
19
​
View file
open5gs_2.7.0.14.5061a.tar.xz/lib/proto/types.h -> open5gs_2.7.0.16.77281.tar.xz/lib/proto/types.h Changed
12
 
1
@@ -273,8 +273,8 @@
2
 #define OGS_ID_SUPI_TYPE_IMSI "imsi"
3
 #define OGS_ID_GPSI_TYPE_MSISDN "msisdn"
4
 #define OGS_ID_SUPI_TYPE_IMEISV "imeisv"
5
-char *ogs_id_get_type(char *str);
6
-char *ogs_id_get_value(char *str);
7
+char *ogs_id_get_type(const char *str);
8
+char *ogs_id_get_value(const char *str);
9
10
 /************************************
11
  * TAI Structure                    */
12
​
Locations
Help
Contact