do not force encryption on UTRAN
Remove the conditions that always enable encryption on UTRAN.
We so far lack an explicit configuration for UTRAN encryption, and this patch
does not add any either. Instead, whether UTRAN encryption is enabled is simply
triggered on whether GERAN has A5 encryption enabled (A5/n with n > 0). Though
GERAN and UTRAN encryption are not technically related at all, this makes UTRAN
behave like GERAN for now, until we implement a proper separate configuration
for UTRAN encryption.
Adjust the msc_vlr_test_* configuration by setting the net->a5_encryption_mask
such that the expected output remains unchanged. A subsequent patch
(I54227f1f08c38c0bf69b9c48924669c4829b04b9) will add more tests, particularly
cases of UTRAN without encryption.
Adjust manual and vty doc.
Related: OS#2783
Change-Id: I04ecd7a3b1cc603b2e3feb630e8c7c93fc36ccd7
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
index d73a5f8..62ea6c7 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
@@ -266,6 +266,8 @@
static void test_auth_use_twice_geran()
{
comment_start();
+ /* A5/0 = no encryption */
+ net->a5_encryption_mask = A5_0;
_test_auth_reuse(OSMO_RAT_GERAN_A, 1, 1, true);
comment_end();
}
@@ -273,6 +275,8 @@
static void test_auth_use_twice_utran()
{
comment_start();
+ /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */
+ net->a5_encryption_mask = A5_0_3;
_test_auth_reuse(OSMO_RAT_UTRAN_IU, 1, 1, true);
comment_end();
}
@@ -280,6 +284,8 @@
static void test_auth_use_infinitely_geran()
{
comment_start();
+ /* A5/0 = no encryption */
+ net->a5_encryption_mask = A5_0;
_test_auth_reuse(OSMO_RAT_GERAN_A, -1, 3, false);
comment_end();
}
@@ -287,6 +293,8 @@
static void test_auth_use_infinitely_utran()
{
comment_start();
+ /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */
+ net->a5_encryption_mask = A5_0_3;
_test_auth_reuse(OSMO_RAT_UTRAN_IU, -1, 3, false);
comment_end();
}
@@ -294,6 +302,8 @@
static void test_no_auth_reuse_geran()
{
comment_start();
+ /* A5/0 = no encryption */
+ net->a5_encryption_mask = A5_0;
_test_auth_reuse(OSMO_RAT_GERAN_A, 0, 0, true);
comment_end();
}
@@ -301,6 +311,8 @@
static void test_no_auth_reuse_utran()
{
comment_start();
+ /* A5/0 + A5/3 = encryption enabled; so far the A5 setting also triggers UTRAN encryption */
+ net->a5_encryption_mask = A5_0_3;
_test_auth_reuse(OSMO_RAT_UTRAN_IU, 0, 0, true);
comment_end();
}