<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24668">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc: reduce args to f_cipher_mode()<br><br>Instead of passing each part individually, simply pass the entire<br>TestHdlrEncrParams to f_cipher_mode().<br><br>Preparation for A5/4.<br><br>Related: SYS#5324<br>Change-Id: I2cb8282e55436da5ae64ab569df87d5d5a0dd2f0<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>2 files changed, 8 insertions(+), 8 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/68/24668/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 845869a..e3720e5 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -3452,7 +3452,7 @@</span><br><span>    }</span><br><span> </span><br><span>        /* Start ciphering, expect Cipher Mode Reject */</span><br><span style="color: hsl(0, 100%, 40%);">-        f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key, exp_fail := true);</span><br><span style="color: hsl(120, 100%, 40%);">+    f_cipher_mode(g_pars.encr, exp_fail := true);</span><br><span> }</span><br><span> testcase TC_assignment_fr_a5_not_sup() runs on test_CT {</span><br><span>       var TestHdlrParams pars := f_gen_test_hdlr_pars();</span><br><span>@@ -6726,7 +6726,7 @@</span><br><span>           /* start ciphering, if requested */</span><br><span>          if (ispresent(g_pars.encr)) {</span><br><span>                        f_logp(BSCVTY, "start ciphering");</span><br><span style="color: hsl(0, 100%, 40%);">-                    f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key);</span><br><span style="color: hsl(120, 100%, 40%);">+                      f_cipher_mode(g_pars.encr);</span><br><span>          }</span><br><span>    }</span><br><span> </span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index c29ccd4..c266c19 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -709,21 +709,21 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_cipher_mode(OCT1 alg, OCT8 key, template OCT16 kc128 := omit, boolean exp_fail := false)</span><br><span style="color: hsl(120, 100%, 40%);">+function f_cipher_mode(TestHdlrEncrParams enc, boolean exp_fail := false)</span><br><span> runs on MSC_ConnHdlr {</span><br><span>   var PDU_BSSAP bssap;</span><br><span>         var RSL_Message rsl;</span><br><span>         var RSL_AlgId alg_rsl;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      if (isvalue(kc128)) {</span><br><span style="color: hsl(0, 100%, 40%);">-           BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(alg, key, valueof(kc128)));</span><br><span style="color: hsl(120, 100%, 40%);">+   if (isvalue(enc.enc_kc128)) {</span><br><span style="color: hsl(120, 100%, 40%);">+         BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(enc.enc_alg, enc.enc_key, valueof(enc.enc_kc128)));</span><br><span>  } else {</span><br><span style="color: hsl(0, 100%, 40%);">-                BSSAP.send(ts_BSSMAP_CipherModeCmd(alg, key));</span><br><span style="color: hsl(120, 100%, 40%);">+                BSSAP.send(ts_BSSMAP_CipherModeCmd(enc.enc_alg, enc.enc_key));</span><br><span>       }</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(alg);</span><br><span style="color: hsl(120, 100%, 40%);">+ alg_rsl := f_chipher_mode_bssmap_to_rsl(enc.enc_alg);</span><br><span> </span><br><span>    alt {</span><br><span>        /* RSL/UE Side */</span><br><span>@@ -1145,7 +1145,7 @@</span><br><span> </span><br><span>        /* start ciphering, if requested */</span><br><span>  if (ispresent(g_pars.encr)) {</span><br><span style="color: hsl(0, 100%, 40%);">-           f_cipher_mode(g_pars.encr.enc_alg, g_pars.encr.enc_key);</span><br><span style="color: hsl(120, 100%, 40%);">+              f_cipher_mode(g_pars.encr);</span><br><span>  }</span><br><span> </span><br><span>        /* bail out early if no assignment requested */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24668">change 24668</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/+/24668"/><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: I2cb8282e55436da5ae64ab569df87d5d5a0dd2f0 </div>
<div style="display:none"> Gerrit-Change-Number: 24668 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>