<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24896">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc/MSC_ConnectionHandler: fix typo<br><br>f_chipher_mode_bssmap_to_rsl => f_cipher_mode_bssmap_to_rsl<br><br>Change-Id: If874a3fa6f42de4f5f484e597de028715cd08043<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>2 files changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/24896/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index 6b079a6..b85aa63 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -1520,7 +1520,7 @@</span><br><span>          encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg));</span><br><span>               chosenEncryptionAlgorithm := valueof(</span><br><span>                        ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int(</span><br><span style="color: hsl(0, 100%, 40%);">-                                f_chipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1)));</span><br><span style="color: hsl(120, 100%, 40%);">+                           f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1)));</span><br><span>           if (ispresent(v_enc.enc_kc128)) {</span><br><span>                    kc128 := ts_BSSMAP_IE_Kc128(v_enc.enc_kc128);</span><br><span>                }</span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index 3e2e4f7..94ec2b9 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -673,8 +673,8 @@</span><br><span>         f_rsl_send_l3(l3, link_id, chan_nr);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Convert the chipher representation on BSSMAP to the representation used on RSL */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_chipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return RSL_AlgId</span><br><span style="color: hsl(120, 100%, 40%);">+/* Convert the cipher representation on BSSMAP to the representation used on RSL */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_cipher_mode_bssmap_to_rsl(OCT1 alg_bssmap) return RSL_AlgId</span><br><span> {</span><br><span>   /* A5 0 */</span><br><span>   if (alg_bssmap == '01'O) {</span><br><span>@@ -731,7 +731,7 @@</span><br><span> </span><br><span>         /* RSL uses a different representation of the encryption algorithm,</span><br><span>   * so we need to convert first */</span><br><span style="color: hsl(0, 100%, 40%);">-       alg_rsl := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg);</span><br><span style="color: hsl(120, 100%, 40%);">+ alg_rsl := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg);</span><br><span> </span><br><span>     if (alg_rsl == RSL_ALG_ID_A5_4 and ispresent(g_pars.encr.enc_kc128)) {</span><br><span>               expect_kc := g_pars.encr.enc_kc128;</span><br><span>@@ -797,7 +797,7 @@</span><br><span>                    Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Cipher Mode Complete");</span><br><span>             } else {</span><br><span>                     setverdict(pass);</span><br><span style="color: hsl(0, 100%, 40%);">-                       var RSL_AlgId alg_rsl := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg);</span><br><span style="color: hsl(120, 100%, 40%);">+                   var RSL_AlgId alg_rsl := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg);</span><br><span>                   if (oct2int(bssap.pdu.bssmap.cipherModeComplete.chosenEncryptionAlgorithm.algorithmIdentifier) != enum2int(alg_rsl)) {</span><br><span>                               setverdict(fail, "Unexpected Encryption Algorithm ID in BSSMAP Cipher Mode Complete");</span><br><span>                     }</span><br><span>@@ -897,7 +897,7 @@</span><br><span>              if (not f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) {</span><br><span>                      Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing Encryption IE in CHAN ACT");</span><br><span>           } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                        var RSL_AlgId alg := f_chipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg);</span><br><span style="color: hsl(120, 100%, 40%);">+                       var RSL_AlgId alg := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg);</span><br><span>                       var octetstring expect_key;</span><br><span>                  if (alg == RSL_ALG_ID_A5_4) {</span><br><span>                                expect_key := g_pars.encr.enc_kc128;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24896">change 24896</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24896"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If874a3fa6f42de4f5f484e597de028715cd08043 </div>
<div style="display:none"> Gerrit-Change-Number: 24896 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>