<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24630">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc a54 tests<br><br>Change-Id: I4940d06b55824936b94f97649401b691339c2e7d<br>Related: SYS#5324<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/MSC_ConnectionHandler.ttcn<br>M bsc/expected-results.xml<br>M bsc/osmo-bsc.cfg<br>4 files changed, 53 insertions(+), 15 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/30/24630/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 41deea1..66206ee 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -3326,7 +3326,17 @@</span><br><span> vc_conn.done;</span><br><span> f_shutdown_helper();</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_ciph_mode_a5_4() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var MSC_ConnHdlr vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ var TestHdlrParams pars := f_gen_test_hdlr_pars();</span><br><span style="color: hsl(120, 100%, 40%);">+ pars.encr := valueof(t_EncrParams('10'O, f_rnd_octstring(8), f_rnd_octstring(16)));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ f_init(1, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_tc_ciph_mode_a5), pars);</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown_helper();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> /* establish initial channel, enable ciphering followed by assignment to ciphered channel */</span><br><span> private function f_tc_assignment_aoip_tla_v6(charstring id) runs on MSC_ConnHdlr {</span><br><span> var template PDU_BSSAP exp_compl := f_gen_exp_compl();</span><br><span>@@ -3420,13 +3430,11 @@</span><br><span> var template PDU_BSSAP exp_compl := f_gen_exp_compl();</span><br><span> var PDU_BSSAP ass_cmd := f_gen_ass_req();</span><br><span> const OCT8 kc := '0001020304050607'O;</span><br><span style="color: hsl(0, 100%, 40%);">- const OCT16 kc128 := kc & kc;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.encr := valueof(t_EncrParams('10'O, kc, kc & kc));</span><br><span> </span><br><span> ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType);</span><br><span> ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));</span><br><span> f_establish_fully(ass_cmd, exp_compl);</span><br><span style="color: hsl(0, 100%, 40%);">- f_cipher_mode('10'O, kc, kc128, true);</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: expect GSM0808_CAUSE_CIPHERING_ALGORITHM_NOT_SUPPORTED cause value */</span><br><span> }</span><br><span> testcase TC_assignment_fr_a5_4() runs on test_CT {</span><br><span> var MSC_ConnHdlr vc_conn;</span><br><span>@@ -3439,6 +3447,30 @@</span><br><span> f_shutdown_helper();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+private function f_tc_assignment_fr_a5_4_fail(charstring id) runs on MSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars := f_gen_test_hdlr_pars();</span><br><span style="color: hsl(120, 100%, 40%);">+ var template PDU_BSSAP exp_compl := f_gen_exp_compl();</span><br><span style="color: hsl(120, 100%, 40%);">+ var PDU_BSSAP ass_cmd := f_gen_ass_req();</span><br><span style="color: hsl(120, 100%, 40%);">+ const OCT8 kc := '0001020304050607'O;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ass_cmd.pdu.bssmap.assignmentRequest.channelType := valueof(ts_BSSMAP_IE_ChannelType);</span><br><span style="color: hsl(120, 100%, 40%);">+ ass_cmd.pdu.bssmap.assignmentRequest.codecList := valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));</span><br><span style="color: hsl(120, 100%, 40%);">+ f_establish_fully(ass_cmd, exp_compl);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.encr := valueof(t_EncrParams('10'O, kc)); // kc128 missing!</span><br><span style="color: hsl(120, 100%, 40%);">+ f_cipher_mode(g_pars.encr, true);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+testcase TC_assignment_fr_a5_4_fail() runs on test_CT {</span><br><span style="color: hsl(120, 100%, 40%);">+ var MSC_ConnHdlr vc_conn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_init(1, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ f_sleep(1.0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn := f_start_handler(refers(f_tc_assignment_fr_a5_4_fail));</span><br><span style="color: hsl(120, 100%, 40%);">+ vc_conn.done;</span><br><span style="color: hsl(120, 100%, 40%);">+ f_shutdown_helper();</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> private function f_tc_assignment_sign(charstring id) runs on MSC_ConnHdlr {</span><br><span> g_pars := f_gen_test_hdlr_pars();</span><br><span>@@ -6698,7 +6730,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>@@ -8829,9 +8861,11 @@</span><br><span> }</span><br><span> execute( TC_assignment_fr_a5_3() );</span><br><span> execute( TC_assignment_fr_a5_4() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_assignment_fr_a5_4_fail() );</span><br><span> execute( TC_ciph_mode_a5_0() );</span><br><span> execute( TC_ciph_mode_a5_1() );</span><br><span> execute( TC_ciph_mode_a5_3() );</span><br><span style="color: hsl(120, 100%, 40%);">+ execute( TC_ciph_mode_a5_4() );</span><br><span> </span><br><span> execute( TC_assignment_codec_fr() );</span><br><span> execute( TC_assignment_codec_fr_by_mode_modify() );</span><br><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index c29ccd4..bfb4352 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -544,12 +544,14 @@</span><br><span> </span><br><span> type record TestHdlrEncrParams {</span><br><span> OCT1 enc_alg,</span><br><span style="color: hsl(0, 100%, 40%);">- octetstring enc_key</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring enc_key,</span><br><span style="color: hsl(120, 100%, 40%);">+ octetstring enc_kc128 optional</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key, template (omit) octetstring kc128 := omit) := {</span><br><span> enc_alg := alg,</span><br><span style="color: hsl(0, 100%, 40%);">- enc_key := key</span><br><span style="color: hsl(120, 100%, 40%);">+ enc_key := key,</span><br><span style="color: hsl(120, 100%, 40%);">+ enc_kc128 := kc128</span><br><span> }</span><br><span> </span><br><span> type record TestHdlrParamsLcls {</span><br><span>@@ -709,25 +711,25 @@</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 encrp, 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(encrp.enc_kc128)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(encrp.enc_alg, encrp.enc_key, valueof(encrp.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(encrp.enc_alg, encrp.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(encrp.enc_alg);</span><br><span> </span><br><span> alt {</span><br><span> /* RSL/UE Side */</span><br><span style="color: hsl(0, 100%, 40%);">- [] RSL.receive(tr_RSL_ENCR_CMD(g_chan_nr, ?, alg_rsl, key)) -> value rsl {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] RSL.receive(tr_RSL_ENCR_CMD(g_chan_nr, ?, alg_rsl, encrp.enc_key)) -> value rsl {</span><br><span> var PDU_ML3_NW_MS l3 := dec_PDU_ML3_NW_MS(rsl.ies[3].body.l3_info.payload);</span><br><span> log("Rx L3 from net: ", l3);</span><br><span> if (ischosen(l3.msgs.rrm.cipheringModeCommand)) {</span><br><span>@@ -1145,7 +1147,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>diff --git a/bsc/expected-results.xml b/bsc/expected-results.xml</span><br><span>index c98d3c7..42bd955 100644</span><br><span>--- a/bsc/expected-results.xml</span><br><span>+++ b/bsc/expected-results.xml</span><br><span>@@ -48,9 +48,11 @@</span><br><span> <testcase classname='BSC_Tests' name='TC_assignment_fr_a5_1_codec_missing' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests' name='TC_assignment_fr_a5_3' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests' name='TC_assignment_fr_a5_4' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='BSC_Tests' name='TC_assignment_fr_a5_4_fail' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests' name='TC_ciph_mode_a5_0' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests' name='TC_ciph_mode_a5_1' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests' name='TC_ciph_mode_a5_3' time='MASKED'/></span><br><span style="color: hsl(120, 100%, 40%);">+ <testcase classname='BSC_Tests' name='TC_ciph_mode_a5_4' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests' name='TC_assignment_codec_fr' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests' name='TC_assignment_codec_hr' time='MASKED'/></span><br><span> <testcase classname='BSC_Tests' name='TC_assignment_codec_efr' time='MASKED'/></span><br><span>diff --git a/bsc/osmo-bsc.cfg b/bsc/osmo-bsc.cfg</span><br><span>index b64a63d..7b0fa2a 100644</span><br><span>--- a/bsc/osmo-bsc.cfg</span><br><span>+++ b/bsc/osmo-bsc.cfg</span><br><span>@@ -69,7 +69,7 @@</span><br><span> network</span><br><span> network country code 1</span><br><span> mobile network code 1</span><br><span style="color: hsl(0, 100%, 40%);">- encryption a5 0 1 3</span><br><span style="color: hsl(120, 100%, 40%);">+ encryption a5 0 1 3 4</span><br><span> neci 1</span><br><span> paging any use tch 0</span><br><span> handover 1</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/24630">change 24630</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/+/24630"/><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: I4940d06b55824936b94f97649401b691339c2e7d </div>
<div style="display:none"> Gerrit-Change-Number: 24630 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>