From 35db146e886463861d008a91b6ee25498e0b2eb4 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Mon, 29 Nov 2021 00:54:11 +0300 Subject: [PATCH] libmsc: ran_iu_make_security_mode_command(): improve readability Change-Id: I14f4f9617f91ed17fb7614f218cb023a0231866d --- src/libmsc/ran_msg_iu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c index 8ffdd9306..6705ab8be 100644 --- a/src/libmsc/ran_msg_iu.c +++ b/src/libmsc/ran_msg_iu.c @@ -375,13 +375,15 @@ static struct msgb *ran_iu_make_rab_assignment(struct osmo_fsm_inst *caller_fi, static struct msgb *ran_iu_make_security_mode_command(struct osmo_fsm_inst *caller_fi, const struct ran_cipher_mode_command *cm) { + bool use_encryption = cm->utran.uea_encryption_mask > (1 << OSMO_UTRAN_UEA0); LOG_RAN_IU_ENC(caller_fi, LOGL_DEBUG, "Tx RANAP SECURITY MODE COMMAND to RNC, IK=%s, CK=%s\n", osmo_hexdump_nospc(cm->vec->ik, 16), - cm->utran.uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) ? osmo_hexdump_nospc(cm->vec->ck, 16) : "NONE"); + use_encryption ? osmo_hexdump_nospc(cm->vec->ck, 16) : "NONE"); /* TODO: Do we need to check if the UE supports all of the algorithms and build an intersection like * in the case of A5? */ - return ranap_new_msg_sec_mod_cmd2(cm->vec->ik, cm->utran.uea_encryption_mask > (1 << OSMO_UTRAN_UEA0) ? cm->vec->ck : NULL, + return ranap_new_msg_sec_mod_cmd2(cm->vec->ik, + use_encryption ? cm->vec->ck : NULL, RANAP_KeyStatus_new, 0x06, cm->utran.uea_encryption_mask); }