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: 9914559 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 A68F0603FF for ; Tue, 22 Aug 2017 08:17:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE68028806 for ; Tue, 22 Aug 2017 08:17:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A331F28820; Tue, 22 Aug 2017 08:17:34 +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=unavailable 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 5234A2881A for ; Tue, 22 Aug 2017 08:17:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932077AbdHVIRO (ORCPT ); Tue, 22 Aug 2017 04:17:14 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:36137 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932126AbdHVIKi (ORCPT ); Tue, 22 Aug 2017 04:10:38 -0400 Received: by mail-wr0-f195.google.com with SMTP id f8so16134324wrf.3; Tue, 22 Aug 2017 01:10:37 -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=UiSnTxk4raJVSBDiDv6FfDwqNLdKjNbENx7eC5eGuAlP/NvA/3hCS6I1Aqsws2zEV0 1JmAiVIQXN25n1H4QzczsO5MhIaJEHb5zOo1foFcdsbOYoBYHNvXbxvRRj0Vr8DHYdOy rO1bpQ41/RLBA3SvMWDS8rBsz6odS+0odYaDjnV8AZ3iIEW2WCLUjBr+igSSHfK4S72o IJ/08ePjKyuAuxYG30N0jRv/S/H7qutL0zEJyoDGF8MeNevKoPlu/mUGWvcf9Ke3zNRc tFYxX7Hz7zOMY5BW09ykPw8m7faJtzMK4NnZAzz8zDDeIgRwspz+woNeyfx6DmMs2Sxb wQbA== X-Gm-Message-State: AHYfb5gp7VDo9HqBpfPDKBN6SZJ4QC6stXis9x4ppQEYbye1gtg/vfpn On26eaF/erE2tQ== 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 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 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> 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/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 |