<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13937">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: Separate as_GSUP_SAI from f_mm_auth<br><br>In some cases we might want to match on (and perform) the GSUP<br>SEND AUTH INFO without also expecting/performing a MM authentication<br>on the Iu/A interface. Hence it makes sense to split those two.<br><br>Change-Id: I7b298d589930bab976b478ac84553a6352f25c93<br>---<br>M msc/BSC_ConnectionHandler.ttcn<br>1 file changed, 24 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index 9fc0616..93a311e 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -379,34 +379,39 @@</span><br><span> return l3_info;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+altstep as_GSUP_SAI() runs on BSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+var GSUP_IE auth_tuple;</span><br><span style="color: hsl(120, 100%, 40%);">+[] GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_pars.use_umts_aka) {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec := f_gen_auth_vec_3g();</span><br><span style="color: hsl(120, 100%, 40%);">+ auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec.sres,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec.kc,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec.ik,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec.ck,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec.autn,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec.res));</span><br><span style="color: hsl(120, 100%, 40%);">+ GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple));</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec := f_gen_auth_vec_2g();</span><br><span style="color: hsl(120, 100%, 40%);">+ auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec.sres,</span><br><span style="color: hsl(120, 100%, 40%);">+ g_pars.vec.kc));</span><br><span style="color: hsl(120, 100%, 40%);">+ GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple));</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%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> function f_mm_auth() runs on BSC_ConnHdlr</span><br><span> {</span><br><span> if (g_pars.net.expect_auth) {</span><br><span style="color: hsl(0, 100%, 40%);">- var GSUP_IE auth_tuple;</span><br><span style="color: hsl(0, 100%, 40%);">- GSUP.receive(tr_GSUP_SAI_REQ(g_pars.imsi));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ as_GSUP_SAI();</span><br><span> if (g_pars.use_umts_aka) {</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec := f_gen_auth_vec_3g();</span><br><span style="color: hsl(0, 100%, 40%);">- auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G3G(g_pars.vec.rand,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec.sres,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec.kc,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec.ik,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec.ck,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec.autn,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec.res));</span><br><span style="color: hsl(0, 100%, 40%);">- GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_AUTH_REQ_3G(g_pars.vec.rand, g_pars.vec.autn)));</span><br><span> var OCT4 res := substr(g_pars.vec.res, 0, 4);</span><br><span> var OCT4 xres := substr(g_pars.vec.res, 4, 4);</span><br><span> BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MT_MM_AUTH_RESP_3G(res, xres)));</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec := f_gen_auth_vec_2g();</span><br><span style="color: hsl(0, 100%, 40%);">- auth_tuple := valueof(ts_GSUP_IE_AuthTuple2G(g_pars.vec.rand,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec.sres,</span><br><span style="color: hsl(0, 100%, 40%);">- g_pars.vec.kc));</span><br><span style="color: hsl(0, 100%, 40%);">- GSUP.send(ts_GSUP_SAI_RES(g_pars.imsi, auth_tuple));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_MM_AUTH_REQ(g_pars.vec.rand)));</span><br><span> BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MT_MM_AUTH_RESP_2G(g_pars.vec.sres)));</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13937">change 13937</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/13937"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7b298d589930bab976b478ac84553a6352f25c93 </div>
<div style="display:none"> Gerrit-Change-Number: 13937 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>