<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11438">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;">cipher mode reject: send proper cause codes<br><br>bssmap_handle_cipher_mode() had code paths doing "goto reject" without<br>setting a meaningful cause value.<br><br>Related: OS#3186<br>Change-Id: Ia608fa34a6a2d3035a66d05fbc38553ac5186804<br>---<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>1 file changed, 3 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 48af06b..6b7a682 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -444,6 +444,7 @@</span><br><span> </span><br><span>      if (conn->ciphering_handled) {</span><br><span>            LOGP(DMSC, LOGL_ERROR, "Already seen ciphering command. Protocol Error.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                reject_cause = GSM0808_CAUSE_PROTOCOL_ERROR_BETWEEN_BSS_AND_MSC;</span><br><span>             goto reject;</span><br><span>         }</span><br><span> </span><br><span>@@ -452,6 +453,7 @@</span><br><span>  tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l4h + 1, payload_length - 1, 0, 0);</span><br><span>         if (!TLVP_PRESENT(&tp, GSM0808_IE_ENCRYPTION_INFORMATION)) {</span><br><span>             LOGP(DMSC, LOGL_ERROR, "IE Encryption Information missing.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+             reject_cause = GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING;</span><br><span>           goto reject;</span><br><span>         }</span><br><span> </span><br><span>@@ -464,6 +466,7 @@</span><br><span>  len = TLVP_LEN(&tp, GSM0808_IE_ENCRYPTION_INFORMATION);</span><br><span>  if (len < 1) {</span><br><span>            LOGP(DMSC, LOGL_ERROR, "IE Encryption Information is too short.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+                reject_cause = GSM0808_CAUSE_INCORRECT_VALUE;</span><br><span>                goto reject;</span><br><span>         }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11438">change 11438</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/11438"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia608fa34a6a2d3035a66d05fbc38553ac5186804 </div>
<div style="display:none"> Gerrit-Change-Number: 11438 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>