From patchwork Tue Aug 22 08:08:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9914457 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6FA90600C5 for ; Tue, 22 Aug 2017 08:10:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C6181FFAD for ; Tue, 22 Aug 2017 08:10:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6E6E8287EC; Tue, 22 Aug 2017 08:10:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 183E91FFAD for ; Tue, 22 Aug 2017 08:10:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932237AbdHVIKw (ORCPT ); Tue, 22 Aug 2017 04:10:52 -0400 Received: from mail-wr0-f193.google.com ([209.85.128.193]:34277 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932408AbdHVIKp (ORCPT ); Tue, 22 Aug 2017 04:10:45 -0400 Received: by mail-wr0-f193.google.com with SMTP id p14so16007750wrg.1; Tue, 22 Aug 2017 01:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dIwp+3sz/7hbMxubWLE06UFA7xbHV/SEuKAsP5IKeiQ=; b=mOH6/dIDEz3iTEdMWzJqSBzqLC95QamaVVn7B5GkzJjMp95LEpsZGPtcN0Au3n36m6 CKl1CrOeiB9ZPxQF9Yj+4JvjDxZC/uErHAkP/XJXa1ZkQdCJKttHHG8t3VK5vCCzsG/4 5DNNIddxh75ABpspW6q2OIofE1FSYfXR0cahQYyjYAcmFsDVCWsHH9gfu1+mF5AFVuOX cC0Exz2k0G0lWrLJquRcQMjS+h56eirfOkCcHEneMT7BDIb8f7hM2q2knOJs8Ql7X4RL cMkY17CZ3PbR/fge+Zw+S7P7zEn47o+sb3APa3d/PTj0CEJhCclITDBvXQDlrX0CmSOg ZNCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dIwp+3sz/7hbMxubWLE06UFA7xbHV/SEuKAsP5IKeiQ=; b=RDs06UI/6+m8GQpcjRP9cVeALkFkZBCd3YdvTH9KKJWJ89LWmQBCxm392H0J6UDnCm OI+P7YPTwb0xJ6dDYolQKPG+zefcgGCj+qrkuPH0UOf55LjTwkDBwHe8o/LMBXRYUcX6 hvtLWs3PMbhz+HmIsETCNaUKLtHqahdKnVcOEndZ6fU4vbxh9U1BQmZb0USNbt0nY3b5 YERL+q/x92aNS4j88gf7fusGoQz3ZBU7hzALrjNp2WuhkmMwkVRTIp22GYi/C2Qvwo4R n/K5xUvHtQo5JoKNXVekfNEQRtc1czEp6/7lYHJKGcwyv9OMlIGmCSXNtYJ9vJzWONXT ZujQ== X-Gm-Message-State: AHYfb5hFg4RdhxjXKp4W6AXk11P1CZbw0B13g6VXmIOP+5VqCWrq3vU6 UM3Dv449+Ls6Nw== X-Received: by 10.223.179.211 with SMTP id x19mr13229887wrd.7.1503389443972; Tue, 22 Aug 2017 01:10:43 -0700 (PDT) Received: from Red.local (LFbn1-1-65-78.w90-118.abo.wanadoo.fr. [90.118.156.78]) by smtp.googlemail.com with ESMTPSA id e21sm10778796wme.17.2017.08.22.01.10.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Aug 2017 01:10:43 -0700 (PDT) From: Corentin Labbe To: herbert@gondor.apana.org.au, davem@davemloft.net, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, horia.geanta@nxp.com, dan.douglass@nxp.com, thomas.lendacky@amd.com, gary.hook@amd.com, harsh@chelsio.com, matthias.bgg@gmail.com, leosilva@linux.vnet.ibm.com, pfsmorigo@linux.vnet.ibm.com, benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, Corentin Labbe Subject: [PATCH 08/11] crypto: chelsio - Use GCM IV size constant Date: Tue, 22 Aug 2017 10:08:15 +0200 Message-Id: <20170822080818.12486-9-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170822080818.12486-1-clabbe.montjoie@gmail.com> References: <20170822080818.12486-1-clabbe.montjoie@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch replace GCM IV size value by their constant name. Signed-off-by: Corentin Labbe --- drivers/crypto/chelsio/chcr_algo.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/chelsio/chcr_algo.c b/drivers/crypto/chelsio/chcr_algo.c index 0e8160701833..936bdd895efa 100644 --- a/drivers/crypto/chelsio/chcr_algo.c +++ b/drivers/crypto/chelsio/chcr_algo.c @@ -53,6 +53,7 @@ #include #include #include +#include #include #include #include @@ -2534,9 +2535,9 @@ static struct sk_buff *create_gcm_wr(struct aead_request *req, if (get_aead_subtype(tfm) == CRYPTO_ALG_SUB_TYPE_AEAD_RFC4106) { memcpy(reqctx->iv, aeadctx->salt, 4); - memcpy(reqctx->iv + 4, req->iv, 8); + memcpy(reqctx->iv + 4, req->iv, GCM_RFC4106_IV_SIZE); } else { - memcpy(reqctx->iv, req->iv, 12); + memcpy(reqctx->iv, req->iv, GCM_AES_IV_SIZE); } *((unsigned int *)(reqctx->iv + 12)) = htonl(0x01); @@ -3385,7 +3386,7 @@ static struct chcr_alg_template driver_algs[] = { sizeof(struct chcr_aead_ctx) + sizeof(struct chcr_gcm_ctx), }, - .ivsize = 12, + .ivsize = GCM_AES_IV_SIZE, .maxauthsize = GHASH_DIGEST_SIZE, .setkey = chcr_gcm_setkey, .setauthsize = chcr_gcm_setauthsize, @@ -3405,7 +3406,7 @@ static struct chcr_alg_template driver_algs[] = { sizeof(struct chcr_gcm_ctx), }, - .ivsize = 8, + .ivsize = GCM_RFC4106_IV_SIZE, .maxauthsize = GHASH_DIGEST_SIZE, .setkey = chcr_gcm_setkey, .setauthsize = chcr_4106_4309_setauthsize,