diff options
Diffstat (limited to 'src/libmsc')
| -rw-r--r-- | src/libmsc/gsm_04_08.c | 6 | ||||
| -rw-r--r-- | src/libmsc/msc_vty.c | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c index ee317476c..cd37cff05 100644 --- a/src/libmsc/gsm_04_08.c +++ b/src/libmsc/gsm_04_08.c @@ -375,7 +375,7 @@ static int mm_rx_loc_upd_req(struct msc_a *msc_a, struct msgb *msg) net->vlr, msc_a, vlr_lu_type, tmsi, imsi, &old_lai, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran || net->a5_encryption_mask > 0x01, + net->a5_encryption_mask > 0x01, lu->key_seq, osmo_gsm48_classmark1_is_r99(&lu->classmark1), is_utran, @@ -780,7 +780,7 @@ int gsm48_rx_mm_serv_req(struct msc_a *msc_a, struct msgb *msg) req->cm_service_type, mi-1, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran || net->a5_encryption_mask > 0x01, + net->a5_encryption_mask > 0x01, req->cipher_key_seq, osmo_gsm48_classmark2_is_r99(cm2, cm2_len), is_utran); @@ -1152,7 +1152,7 @@ static int gsm48_rx_rr_pag_resp(struct msc_a *msc_a, struct msgb *msg) net->vlr, msc_a, VLR_PR_ARQ_T_PAGING_RESP, 0, mi_lv, &msc_a->via_cell.lai, is_utran || net->authentication_required, - is_utran || net->a5_encryption_mask > 0x01, + net->a5_encryption_mask > 0x01, pr->key_seq, osmo_gsm48_classmark2_is_r99(cm2, classmark2_len), is_utran); diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index 8ef48ff51..5bf970163 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -148,7 +148,10 @@ DEFUN(cfg_net_encryption, cfg_net_encryption_cmd, "encryption a5 <0-3> [<0-3>] [<0-3>] [<0-3>]", "Encryption options\n" - "GSM A5 Air Interface Encryption\n" + "GSM A5 Air Interface Encryption." + " NOTE: as long as OsmoMSC lacks distinct configuration for 3G encryption," + " 3G encryption is enabled exactly when any 2G encryption is enabled." + " Hence configuring only A5/0 here switches off 3G encryption.\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" "A5/n Algorithm Number\n" |