<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/22757">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
fixeria: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Fix enabling of UMTS UEA encryption<br><br>The existing code allowed the user to configure UMTS encryption in the<br>vty, but we never actually passed this information down to RANAP. As a<br>result, the RAN had no chance of ever enabling encryption on the air<br>interface.<br><br>Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2<br>Related: OS#4144<br>---<br>M include/osmocom/msc/ran_msg.h<br>M src/libmsc/msc_a.c<br>M src/libmsc/ran_msg_iu.c<br>3 files changed, 7 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h</span><br><span>index fd2439f..816ef1f 100644</span><br><span>--- a/include/osmocom/msc/ran_msg.h</span><br><span>+++ b/include/osmocom/msc/ran_msg.h</span><br><span>@@ -102,6 +102,9 @@</span><br><span> /* out-argument to return the key to the caller, pass NULL if not needed. */</span><br><span> struct geran_encr *chosen_key;</span><br><span> } geran;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ bool uea_encryption;</span><br><span style="color: hsl(120, 100%, 40%);">+ } utran;</span><br><span> };</span><br><span> </span><br><span> struct ran_handover_request {</span><br><span>diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c</span><br><span>index 9b6b602..fe3af14 100644</span><br><span>--- a/src/libmsc/msc_a.c</span><br><span>+++ b/src/libmsc/msc_a.c</span><br><span>@@ -348,6 +348,9 @@</span><br><span> /* for ran_a.c to store the GERAN key that is actually used */</span><br><span> .chosen_key = &msc_a->geran_encr,</span><br><span> },</span><br><span style="color: hsl(120, 100%, 40%);">+ .utran = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .uea_encryption = net->uea_encryption</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> },</span><br><span> };</span><br><span> </span><br><span>diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c</span><br><span>index 5d13460..6120918 100644</span><br><span>--- a/src/libmsc/ran_msg_iu.c</span><br><span>+++ b/src/libmsc/ran_msg_iu.c</span><br><span>@@ -369,7 +369,7 @@</span><br><span> </span><br><span> LOG_RAN_IU_ENC(caller_fi, LOGL_DEBUG, "Tx RANAP SECURITY MODE COMMAND to RNC, ik %s\n",</span><br><span> osmo_hexdump_nospc(cm->vec->ik, 16));</span><br><span style="color: hsl(0, 100%, 40%);">- return ranap_new_msg_sec_mod_cmd(cm->vec->ik, NULL, RANAP_KeyStatus_new);</span><br><span style="color: hsl(120, 100%, 40%);">+ return ranap_new_msg_sec_mod_cmd(cm->vec->ik, cm->utran.uea_encryption ? cm->vec->ck : NULL, RANAP_KeyStatus_new);</span><br><span> }</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/22757">change 22757</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-msc/+/22757"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ieaaa6b23b7337b7edb902fad8031e195e0c5e9d2 </div>
<div style="display:none"> Gerrit-Change-Number: 22757 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Assignee: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>