<p>Hoernchen has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/24628">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">[WIP] a54 libfuncs<br><br>Change-Id: I0fc25c6f23e76d210cbb9822b7e0a8184144ec42<br>Related: SYS#5324<br>---<br>M include/osmocom/gsm/gsm0808.h<br>M src/gsm/gsm0808.c<br>2 files changed, 13 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/28/24628/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/gsm/gsm0808.h b/include/osmocom/gsm/gsm0808.h</span><br><span>index dc3610f..0cbe787 100644</span><br><span>--- a/include/osmocom/gsm/gsm0808.h</span><br><span>+++ b/include/osmocom/gsm/gsm0808.h</span><br><span>@@ -52,8 +52,8 @@</span><br><span> struct msgb *gsm0808_create_clear_command(uint8_t cause);</span><br><span> struct msgb *gsm0808_create_clear_command2(uint8_t cause, bool csfb_ind);</span><br><span> struct msgb *gsm0808_create_clear_complete(void);</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsm0808_create_cipher(const struct gsm0808_encrypt_info *ei,</span><br><span style="color: hsl(0, 100%, 40%);">-                                const uint8_t *cipher_response_mode);</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_cipher(const struct gsm0808_encrypt_info *ei, uint8_t *kc128,</span><br><span style="color: hsl(120, 100%, 40%);">+                   const uint8_t *cipher_response_mode);</span><br><span> struct msgb *gsm0808_create_cipher_complete(struct msgb *layer3, uint8_t alg_id);</span><br><span> struct msgb *gsm0808_create_cipher_reject(enum gsm0808_cause cause);</span><br><span> struct msgb *gsm0808_create_cipher_reject_ext(enum gsm0808_cause_class class, uint8_t ext);</span><br><span>@@ -165,6 +165,7 @@</span><br><span> struct gsm0808_handover_request {</span><br><span>         struct gsm0808_channel_type channel_type;</span><br><span>    struct gsm0808_encrypt_info encryption_information;</span><br><span style="color: hsl(120, 100%, 40%);">+   uint8_t kc128[16];</span><br><span>   struct osmo_gsm48_classmark classmark_information;</span><br><span>   struct gsm0808_cell_id cell_identifier_serving;</span><br><span>      struct gsm0808_cell_id cell_identifier_target;</span><br><span>@@ -200,7 +201,7 @@</span><br><span>         /* more items are defined in the spec and may be added later */</span><br><span>      bool more_items; /*!< always set this to false */</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsm0808_create_handover_request(const struct gsm0808_handover_request *params);</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_handover_request(const struct gsm0808_handover_request *params, uint8_t *kc128);</span><br><span> </span><br><span> struct msgb *gsm0808_create_handover_request_ack(const uint8_t *l3_info, uint8_t l3_info_len,</span><br><span>                                             uint8_t chosen_channel, uint8_t chosen_encr_alg,</span><br><span>diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c</span><br><span>index 3a39fd1..4b2a786 100644</span><br><span>--- a/src/gsm/gsm0808.c</span><br><span>+++ b/src/gsm/gsm0808.c</span><br><span>@@ -230,9 +230,10 @@</span><br><span> </span><br><span> /*! Create BSSMAP Cipher Mode Command message</span><br><span>  *  \param[in] ei Mandatory Encryption Information</span><br><span style="color: hsl(120, 100%, 40%);">+ *  \param[in] kc128 optional kc128 key for A5/4</span><br><span>  *  \param[in] cipher_response_mode optional 1-byte Cipher Response Mode</span><br><span>  *  \returns callee-allocated msgb with BSSMAP Cipher Mode Command message */</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsm0808_create_cipher(const struct gsm0808_encrypt_info *ei,</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_cipher(const struct gsm0808_encrypt_info *ei, uint8_t* kc128,</span><br><span>                                 const uint8_t *cipher_response_mode)</span><br><span> {</span><br><span>         /* See also: 3GPP TS 48.008 3.2.1.30 CIPHER MODE COMMAND */</span><br><span>@@ -258,6 +259,9 @@</span><br><span>            msgb_tv_put(msg, GSM0808_IE_CIPHER_RESPONSE_MODE,</span><br><span>                        *cipher_response_mode);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+       if(kc128)</span><br><span style="color: hsl(120, 100%, 40%);">+             msgb_tv_fixed_put(msg, GSM0808_IE_KC_128, 16, kc128);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      /* pre-pend the header */</span><br><span>    msg->l3h =</span><br><span>            msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));</span><br><span>@@ -905,7 +909,7 @@</span><br><span>  * Sent from the MSC to the potential new target cell during inter-BSC handover, or to the target MSC during inter-MSC</span><br><span>  * handover.</span><br><span>  */</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *gsm0808_create_handover_request(const struct gsm0808_handover_request *params)</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *gsm0808_create_handover_request(const struct gsm0808_handover_request *params, uint8_t* kc128)</span><br><span> {</span><br><span>       struct msgb *msg;</span><br><span> </span><br><span>@@ -991,6 +995,9 @@</span><br><span>          msgb_tv_fixed_put(msg, GSM0808_IE_CALL_ID, 4, val);</span><br><span>  }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if(kc128)</span><br><span style="color: hsl(120, 100%, 40%);">+             msgb_tv_fixed_put(msg, GSM0808_IE_KC_128, 16, kc128);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>      if (params->global_call_reference && params->global_call_reference_len) {</span><br><span>              msgb_tlv_put(msg, GSM0808_IE_GLOBAL_CALL_REF,</span><br><span>                             params->global_call_reference_len, params->global_call_reference);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/24628">change 24628</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmocore/+/24628"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0fc25c6f23e76d210cbb9822b7e0a8184144ec42 </div>
<div style="display:none"> Gerrit-Change-Number: 24628 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>