From 598e1edf89db9e54615e0098e07b6e17e2574d17 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 9 Jul 2021 10:28:40 +0200 Subject: [PATCH] bsc/MSC_ConnectionHandler: fix typo f_chipher_mode_bssmap_to_rsl => f_cipher_mode_bssmap_to_rsl Change-Id: If874a3fa6f42de4f5f484e597de028715cd08043 --- bsc/BSC_Tests.ttcn | 2 +- bsc/MSC_ConnectionHandler.ttcn | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 6b079a686..b85aa6305 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1520,7 +1520,7 @@ function f_gen_handover_req(integer bssap_idx := 0, charstring aoip_tla := "1.2. encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg)); chosenEncryptionAlgorithm := valueof( ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int( - f_chipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1))); + f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1))); if (ispresent(v_enc.enc_kc128)) { kc128 := ts_BSSMAP_IE_Kc128(v_enc.enc_kc128); } diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 3e2e4f725..94ec2b94d 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -673,8 +673,8 @@ function f_rsl_reply(template PDU_ML3_MS_NW l3, RSL_Message orig) runs on MSC_Co f_rsl_send_l3(l3, link_id, chan_nr); } -/* Convert the chipher representation on BSSMAP to the representation used on RSL */ -function f_chipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return RSL_AlgId +/* Convert the cipher representation on BSSMAP to the representation used on RSL */ +function f_cipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return RSL_AlgId { /* A5 0 */ if (alg_bssmap == '01'O) { @@ -731,7 +731,7 @@ function f_verify_encr_info(RSL_Message rsl) runs on MSC_ConnHdlr { /* RSL uses a different representation of the encryption algorithm, * so we need to convert first */ - alg_rsl := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); + alg_rsl := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); if (alg_rsl == RSL_ALG_ID_A5_4 and ispresent(g_pars.encr.enc_kc128)) { expect_kc := g_pars.encr.enc_kc128; @@ -797,7 +797,7 @@ runs on MSC_ConnHdlr { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Cipher Mode Complete"); } else { setverdict(pass); - var RSL_AlgId alg_rsl := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); + var RSL_AlgId alg_rsl := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); if (oct2int(bssap.pdu.bssmap.cipherModeComplete.chosenEncryptionAlgorithm.algorithmIdentifier) != enum2int(alg_rsl)) { setverdict(fail, "Unexpected Encryption Algorithm ID in BSSMAP Cipher Mode Complete"); } @@ -897,7 +897,7 @@ private function f_check_chan_act(AssignmentState st, RSL_Message chan_act) runs if (not f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing Encryption IE in CHAN ACT"); } else { - var RSL_AlgId alg := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); + var RSL_AlgId alg := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg); var octetstring expect_key; if (alg == RSL_ALG_ID_A5_4) { expect_key := g_pars.encr.enc_kc128;