Change in osmo-msc[master]: vty: allow A5/4 encryption in config

laforge gerrit-no-reply at lists.osmocom.org
Fri Jun 25 08:11:58 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/24632 )

Change subject: vty: allow A5/4 encryption in config
......................................................................

vty: allow A5/4 encryption in config

Add A5/4 to the internal mask of allowed algorithms.

(Not actually working yet, A5/4 implementation follows in other
patches.)

Related: SYS#5324
Change-Id: I5b46aaa8579f8d069ca39caf996a8795ffe63dd7
---
M src/libmsc/msc_vty.c
M tests/test_nodes.vty
2 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  fixeria: Looks good to me, approved
  laforge: Looks good to me, approved



diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c
index 7b111b1..2a4dbbb 100644
--- a/src/libmsc/msc_vty.c
+++ b/src/libmsc/msc_vty.c
@@ -151,12 +151,13 @@
 
 DEFUN(cfg_net_encryption,
       cfg_net_encryption_cmd,
-      "encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>]",
+      "encryption a5 <0-4> [<0-4>] [<0-4>] [<0-4>] [<0-4>]",
 	ENCRYPTION_STR
 	"GSM A5 Air Interface Encryption.\n"
 	"A5/n Algorithm Number\n"
 	"A5/n Algorithm Number\n"
 	"A5/n Algorithm Number\n"
+	"A5/n Algorithm Number\n"
 	"A5/n Algorithm Number\n")
 {
 	unsigned int i;
diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty
index f956a12..268681a 100644
--- a/tests/test_nodes.vty
+++ b/tests/test_nodes.vty
@@ -16,7 +16,7 @@
   mobile network code <0-999>
   short name NAME
   long name NAME
-  encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>]
+  encryption a5 <0-4> [<0-4>] [<0-4>] [<0-4>] [<0-4>]
   encryption uea <0-2> [<0-2>] [<0-2>]
   authentication (optional|required)
   rrlp mode (none|ms-based|ms-preferred|ass-preferred)

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/24632
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I5b46aaa8579f8d069ca39caf996a8795ffe63dd7
Gerrit-Change-Number: 24632
Gerrit-PatchSet: 3
Gerrit-Owner: Hoernchen <ewild at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210625/98d99da2/attachment.htm>


More information about the gerrit-log mailing list