<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12039">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Pau Espin Pedrol: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename gsm_encr to geran_encr, it is only applicable on GERAN<br><br>On UTRAN, Security Mode is used instead of Ciphering Command, which does not<br>feature an A5 algorithm id.<br><br>Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820<br>---<br>M include/osmocom/msc/common_cs.h<br>M include/osmocom/msc/gsm_data.h<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/msc_vty.c<br>M src/libmsc/osmo_msc.c<br>5 files changed, 9 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/common_cs.h b/include/osmocom/msc/common_cs.h</span><br><span>index fddc6ec..410f102 100644</span><br><span>--- a/include/osmocom/msc/common_cs.h</span><br><span>+++ b/include/osmocom/msc/common_cs.h</span><br><span>@@ -9,7 +9,7 @@</span><br><span> </span><br><span> #define MAX_A5_KEY_LEN     (128/8)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_encr {</span><br><span style="color: hsl(120, 100%, 40%);">+struct geran_encr {</span><br><span>    uint8_t alg_id;</span><br><span>      uint8_t key_len;</span><br><span>     uint8_t key[MAX_A5_KEY_LEN];</span><br><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 94a6ffd..864bc0a 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -125,7 +125,7 @@</span><br><span>      enum ran_type via_ran;</span><br><span> </span><br><span>   uint16_t lac;</span><br><span style="color: hsl(0, 100%, 40%);">-   struct gsm_encr encr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct geran_encr geran_encr;</span><br><span> </span><br><span>    /* "Temporary" storage for the case the VLR asked for Cipher Mode Command, but the MSC still</span><br><span>        * wants to request a Classmark Update first. */</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 7dd303f..6569a9a 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -1663,12 +1663,12 @@</span><br><span>              memcpy(ei.key, tuple->vec.kc, sizeof(tuple->vec.kc));</span><br><span>  ei.key_len = sizeof(tuple->vec.kc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      conn->encr = (struct gsm_encr){};</span><br><span style="color: hsl(0, 100%, 40%);">-    if (ei.key_len <= sizeof(conn->encr.key)) {</span><br><span style="color: hsl(0, 100%, 40%);">-               memcpy(conn->encr.key, ei.key, ei.key_len);</span><br><span style="color: hsl(0, 100%, 40%);">-          conn->encr.key_len = ei.key_len;</span><br><span style="color: hsl(120, 100%, 40%);">+   conn->geran_encr = (struct geran_encr){};</span><br><span style="color: hsl(120, 100%, 40%);">+  if (ei.key_len <= sizeof(conn->geran_encr.key)) {</span><br><span style="color: hsl(120, 100%, 40%);">+               memcpy(conn->geran_encr.key, ei.key, ei.key_len);</span><br><span style="color: hsl(120, 100%, 40%);">+          conn->geran_encr.key_len = ei.key_len;</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       /* conn->encr.alg_id remains unknown until we receive a Cipher Mode Complete from the BSC */</span><br><span style="color: hsl(120, 100%, 40%);">+       /* conn->geran_encr.alg_id remains unknown until we receive a Cipher Mode Complete from the BSC */</span><br><span> </span><br><span>    return a_iface_tx_cipher_mode(conn, &ei, retrieve_imeisv);</span><br><span> }</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index 4f3ac04..401586e 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -499,7 +499,7 @@</span><br><span>               conn->use_count,</span><br><span>          conn->use_tokens,</span><br><span>                 conn->received_cm_service_request ? 'C' : '-',</span><br><span style="color: hsl(0, 100%, 40%);">-               conn->encr.alg_id,</span><br><span style="color: hsl(120, 100%, 40%);">+         conn->geran_encr.alg_id,</span><br><span>          conn->fi ? osmo_fsm_inst_state_name(conn->fi) : "-",</span><br><span>                 VTY_NEWLINE);</span><br><span> }</span><br><span>diff --git a/src/libmsc/osmo_msc.c b/src/libmsc/osmo_msc.c</span><br><span>index e3d7055..88a3dbb 100644</span><br><span>--- a/src/libmsc/osmo_msc.c</span><br><span>+++ b/src/libmsc/osmo_msc.c</span><br><span>@@ -222,7 +222,7 @@</span><br><span>            }</span><br><span>    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   conn->encr.alg_id = alg_id;</span><br><span style="color: hsl(120, 100%, 40%);">+        conn->geran_encr.alg_id = alg_id;</span><br><span> </span><br><span>     ciph_res.cause = VLR_CIPH_COMPL;</span><br><span>     vlr_subscr_rx_ciph_res(conn->vsub, &ciph_res);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12039">change 12039</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/12039"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Idc7ca9da1aa13ae16f5db2cb1024676cbc770820 </div>
<div style="display:none"> Gerrit-Change-Number: 12039 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>