Merge remote-tracking branch 'origin/nr-ue-fix-security-2022-w04' into integration_2022_wk05

5ea65c26 · hardy · d9d4d82d · fe4c988c · 5ea65c26
Commit 5ea65c26 authored Jan 28, 2022 by hardy
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

openair2/RRC/NR_UE/rrc_UE.c openair2/RRC/NR_UE/rrc_UE.c +2 -1

No files found.
--- a/openair2/RRC/NR_UE/rrc_UE.c
+++ b/openair2/RRC/NR_UE/rrc_UE.c
@@ -2180,7 +2180,8 @@ nr_rrc_ue_establish_srb2(
                                    NULL,
                                    radioBearerConfig->drb_ToAddModList,
                                    NULL,
-                                    0,
+                                    NR_UE_rrc_inst[ctxt_pP->module_id].cipheringAlgorithm
+                                      | (NR_UE_rrc_inst[ctxt_pP->module_id].integrityProtAlgorithm << 4),
                                    NULL,
                                    NULL,
                                    kUPenc,