Change in osmo-msc[master]: support A5/4 in inter-BSC handover

[laforge]

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

Change subject: support A5/4 in inter-BSC handover
......................................................................

support A5/4 in inter-BSC handover

Forward the Kc128 key to the new BSS in BSSMAP Handover Request.

Depends: Ieb6e43eef9e57281d54d4b7c63664668df5aef3e (libosmocore)
Change-Id: Id5ce995a741c8e469a50a0c46e53c06a2378bb7e
---
M TODO-RELEASE
M src/libmsc/ran_msg_a.c
2 files changed, 13 insertions(+), 1 deletion(-)

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



diff --git a/TODO-RELEASE b/TODO-RELEASE
index 2297063..d969e50 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,4 +7,4 @@
 # If any interfaces have been added since the last public release: c:r:a + 1.
 # If any interfaces have been removed or changed since the last public release: c:r:0.
 #library	what		description / commit summary line
-libosmocore	>1.5.1		A5/4 support requires new API gsm0808_create_cipher2()
+libosmocore	>1.5.1		A5/4 support requires new API gsm0808_create_cipher2(), and gsm0808_handover_request.kc128
diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c
index 106c2df..273f8dd 100644
--- a/src/libmsc/ran_msg_a.c
+++ b/src/libmsc/ran_msg_a.c
@@ -483,6 +483,7 @@
 	const struct tlv_p_entry *ie_aoip_transp_addr = TLVP_GET(tp, GSM0808_IE_AOIP_TRASP_ADDR);
 	const struct tlv_p_entry *ie_codec_list_msc_preferred = TLVP_GET(tp, GSM0808_IE_SPEECH_CODEC_LIST);
 	const struct tlv_p_entry *ie_call_id = TLVP_GET(tp, GSM0808_IE_CALL_ID);
+	const struct tlv_p_entry *ie_kc128 = TLVP_GET(tp, GSM0808_IE_KC_128);
 	const struct tlv_p_entry *ie_global_call_ref = TLVP_GET(tp, GSM0808_IE_GLOBAL_CALL_REF);
 
 	struct gsm0808_channel_type channel_type;
@@ -525,6 +526,11 @@
 			geran_encr.key_len = encr_info.key_len;
 		}
 
+		if (ie_kc128) {
+			memcpy(geran_encr.kc128, ie_kc128->val, 16);
+			geran_encr.kc128_present = true;
+		}
+
 		r->geran.chosen_encryption = &geran_encr;
 	}
 
@@ -1166,6 +1172,12 @@
 		       n->geran.chosen_encryption->key, n->geran.chosen_encryption->key_len);
 		r.encryption_information.key_len = n->geran.chosen_encryption->key_len;
 		r.chosen_encryption_algorithm_serving = n->geran.chosen_encryption->alg_id;
+
+		if (n->geran.chosen_encryption->kc128_present) {
+			r.more_items = true;
+			memcpy(r.kc128, n->geran.chosen_encryption->kc128, sizeof(r.kc128));
+			r.kc128_present = true;
+		}
 	}
 
 	if (n->classmark)

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

Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: Id5ce995a741c8e469a50a0c46e53c06a2378bb7e
Gerrit-Change-Number: 24765
Gerrit-PatchSet: 3
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210625/a02edb86/attachment.htm>