<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/26107">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">utran: use new UTRAN encryption enum<br><br>Depends: libosmocore.git I4b9baff2c2fbd0e339fc769cc69cce58d3a72cdf<br>Change-Id: If6978d7ed1a78facc2591cfc30fda2721629bffa<br>---<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/msc_net_init.c<br>M tests/msc_vlr/msc_vlr_test_umts_authen.c<br>M tests/msc_vlr/msc_vlr_tests.h<br>4 files changed, 12 insertions(+), 9 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/07/26107/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index fc1b2e2..f34b7b6 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -51,6 +51,7 @@</span><br><span> #include <osmocom/core/fsm.h></span><br><span> #include <osmocom/gsm/tlv.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/msc/msub.h></span><br><span> #include <osmocom/msc/msc_roles.h></span><br><span>@@ -414,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 > 0x01 : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ is_utran ? net->uea_encryption_mask > (1 << UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</span><br><span> lu->key_seq,</span><br><span> osmo_gsm48_classmark1_is_r99(&lu->classmark1),</span><br><span> is_utran,</span><br><span>@@ -805,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 > 0x01 : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ is_utran ? net->uea_encryption_mask > (1 << UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</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>@@ -931,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 > 0x01 : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ is_utran ? net->uea_encryption_mask > (1 << UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</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>@@ -1293,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 > 0x01 : net->a5_encryption_mask > 0x01,</span><br><span style="color: hsl(120, 100%, 40%);">+ is_utran ? net->uea_encryption_mask > (1 << UTRAN_UEA0) : net->a5_encryption_mask > 0x01,</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/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c</span><br><span>index d53156b..93dbfe6 100644</span><br><span>--- a/src/libmsc/msc_net_init.c</span><br><span>+++ b/src/libmsc/msc_net_init.c</span><br><span>@@ -30,6 +30,7 @@</span><br><span> #include <osmocom/msc/gsup_client_mux.h></span><br><span> #include <osmocom/msc/gsm_04_11_gsup.h></span><br><span> #include <osmocom/msc/gsm_09_11.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/crypt/utran_cipher.h></span><br><span> </span><br><span> /* TODO: would be great to have all timer declarations in one place */</span><br><span> #include <osmocom/msc/ran_infra.h></span><br><span>@@ -68,7 +69,7 @@</span><br><span> /* Permit a compile-time default of A5/3 and A5/1 */</span><br><span> net->a5_encryption_mask = (1 << 3) | (1 << 1);</span><br><span> /* Permit a compile-time default of UEA2 and UEA1 */</span><br><span style="color: hsl(0, 100%, 40%);">- net->uea_encryption_mask = (1 << 2) | (1 << 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ net->uea_encryption_mask = (1 << UTRAN_UEA2) | (1 << UTRAN_UEA1);</span><br><span> </span><br><span> net->mncc_guard_timeout = 180;</span><br><span> net->ncss_guard_timeout = 30;</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 655183b..0b3bc31 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>@@ -333,7 +333,7 @@</span><br><span> static void test_umts_authen_utran()</span><br><span> {</span><br><span> comment_start();</span><br><span style="color: hsl(0, 100%, 40%);">- net->uea_encryption_mask = 0x01;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->uea_encryption_mask = (1 << UTRAN_UEA0);</span><br><span> _test_umts_authen(OSMO_RAT_UTRAN_IU);</span><br><span> comment_end();</span><br><span> }</span><br><span>@@ -341,7 +341,7 @@</span><br><span> static void test_umts_auth_ciph_utran()</span><br><span> {</span><br><span> comment_start();</span><br><span style="color: hsl(0, 100%, 40%);">- net->uea_encryption_mask = 0x06;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->uea_encryption_mask = (1 << UTRAN_UEA1 | 1 << UTRAN_UEA2);</span><br><span> _test_umts_authen(OSMO_RAT_UTRAN_IU);</span><br><span> comment_end();</span><br><span> }</span><br><span>@@ -588,7 +588,7 @@</span><br><span> static void test_umts_authen_resync_utran()</span><br><span> {</span><br><span> comment_start();</span><br><span style="color: hsl(0, 100%, 40%);">- net->uea_encryption_mask = 0x01;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->uea_encryption_mask = (1 << UTRAN_UEA0);</span><br><span> _test_umts_authen_resync(OSMO_RAT_UTRAN_IU);</span><br><span> comment_end();</span><br><span> }</span><br><span>@@ -596,7 +596,7 @@</span><br><span> static void test_umts_auth_ciph_resync_utran()</span><br><span> {</span><br><span> comment_start();</span><br><span style="color: hsl(0, 100%, 40%);">- net->uea_encryption_mask = 0x06;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->uea_encryption_mask = (1 << UTRAN_UEA1 | 1 << UTRAN_UEA2);</span><br><span> _test_umts_authen_resync(OSMO_RAT_UTRAN_IU);</span><br><span> comment_end();</span><br><span> }</span><br><span>diff --git a/tests/msc_vlr/msc_vlr_tests.h b/tests/msc_vlr/msc_vlr_tests.h</span><br><span>index a2b2f22..1f83013 100644</span><br><span>--- a/tests/msc_vlr/msc_vlr_tests.h</span><br><span>+++ b/tests/msc_vlr/msc_vlr_tests.h</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <stdbool.h></span><br><span> #include <stdio.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/crypt/utran_cipher.h></span><br><span> #include <osmocom/msc/gsm_data.h></span><br><span> #include <osmocom/msc/vlr.h></span><br><span> #include <osmocom/msc/msub.h></span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/26107">change 26107</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/+/26107"/><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: If6978d7ed1a78facc2591cfc30fda2721629bffa </div>
<div style="display:none"> Gerrit-Change-Number: 26107 </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>