aboutsummaryrefslogtreecommitdiffstats
path: root/include/osmocom/msc/gsm_data.h
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2017-12-23 19:30:32 +0100
committerHarald Welte <laforge@gnumonks.org>2018-01-28 00:09:42 +0000
commit7b222aa1062aae786c92ea649d945ae8d86bbba2 (patch)
treecd6429a67e8d31508ef7eb2b3201bf3524cd7208 /include/osmocom/msc/gsm_data.h
parent71c51df07dfbc60cb41cb43385576a9d89c0c269 (diff)
Permit a set of multiple different A5 ciphers
So far, the administrator had to pick one particular cipher which would then be used throughout all subscribers/phones. This is a bit impractical, as e.g. not all phones support A5/3. Extend the VTY command syntax in a backwards-compatible way to permit for multiple ciphers. NOTE: Like the previous code, OsmoMSC does *not yet check* whether the configured cipher is compatible with the MS capabilities as reported in CLASSMARK! The network hence might choose an algorithm not supported by the phone. Fixing this is subject to another patch. Closes: OS#2460 Change-Id: I79a4e2892eb5fbecc3d84e11dceffb7149db264b
Diffstat (limited to 'include/osmocom/msc/gsm_data.h')
-rw-r--r--include/osmocom/msc/gsm_data.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h
index e9871362b..27324d7b6 100644
--- a/include/osmocom/msc/gsm_data.h
+++ b/include/osmocom/msc/gsm_data.h
@@ -299,7 +299,8 @@ struct gsm_network {
regex_t authorized_regexp;
char *authorized_reg_str;
enum gsm48_reject_value reject_cause;
- int a5_encryption;
+ /* bit-mask of permitted encryption algorithms. LSB=A5/0, MSB=A5/7 */
+ uint8_t a5_encryption_mask;
bool authentication_required;
int neci;
int send_mm_info;