From bbe3ee41da047e2e3b0d1c745871b5384ffd5be6 Mon Sep 17 00:00:00 2001 From: Andre Puschmann Date: Tue, 11 Jan 2022 11:48:32 +0100 Subject: [PATCH] rrc,nr_security: fixing a few typos for NR --- srsgnb/hdr/stack/rrc/rrc_nr_security_context.h | 4 ++-- srsgnb/src/stack/rrc/rrc_nr_security_context.cc | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/srsgnb/hdr/stack/rrc/rrc_nr_security_context.h b/srsgnb/hdr/stack/rrc/rrc_nr_security_context.h index 3d241283b..289632f07 100644 --- a/srsgnb/hdr/stack/rrc/rrc_nr_security_context.h +++ b/srsgnb/hdr/stack/rrc/rrc_nr_security_context.h @@ -24,10 +24,10 @@ class nr_security_context { public: explicit nr_security_context(const srsenb::rrc_nr_cfg_t& cfg_) : - cfg(cfg_), logger(srslog::fetch_basic_logger("RRC_NR")) + cfg(cfg_), logger(srslog::fetch_basic_logger("RRC-NR")) {} - nr_security_context(const nr_security_context& other) : cfg(other.cfg), logger(srslog::fetch_basic_logger("RRC_NR")) + nr_security_context(const nr_security_context& other) : cfg(other.cfg), logger(srslog::fetch_basic_logger("RRC-NR")) { k_gnb_present = other.k_gnb_present; security_capabilities = other.security_capabilities; diff --git a/srsgnb/src/stack/rrc/rrc_nr_security_context.cc b/srsgnb/src/stack/rrc/rrc_nr_security_context.cc index e4b1c0144..eba5a4ff8 100644 --- a/srsgnb/src/stack/rrc/rrc_nr_security_context.cc +++ b/srsgnb/src/stack/rrc/rrc_nr_security_context.cc @@ -159,7 +159,6 @@ void nr_security_context::set_security_key(const asn1::fixed_bitstring<256, fals for (uint32_t i = 0; i < key.nof_octets(); ++i) { k_gnb[i] = key.data()[key.nof_octets() - 1 - i]; } - logger.info(k_gnb, 32, "Key gNodeB (k_gnb)"); generate_as_keys(); } @@ -187,13 +186,13 @@ void nr_security_context::generate_as_keys() logger.info(sec_cfg.k_nr_up_int.data(), 32, "NR UP Encryption Key (k_nr_up_enc)"); } -void nr_security_context::regenerate_keys_handover(uint32_t new_pci, uint32_t new_dl_earfcn) +void nr_security_context::regenerate_keys_handover(uint32_t new_pci, uint32_t new_dl_arfcn) { - logger.info("Regenerating KgNB with PCI=0x%02x, DL-EARFCN=%d", new_pci, new_dl_earfcn); - logger.info(k_gnb, 32, "Old K_gNB (k_enb)"); + logger.info("Regenerating KgNB with PCI=0x%02x, DL-ARFCN=%d", new_pci, new_dl_arfcn); + logger.info(k_gnb, 32, "Old K_gNB (k_gnb)"); // Generate K_enb* uint8_t k_gnb_star[32]; - srsran::security_generate_k_enb_star(k_gnb, new_pci, new_dl_earfcn, k_gnb_star); + srsran::security_generate_k_enb_star(k_gnb, new_pci, new_dl_arfcn, k_gnb_star); // K_enb becomes K_enb* memcpy(k_gnb, k_gnb_star, 32);