From patchwork Tue Aug 22 08:08:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 804319 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 3xc3NK0rW0z9sRm for ; Tue, 22 Aug 2017 18:18:25 +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="jenjSffS"; 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 3xc3NJ6n7qzDqh0 for ; Tue, 22 Aug 2017 18:18:24 +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="jenjSffS"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-wr0-x243.google.com (mail-wr0-x243.google.com [IPv6:2a00:1450:400c:c0c::243]) (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 3xc3CM6JSdzDql9 for ; Tue, 22 Aug 2017 18:10:39 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jenjSffS"; dkim-atps=neutral Received: by mail-wr0-x243.google.com with SMTP id p14so16007262wrg.1 for ; Tue, 22 Aug 2017 01:10:39 -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=6hqsbdEupEvzNfiRcsut3rH0IZjWn0qN/RaWhNB1oZw=; b=jenjSffSa+sh4XkoFIAL/DL6gqT1yT/ib9/LCE+7/elnlEkYE1Jqr1zwWBFNejDP9m zey9cZIgXKSNF3RKCHgbasckz9tqwJZPsDZVR8mMUm8VWwsBqv2IaCL3X9Acy2TzBVR/ avN/8HloENLQBmWp7PrFY13fED/ZUEXa2f6/FIv+BDMOhL0Ozjpbleh1MCQmt7S/2Q0M ATd6VfQXs600U8JAQTiLoq6lhMANSaVzAJ/rOeUhNm5qqrBeRNGBl+PCLfiUqpsAe9u3 F5WCLf2Z6NiXDx1hRhyr3Q+qH0EbtjKJ66djMdorU0Oe8CfLiAuQkpltQs0zz0JV4XYf WMgQ== 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=6hqsbdEupEvzNfiRcsut3rH0IZjWn0qN/RaWhNB1oZw=; b=Hm+K0/P+mzGY/TCVN8TFCYRrfRpr+2jnakkXZrWoX6U0L3Hkge/agwbB4DQY4rQWcA Ep6yaumrP443wraqbrgQ7AuigkMLK340SgXg6e83mNQ/jZ9w7l0GeOGA7gODSY1ETtcG RHXPxmRCycLOot+7tvJaql2eqQrsjSWf7hj6bYVCOi+WLT20c+PN1TCvj24W4NWiBR2F Vv+uXzwQ508LaLWH74DktLYUU+sGhoLZD0Zdfhyxj7YoG64SRNEh0aZnjwYZt90TorA5 0S6h6gj2ain5EI0MXfiV7bpKZucbb9ueOHEeGCsaDdPsSUt39LqWjFquCa2ammzvmKi4 7bBA== X-Gm-Message-State: AHYfb5gMD3zQP5xRMDGcifokHrq4Hj3d0OmTN1l+8i57vBrh+EtnHz3a XLBxKK6orRhGYg== X-Received: by 10.28.105.217 with SMTP id z86mr5377612wmh.22.1503389437302; Tue, 22 Aug 2017 01:10:37 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Aug 2017 01:10:36 -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 03/11] crypto: ccp - Use GCM IV size constant Date: Tue, 22 Aug 2017 10:08:10 +0200 Message-Id: <20170822080818.12486-4-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/ccp/ccp-crypto-aes-galois.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/ccp/ccp-crypto-aes-galois.c b/drivers/crypto/ccp/ccp-crypto-aes-galois.c index 52313524a4dd..ff02b713c6f6 100644 --- a/drivers/crypto/ccp/ccp-crypto-aes-galois.c +++ b/drivers/crypto/ccp/ccp-crypto-aes-galois.c @@ -19,13 +19,12 @@ #include #include #include +#include #include #include #include "ccp-crypto.h" -#define AES_GCM_IVSIZE 12 - static int ccp_aes_gcm_complete(struct crypto_async_request *async_req, int ret) { return ret; @@ -95,9 +94,9 @@ static int ccp_aes_gcm_crypt(struct aead_request *req, bool encrypt) */ /* Prepare the IV: 12 bytes + an integer (counter) */ - memcpy(rctx->iv, req->iv, AES_GCM_IVSIZE); + memcpy(rctx->iv, req->iv, GCM_AES_IV_SIZE); for (i = 0; i < 3; i++) - rctx->iv[i + AES_GCM_IVSIZE] = 0; + rctx->iv[i + GCM_AES_IV_SIZE] = 0; rctx->iv[AES_BLOCK_SIZE - 1] = 1; /* Set up a scatterlist for the IV */ @@ -160,7 +159,7 @@ static struct aead_alg ccp_aes_gcm_defaults = { .encrypt = ccp_aes_gcm_encrypt, .decrypt = ccp_aes_gcm_decrypt, .init = ccp_aes_gcm_cra_init, - .ivsize = AES_GCM_IVSIZE, + .ivsize = GCM_AES_IV_SIZE, .maxauthsize = AES_BLOCK_SIZE, .base = { .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |