diff options
| author | Harald Welte <laforge@osmocom.org> | 2021-02-06 17:12:20 +0100 |
|---|---|---|
| committer | Alexander Couzens <lynxis@fe80.eu> | 2021-11-05 01:29:05 +0100 |
| commit | 505a94a610fc7dfa4baa4fb3d9197d7564cde0d3 (patch) | |
| tree | 861bf658196a544d394d991252ad36435c6b3194 /include | |
| parent | 274b70f1a8d477908f88c262dc67b065b6b6e4dc (diff) | |
Make UTRAN encryption algorithms configurable
Allow the user fine-grained control over which UMTS encryption
algorithms are permitted, rather than always permitting UEA1 and UEA2
or neither.
This brings the handling of UEA in line with the handling of A5 for
GERAN.
Change-Id: I91f9e50f9c1439aa19528f887b83ae9de628fcfd
Closes: OS#4144
Depends: osmo-iuh.git I6d2d033b0427bdc84fee61e0f3cb7b29935214bf
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmocom/msc/gsm_data.h | 6 | ||||
| -rw-r--r-- | include/osmocom/msc/ran_msg.h | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 72e33a61d..2a64c533b 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -155,10 +155,8 @@ struct gsm_network { bool authentication_required; int send_mm_info; - /* Whether to use encryption on UTRAN. - * TODO: we should offer a choice of UEA1 and/or UEA2, and probably replace this bool with a bit-mask of - * permitted Iu encryption algorithms. See also OS#4143 and the 'encryption uea' vty command. */ - bool uea_encryption; + /* bit-mask of permitted encryption algorithms. LSB=UEA0, MSB=UEA7 */ + uint8_t uea_encryption_mask; struct rate_ctr_group *msc_ctrs; struct osmo_stat_item_group *statg; diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h index 816ef1f92..0714607af 100644 --- a/include/osmocom/msc/ran_msg.h +++ b/include/osmocom/msc/ran_msg.h @@ -103,7 +103,7 @@ struct ran_cipher_mode_command { struct geran_encr *chosen_key; } geran; struct { - bool uea_encryption; + uint8_t uea_encryption_mask; } utran; }; |