Change in osmo-msc[master]: libmsc: ran_iu_make_security_mode_command(): improve readability

[fixeria]

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/26409 )

Change subject: libmsc: ran_iu_make_security_mode_command(): improve readability
......................................................................

libmsc: ran_iu_make_security_mode_command(): improve readability

Change-Id: I14f4f9617f91ed17fb7614f218cb023a0231866d
---
M src/libmsc/ran_msg_iu.c
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  laforge: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/libmsc/ran_msg_iu.c b/src/libmsc/ran_msg_iu.c
index 8ffdd93..6705ab8 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_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);
 }
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/26409
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I14f4f9617f91ed17fb7614f218cb023a0231866d
Gerrit-Change-Number: 26409
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: lynxis lazus <lynxis at fe80.eu>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211130/25d673a9/attachment.htm>