From patchwork Wed Jun 1 06:29:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gerrit-no-reply@lists.osmocom.org X-Patchwork-Id: 628494 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.osmocom.org (lists.osmocom.org [IPv6:2a01:4f8:191:444b::2:7]) by ozlabs.org (Postfix) with ESMTP id 3rKL6k4Jxhz9t5c for ; Wed, 1 Jun 2016 16:29:18 +1000 (AEST) Received: from lists.osmocom.org (lists.osmocom.org [144.76.43.76]) by lists.osmocom.org (Postfix) with ESMTP id 28447220CD; Wed, 1 Jun 2016 06:29:17 +0000 (UTC) X-Original-To: openbsc@lists.osmocom.org Delivered-To: openbsc@lists.osmocom.org Received: from 127.0.1.12 (unknown [127.0.1.12]) by lists.osmocom.org (Postfix) with ESMTPA id 40074220BE; Wed, 1 Jun 2016 06:29:15 +0000 (UTC) Date: Wed, 1 Jun 2016 06:29:15 +0000 From: Harald Welte To: lynxis lazus X-Gerrit-MessageType: merged Subject: [MERGED] openbsc[master]: gprs: use new uint8_t * for kv in gprs_cipher_run() X-Gerrit-Change-Id: Ib5bfe1fb05c693347b11ff4faadd3fc2205ebd76 X-Gerrit-ChangeURL: X-Gerrit-Commit: 85f8fdabc3b90b3c9571db05daa8a68d9e113fdf In-Reply-To: References: MIME-Version: 1.0 Content-Disposition: inline User-Agent: Gerrit/2.12.2-31-gb331dbd-dirty X-BeenThere: openbsc@lists.osmocom.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "Development of OpenBSC, OsmoBSC, OsmoNITB, OsmoCSCN" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: laforge@gnumonks.org Errors-To: openbsc-bounces@lists.osmocom.org Sender: "OpenBSC" Message-Id: <20160601062917.28447220CD@lists.osmocom.org> Harald Welte has submitted this change and it was merged. Change subject: gprs: use new uint8_t * for kv in gprs_cipher_run() ...................................................................... gprs: use new uint8_t * for kv in gprs_cipher_run() libosmocore changed in bf990bb8 Update internal GPRS cipher API from uint_64 to uint8_t*. Fix a warning. Change-Id: Ib5bfe1fb05c693347b11ff4faadd3fc2205ebd76 --- M openbsc/src/gprs/gprs_llc.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/gprs/gprs_llc.c b/openbsc/src/gprs/gprs_llc.c index 4cf5163..883f0cc 100644 --- a/openbsc/src/gprs/gprs_llc.c +++ b/openbsc/src/gprs/gprs_llc.c @@ -410,7 +410,7 @@ uint8_t cipher_out[GSM0464_CIPH_MAX_BLOCK]; uint32_t iv; int rc, i; - uint64_t kc = *(uint64_t *)&lle->llme->kc; + uint8_t *kc = lle->llme->kc; /* Compute the 'Input' Paraemeter */ iv = gprs_cipher_gen_input_ui(iov_ui, sapi, nu, oc); @@ -611,7 +611,7 @@ uint16_t crypt_len = llhp.data_len + 3; uint8_t cipher_out[GSM0464_CIPH_MAX_BLOCK]; uint32_t iv; - uint64_t kc = *(uint64_t *)&lle->llme->kc; + uint8_t *kc = lle->llme->kc; int rc, i; if (lle->llme->algo == GPRS_ALGO_GEA0) {