Osmocom Open Build Service

open5gs_2.7.0.14.5061a.202312192026.dsc -> open5gs_2.7.0.16.77281.202312202026.dsc Changed

@@ -2,7 +2,7 @@
 Source: open5gs
 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
 Architecture: any
-Version: 2.7.0.14.5061a.202312192026
+Version: 2.7.0.16.77281.202312202026
 Maintainer: Harald Welte <laforge@gnumonks.org>
 Uploaders: Sukchan Lee <acetcom@gmail.com>
 Homepage: https://open5gs.org
@@ -32,8 +32,8 @@
  open5gs-udr deb net optional arch=any
  open5gs-upf deb net optional arch=any
 Checksums-Sha1:
- ae9eb8c559f1a23e13a418a76b34b761de30d602 14460436 open5gs_2.7.0.14.5061a.202312192026.tar.xz
+ 99c344244c959c487aae0c759e260cef2840c43b 14460392 open5gs_2.7.0.16.77281.202312202026.tar.xz
 Checksums-Sha256:
- a36f66f88ba339eec83b2b4ebecf4f0bde5de237994d66cf8f5c70cfb652a2c2 14460436 open5gs_2.7.0.14.5061a.202312192026.tar.xz
+ 5fa02f42e8a97e2e59d549ec855db6b7af812edc65f3d1c345ae56952863bc42 14460392 open5gs_2.7.0.16.77281.202312202026.tar.xz
 Files:
- 6f0ea595be20d22af2db5c01db07bff3 14460436 open5gs_2.7.0.14.5061a.202312192026.tar.xz
+ 94312605329ab14326e404a727b58c76 14460392 open5gs_2.7.0.16.77281.202312202026.tar.xz

open5gs_2.7.0.14.5061a.202312192026.tar.xz/.tarball-version -> open5gs_2.7.0.16.77281.202312202026.tar.xz/.tarball-version Changed

open5gs_2.7.0.14.5061a.202312192026.tar.xz/debian/changelog -> open5gs_2.7.0.16.77281.202312202026.tar.xz/debian/changelog Changed

open5gs_2.7.0.14.5061a.202312192026.tar.xz/lib/crypt/ogs-kdf.c -> open5gs_2.7.0.16.77281.202312202026.tar.xz/lib/crypt/ogs-kdf.c Changed

@@ -36,12 +36,12 @@
 #define FC_FOR_EPS_ALGORITHM_KEY_DERIVATION     0x15
 
 typedef struct kdf_param_s {
-    uint8_t *buf;
+    const uint8_t *buf;
     uint16_t len;
 } kdf_param_tMAX_NUM_OF_KDF_PARAM;
 
 /* KDF function : TS.33220 cluase B.2.0 */
-static void ogs_kdf_common(uint8_t *key, uint32_t key_size,
+static void ogs_kdf_common(const uint8_t *key, uint32_t key_size,
         uint8_t fc, kdf_param_t param, uint8_t *output)
 {
     int i = 0, pos;
@@ -164,7 +164,7 @@
 }
 
 /* TS33.501 Annex A.6 : Kseaf derivation function */
-void ogs_kdf_kseaf(char *serving_network_name, uint8_t *kausf, uint8_t *kseaf)
+void ogs_kdf_kseaf(char *serving_network_name, const uint8_t *kausf, uint8_t *kseaf)
 {
     kdf_param_t param;
 
@@ -181,10 +181,11 @@
 }
 
 /* TS33.501 Annex A.7 : Kamf derivation function */
-void ogs_kdf_kamf(char *supi, uint8_t *abba, uint8_t abba_len,
-        uint8_t *kseaf, uint8_t *kamf)
+void ogs_kdf_kamf(const char *supi, const uint8_t *abba, uint8_t abba_len,
+        const uint8_t *kseaf, uint8_t *kamf)
 {
     kdf_param_t param;
+    char *val;
 
     ogs_assert(supi);
     ogs_assert(abba);
@@ -192,22 +193,23 @@
     ogs_assert(kseaf);
     ogs_assert(kamf);
 
+    val = ogs_id_get_value(supi);
     memset(param, 0, sizeof(param));
-    param0.buf = (uint8_t *)ogs_id_get_value(supi);
+    param0.buf = (const uint8_t*) val;
     ogs_assert(param0.buf);
-    param0.len = strlen((char *)param0.buf);
+    param0.len = strlen(val);
     param1.buf = abba;
     param1.len = abba_len;
 
     ogs_kdf_common(kseaf, OGS_SHA256_DIGEST_SIZE,
             FC_FOR_KAMF_DERIVATION, param, kamf);
 
-    ogs_free(param0.buf);
+    ogs_free(val);
 }
 
 /* TS33.501 Annex A.8 : Algorithm key derivation functions */
 void ogs_kdf_nas_5gs(uint8_t algorithm_type_distinguishers,
-    uint8_t algorithm_identity, uint8_t *kamf, uint8_t *knas)
+    uint8_t algorithm_identity, const uint8_t *kamf, uint8_t *knas)
 {
     kdf_param_t param;
     uint8_t outputOGS_SHA256_DIGEST_SIZE;
@@ -227,7 +229,7 @@
 }
 
 /* TS33.501 Annex A.9 KgNB and Kn3iwf derivation function */
