From patchwork Tue Aug 22 08:08:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9914453 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 7E1EB600C5 for ; Tue, 22 Aug 2017 08:10:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C3A21FFAD for ; Tue, 22 Aug 2017 08:10:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 80B68287EC; Tue, 22 Aug 2017 08:10:45 +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 1F5B11FFAD for ; Tue, 22 Aug 2017 08:10:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932077AbdHVIKm (ORCPT ); Tue, 22 Aug 2017 04:10:42 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:34227 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932230AbdHVIKk (ORCPT ); Tue, 22 Aug 2017 04:10:40 -0400 Received: by mail-wr0-f194.google.com with SMTP id p14so16007387wrg.1; 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=vHzAPeWHnFxx8vk/gVblHqi5iL+gz1mFl1BtWqeZmrU=; b=NIEwOsChVq7CAa9BQMPgpr9OXuWkp18NfBWnynp5EhUN1DF4kZrAlAqvNnd1tqMTbf ppuCIz1Axy9DUDaYU0mFmQ81Tawl+f1gl9baaJhnt4M01/OwWP4vhCK3kdQqMweoLXiv 9FC6GIYsvZkOqFe5qIIWYuCZtl2vLC7RXy7pbzTXrPN+6imQkdv78ZBZKezHrfQTaZWU VZITtF5GtKmCx3peRokeBJ+a5ZDtINUB57W4W5zOUXsekhacvckc1H4UioJyRdrCVtad GUUPJoFLJMtUOzh6Vf9SlwU9c1ic1T/CAWPlFVSjKa1qnHWy5s7GqmlBl7SSVsP260k0 XSyg== 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=vHzAPeWHnFxx8vk/gVblHqi5iL+gz1mFl1BtWqeZmrU=; b=iSnJz+Ajoile5n/DMHEAJYghUmdiRna72GdpEx8cTSaiBx0p5AB4NdCpGDczbLSMzM 1WyIUZW3RnA9kKib3U0x5q13DyK+zMlUUYXhdj43sbnerLgHojLDR+EhbsNfVTN4sE8m LZdeIuj5HAA4sjbg+lhTVUJBMKY/0hls03HBbW0po2Et+35V5/Unl+sJJF1i4y8VXD/9 voEoJQfu+QQdne3OSC6owhZgNXliVkPcRbfNWJF1IBj9R3aIkKkLj9KdmqNFWITjaerS 7ak8aLqQOY57QYBHoxqWifFuHZWLAsPBgB3D9Fppq/K8/fLYcDvNLL2axYRBrnWb5Hjj HfXg== X-Gm-Message-State: AHYfb5he+n9n9z7I+QFpoWpcodoSsjCn8ECkEiI1cP1SFGPO9j+bcfX4 d0/WVY+xk6iW7A== X-Received: by 10.28.27.69 with SMTP id b66mr1030148wmb.11.1503389438643; Tue, 22 Aug 2017 01:10:38 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Aug 2017 01:10:38 -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 04/11] crypto: nx - Use GCM IV size constant Date: Tue, 22 Aug 2017 10:08:11 +0200 Message-Id: <20170822080818.12486-5-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/nx/nx-aes-gcm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/nx/nx-aes-gcm.c b/drivers/crypto/nx/nx-aes-gcm.c index abd465f479c4..a810596b97c2 100644 --- a/drivers/crypto/nx/nx-aes-gcm.c +++ b/drivers/crypto/nx/nx-aes-gcm.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -433,7 +434,7 @@ static int gcm_aes_nx_encrypt(struct aead_request *req) struct nx_gcm_rctx *rctx = aead_request_ctx(req); char *iv = rctx->iv; - memcpy(iv, req->iv, 12); + memcpy(iv, req->iv, GCM_AES_IV_SIZE); return gcm_aes_nx_crypt(req, 1, req->assoclen); } @@ -443,7 +444,7 @@ static int gcm_aes_nx_decrypt(struct aead_request *req) struct nx_gcm_rctx *rctx = aead_request_ctx(req); char *iv = rctx->iv; - memcpy(iv, req->iv, 12); + memcpy(iv, req->iv, GCM_AES_IV_SIZE); return gcm_aes_nx_crypt(req, 0, req->assoclen); } @@ -498,7 +499,7 @@ struct aead_alg nx_gcm_aes_alg = { }, .init = nx_crypto_ctx_aes_gcm_init, .exit = nx_crypto_ctx_aead_exit, - .ivsize = 12, + .ivsize = GCM_AES_IV_SIZE, .maxauthsize = AES_BLOCK_SIZE, .setkey = gcm_aes_nx_set_key, .encrypt = gcm_aes_nx_encrypt, @@ -516,7 +517,7 @@ struct aead_alg nx_gcm4106_aes_alg = { }, .init = nx_crypto_ctx_aes_gcm_init, .exit = nx_crypto_ctx_aead_exit, - .ivsize = 8, + .ivsize = GCM_RFC4106_IV_SIZE, .maxauthsize = AES_BLOCK_SIZE, .setkey = gcm4106_aes_nx_set_key, .setauthsize = gcm4106_aes_nx_setauthsize,