aboutsummaryrefslogtreecommitdiffstats
path: root/doc/manuals/chapters/net.adoc
diff options
context:
space:
mode:
Diffstat (limited to 'doc/manuals/chapters/net.adoc')
-rw-r--r--doc/manuals/chapters/net.adoc23
1 files changed, 17 insertions, 6 deletions
diff --git a/doc/manuals/chapters/net.adoc b/doc/manuals/chapters/net.adoc
index 4bf34a33f..6edb9ee3a 100644
--- a/doc/manuals/chapters/net.adoc
+++ b/doc/manuals/chapters/net.adoc
@@ -188,11 +188,22 @@ network
While authentication is always required on 3G, ciphering is optional.
-So far OsmoMSC lacks explicit configuration for ciphering on 3G. As an interim
-solution, ciphering is enabled on 3G exactly when ciphering is enabled on 2G,
-i.e. when any cipher other than A5/0 is enabled in the configuration. If only
-A5/0 is configured, ciphering will be disabled on both 2G and 3G. The future
-aim is to add comprehensive configuration for 3G ciphering that is independent
-from the 2G setting.
+So far OsmoMSC allows switching ciphering on 3G either on or off -- the default
+behavior is to enable ciphering. (Individual choice of algorithms may be added
+in the future.)
+
+Disable 3G ciphering:
+
+----
+network
+ encryption uea 0
+----
+
+Enable 3G ciphering (default):
+
+----
+network
+ encryption uea 1 2
+----
OsmoMSC indicates UEA1 and UEA2 as permitted encryption algorithms on 3G.