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: 804324 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xc3bB71TTz9t16 for ; Tue, 22 Aug 2017 18:27:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mOH6/dID"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xc3bB5qHlzDqZ8 for ; Tue, 22 Aug 2017 18:27:50 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mOH6/dID"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3xc3CV3h7PzDql9 for ; Tue, 22 Aug 2017 18:10:46 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mOH6/dID"; dkim-atps=neutral Received: by mail-wr0-x241.google.com with SMTP id p14so16007753wrg.1 for ; Tue, 22 Aug 2017 01:10:46 -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=fULKrYGNo1UriOlnRLpPhwdSIQ4FXSXES6rcwyv63yotkcF7DTzUgbfSxZnLJkIjhP fZWZG3TNHlnGJsaIk+VcgVhSIQSdvEqHj2ZhYC58J3Phc3NWcnRBNiTaZX669XKRYjiq vuucpqxjGg30yn0eV3WLlVGf0UcjNJVVY/W2LQWBPNIwCCUfk8woLT2EHB0b8cTKjatN SgxeCnZmIKz/AuTqxXgQc2y5nlGMwsAC7KJyiYjuIfqZ497gQ7q7XAKPn934FYvGWynd Sj/Wm+Qs3YFm64lIwsbvEmdcbrDQcThrYgBWAkvo2JZPABvt5gi+1xcLI6oj0C3oJFHL W42Q== X-Gm-Message-State: AHYfb5iXMZSUrA+J51Y1aYOQRSIjwVInzaEL9CCEvBpzbFUm7tRlwOmV 73nHBGSJSE8kPg== 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 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> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, Corentin Labbe , linux-crypto@vger.kernel.org, linux-mediatek@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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,