-void ogs_kdf_kgnb_and_kn3iwf(uint8_t *kamf, uint32_t ul_count,
+void ogs_kdf_kgnb_and_kn3iwf(const uint8_t *kamf, uint32_t ul_count,
         uint8_t access_type_distinguisher, uint8_t *kgnb)
 {
     kdf_param_t param;
@@ -247,7 +249,7 @@
 }
 
 /* TS33.501 Annex A.10 NH derivation function */
-void ogs_kdf_nh_gnb(uint8_t *kamf, uint8_t *sync_input, uint8_t *kgnb)
+void ogs_kdf_nh_gnb(const uint8_t *kamf, uint8_t *sync_input, uint8_t *kgnb)
 {
     kdf_param_t param;
 
@@ -268,7 +270,7 @@
  * ANSI-X9.63-KDF
  */
 void ogs_kdf_ansi_x963(
-        uint8_t *z, size_t z_len, uint8_t *info, size_t info_len,
+        const uint8_t *z, size_t z_len, const uint8_t *info, size_t info_len,
         uint8_t *ek, uint8_t *icb, uint8_t *mk)
 {
     uint8_t inputECC_BYTES+4+ECC_BYTES+1;
@@ -333,7 +335,7 @@
 }
 
 /* TS33.401 Annex A.3 KeNB derivation function */
-void ogs_kdf_kenb(uint8_t *kasme, uint32_t ul_count, uint8_t *kenb)
+void ogs_kdf_kenb(const uint8_t *kasme, uint32_t ul_count, uint8_t *kenb)
 {
     kdf_param_t param;
 
@@ -347,7 +349,7 @@
 }
 
 /* TS33.401 Annex A.4 NH derivation function */
-void ogs_kdf_nh_enb(uint8_t *kasme, uint8_t *sync_input, uint8_t *kenb)
+void ogs_kdf_nh_enb(const uint8_t *kasme, const uint8_t *sync_input, uint8_t *kenb)
 {
     kdf_param_t param;
 
@@ -361,7 +363,7 @@
 
 /* TS33.401 Annex A.7 Algorithm key derivation functions */
 void ogs_kdf_nas_eps(uint8_t algorithm_type_distinguishers,
-    uint8_t algorithm_identity, uint8_t *kasme, uint8_t *knas)
+    uint8_t algorithm_identity, const uint8_t *kasme, uint8_t *knas)
 {
     kdf_param_t param;
     uint8_t outputOGS_SHA256_DIGEST_SIZE;
@@ -381,7 +383,7 @@
  * TS33.401 Annex I Hash Functions
  * Use the KDF given in TS33.220
  */
-void ogs_kdf_hash_mme(uint8_t *message, uint8_t message_len, uint8_t *hash_mme)
+void ogs_kdf_hash_mme(const uint8_t *message, uint8_t message_len, uint8_t *hash_mme)
 {
     uint8_t key32;
     uint8_t outputOGS_SHA256_DIGEST_SIZE;

open5gs_2.7.0.14.5061a.202312192026.tar.xz/lib/crypt/ogs-kdf.h -> open5gs_2.7.0.16.77281.202312202026.tar.xz/lib/crypt/ogs-kdf.h Changed

@@ -45,11 +45,11 @@
 void ogs_kdf_hxres_star(uint8_t *rand, uint8_t *xres_star, uint8_t *hxres_star);
 
 /* TS33.501 Annex A.6 : Kseaf derivation function */
-void ogs_kdf_kseaf(char *serving_network_name, uint8_t *kausf, uint8_t *kseaf);
+void ogs_kdf_kseaf(char *serving_network_name, const uint8_t *kausf, uint8_t *kseaf);
 
 /* TS33.501 Annex A.7 : Kamf derivation function */
-void ogs_kdf_kamf(char *supi, uint8_t *abba, uint8_t abba_len,
-        uint8_t *kseaf, uint8_t *kamf);
+void ogs_kdf_kamf(const char *supi, const uint8_t *abba, uint8_t abba_len,
+        const uint8_t *kseaf, uint8_t *kamf);
 
 /* Algorithm Type Distinguishers */
 #define OGS_KDF_NAS_ENC_ALG 0x01
@@ -68,14 +68,14 @@
 
 /* TS33.501 Annex A.8 : Algorithm key derivation functions */
 void ogs_kdf_nas_5gs(uint8_t algorithm_type_distinguishers,
-    uint8_t algorithm_identity, uint8_t *kamf, uint8_t *knas);
+    uint8_t algorithm_identity, const uint8_t *kamf, uint8_t *knas);
 
 /* TS33.501 Annex A.9 KgNB and Kn3iwf derivation function */
-void ogs_kdf_kgnb_and_kn3iwf(uint8_t *kamf, uint32_t ul_count,
+void ogs_kdf_kgnb_and_kn3iwf(const uint8_t *kamf, uint32_t ul_count,
         uint8_t access_type_distinguisher, uint8_t *kgnb);
 
 /* TS33.501 Annex A.10 NH derivation function */
-void ogs_kdf_nh_gnb(uint8_t *kamf, uint8_t *sync_input, uint8_t *kgnb);
+void ogs_kdf_nh_gnb(const uint8_t *kamf, uint8_t *sync_input, uint8_t *kgnb);
 
 /*
  * TS33.501 Annex C.3.4.1 Profile A
@@ -83,29 +83,29 @@
  * ANSI-X9.63-KDF
  */
 void ogs_kdf_ansi_x963(
-        uint8_t *z, size_t z_len, uint8_t *info, size_t info_len,
+        const uint8_t *z, size_t z_len, const uint8_t *info, size_t info_len,
         uint8_t *ek, uint8_t *icb, uint8_t *mk);
 
 /* TS33.401 Annex A.2 KASME derivation function */
-void ogs_auc_kasme(const uint8_t *ck, const uint8_t *ik, 
+void ogs_auc_kasme(const uint8_t *ck, const uint8_t *ik,
         const uint8_t *plmn_id, const uint8_t *sqn,  const uint8_t *ak,
         uint8_t *kasme);
 
 /* TS33.401 Annex A.3 KeNB derivation function */
-void ogs_kdf_kenb(uint8_t *kasme, uint32_t ul_count, uint8_t *kenb);
+void ogs_kdf_kenb(const uint8_t *kasme, uint32_t ul_count, uint8_t *kenb);
 
 /* TS33.401 Annex A.4 NH derivation function */
-void ogs_kdf_nh_enb(uint8_t *kasme, uint8_t *sync_input, uint8_t *kenb);
+void ogs_kdf_nh_enb(const uint8_t *kasme, const uint8_t *sync_input, uint8_t *kenb);
 
 /* TS33.401 Annex A.7 Algorithm key derivation functions */
 void ogs_kdf_nas_eps(uint8_t algorithm_type_distinguishers,
-    uint8_t algorithm_identity, uint8_t *kasme, uint8_t *knas);
+    uint8_t algorithm_identity, const uint8_t *kasme, uint8_t *knas);
 
 /*
  * TS33.401 Annex I Hash Functions
  * Use the KDF given in TS33.220
  */
-void ogs_kdf_hash_mme(uint8_t *message, uint8_t message_len, uint8_t *hash_mme);
+void ogs_kdf_hash_mme(const uint8_t *message, uint8_t message_len, uint8_t *hash_mme);
 
 /*
  * TS33.102

open5gs_2.7.0.14.5061a.202312192026.tar.xz/lib/proto/types.c -> open5gs_2.7.0.16.77281.202312202026.tar.xz/lib/proto/types.c Changed

open5gs_2.7.0.14.5061a.202312192026.tar.xz/lib/proto/types.h -> open5gs_2.7.0.16.77281.202312202026.tar.xz/lib/proto/types.h Changed

Changes of Revision 547