<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/26108">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libmsc/gsm_04_08: refactor require encryption into own inline function<br><br>Change-Id: I9e407f65b282e645feabe714f7f4c3e44fae21e9<br>---<br>M include/osmocom/msc/gsm_data.h<br>M src/libmsc/gsm_04_08.c<br>M tests/msc_vlr/msc_vlr_test_umts_authen.c<br>3 files changed, 13 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/08/26108/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 710fd86..1a21b8e 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -13,6 +13,7 @@</span><br><span> #include <osmocom/core/stat_item.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span> #include <osmocom/crypt/auth.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/crypt/utran_cipher.h></span><br><span> </span><br><span> #include <osmocom/mgcp_client/mgcp_client.h></span><br><span> </span><br><span>@@ -261,6 +262,13 @@</span><br><span> char *sms_db_file_path;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static inline bool net_require_encryption(struct gsm_network *net, bool is_utran) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (is_utran)</span><br><span style="color: hsl(120, 100%, 40%);">+ return net->uea_encryption_mask > (1 << UTRAN_UEA0);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ return net->a5_encryption_mask > 0x1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_esme;</span><br><span> </span><br><span> enum gsm_sms_source_id {</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index f34b7b6..ec92b06 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -415,7 +415,7 @@</span><br><span> net->vlr, msc_a, vlr_lu_type, tmsi, imsi,</span><br><span> &old_lai, &msc_a->via_cell.lai,</span><br><span> is_utran || net->authentication_required,</span><br><span style="color: hsl(0, 100%, 40%);">- is_utran ? net->uea_encryption_mask > (1 << UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ net_require_encryption(net, is_utran),</span><br><span> lu->key_seq,</span><br><span> osmo_gsm48_classmark1_is_r99(&lu->classmark1),</span><br><span> is_utran,</span><br><span>@@ -806,7 +806,7 @@</span><br><span> req->cm_service_type,</span><br><span> &mi, &msc_a->via_cell.lai,</span><br><span> is_utran || net->authentication_required,</span><br><span style="color: hsl(0, 100%, 40%);">- is_utran ? net->uea_encryption_mask > (1 << UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ net_require_encryption(net, is_utran),</span><br><span> req->cipher_key_seq,</span><br><span> osmo_gsm48_classmark2_is_r99(cm2, cm2_len),</span><br><span> is_utran);</span><br><span>@@ -932,7 +932,7 @@</span><br><span> VLR_PR_ARQ_T_CM_RE_ESTABLISH_REQ, 0,</span><br><span> &mi, &msc_a->via_cell.lai,</span><br><span> is_utran || net->authentication_required,</span><br><span style="color: hsl(0, 100%, 40%);">- is_utran ? net->uea_encryption_mask > (1 << UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ net_require_encryption(net, is_utran),</span><br><span> req->cipher_key_seq,</span><br><span> osmo_gsm48_classmark2_is_r99(cm2, cm2_len),</span><br><span> is_utran);</span><br><span>@@ -1294,7 +1294,7 @@</span><br><span> net->vlr, msc_a,</span><br><span> VLR_PR_ARQ_T_PAGING_RESP, 0, &mi, &msc_a->via_cell.lai,</span><br><span> is_utran || net->authentication_required,</span><br><span style="color: hsl(0, 100%, 40%);">- is_utran ? net->uea_encryption_mask > (1 << UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ net_require_encryption(net, is_utran),</span><br><span> pr->key_seq,</span><br><span> osmo_gsm48_classmark2_is_r99(cm2, classmark2_len),</span><br><span> is_utran);</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_test_umts_authen.c b/tests/msc_vlr/msc_vlr_test_umts_authen.c</span><br><span>index 0b3bc31..9b4af9f 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_test_umts_authen.c</span><br><span>+++ b/tests/msc_vlr/msc_vlr_test_umts_authen.c</span><br><span>@@ -49,8 +49,7 @@</span><br><span> "5079da1e1ee7416937485e9ea7c965373d1d6683c270383b3d0e"</span><br><span> "d3d36ff71c949e83c22072799e9687c5ec32a81d96afcbf4b4fb"</span><br><span> "0c7ac3e9e9b7db05";</span><br><span style="color: hsl(0, 100%, 40%);">- bool encryption = (via_ran == OSMO_RAT_GERAN_A && net->a5_encryption_mask > 0x1)</span><br><span style="color: hsl(0, 100%, 40%);">- || (via_ran == OSMO_RAT_UTRAN_IU && net->uea_encryption_mask > 0x1);</span><br><span style="color: hsl(120, 100%, 40%);">+ bool encryption = net_require_encryption(net, via_ran == OSMO_RAT_UTRAN_IU);</span><br><span> </span><br><span> net->authentication_required = true;</span><br><span> net->vlr->cfg.assign_tmsi = true;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/26108">change 26108</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/+/26108"/><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: I9e407f65b282e645feabe714f7f4c3e44fae21e9 </div>
<div style="display:none"> Gerrit-Change-Number: 26108 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>