From patchwork Tue Jan 10 01:40:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Mueller X-Patchwork-Id: 9506207 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 12DDD60757 for ; Tue, 10 Jan 2017 01:42:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 002A428375 for ; Tue, 10 Jan 2017 01:42:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E901528461; Tue, 10 Jan 2017 01:42:02 +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.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI 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 8EDB728395 for ; Tue, 10 Jan 2017 01:42:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932893AbdAJBmB (ORCPT ); Mon, 9 Jan 2017 20:42:01 -0500 Received: from mail.eperm.de ([89.247.134.16]:55372 "EHLO mail.eperm.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933311AbdAJBmB (ORCPT ); Mon, 9 Jan 2017 20:42:01 -0500 Received: from positron.chronox.de (50-255-10-49-static.hfc.comcastbusiness.net [50.255.10.49]) by mail.eperm.de (Postfix) with ESMTPA id 5BDF8181601C; Tue, 10 Jan 2017 02:41:59 +0100 (CET) From: Stephan =?ISO-8859-1?Q?M=FCller?= To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org Subject: [PATCH 12/13] crypto: nx - copy AAD during encryption Date: Tue, 10 Jan 2017 02:40:32 +0100 Message-ID: <6034656.8T7AjXVcWL@positron.chronox.de> User-Agent: KMail/5.3.3 (Linux/4.8.15-300.fc25.x86_64; KDE/5.29.0; x86_64; ; ) In-Reply-To: <10526995.lyZ7Je1KMx@positron.chronox.de> References: <10526995.lyZ7Je1KMx@positron.chronox.de> MIME-Version: 1.0 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 Invoke the crypto_aead_copy_ad function during the encryption code path to copy the AAD from the source to the destination buffer. Signed-off-by: Stephan Mueller --- drivers/crypto/nx/nx-aes-ccm.c | 4 ++++ drivers/crypto/nx/nx-aes-gcm.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/drivers/crypto/nx/nx-aes-ccm.c b/drivers/crypto/nx/nx-aes-ccm.c index 7038f36..ee570bf 100644 --- a/drivers/crypto/nx/nx-aes-ccm.c +++ b/drivers/crypto/nx/nx-aes-ccm.c @@ -428,6 +428,10 @@ static int ccm_nx_encrypt(struct aead_request *req, unsigned int processed = 0, to_process; int rc = -1; + rc = crypto_aead_copy_ad(req); + if (rc) + return rc; + spin_lock_irqsave(&nx_ctx->lock, irq_flags); rc = generate_pat(desc->info, req, nx_ctx, authsize, nbytes, assoclen, diff --git a/drivers/crypto/nx/nx-aes-gcm.c b/drivers/crypto/nx/nx-aes-gcm.c index abd465f..0cc0533 100644 --- a/drivers/crypto/nx/nx-aes-gcm.c +++ b/drivers/crypto/nx/nx-aes-gcm.c @@ -432,9 +432,14 @@ static int gcm_aes_nx_encrypt(struct aead_request *req) { struct nx_gcm_rctx *rctx = aead_request_ctx(req); char *iv = rctx->iv; + int err; memcpy(iv, req->iv, 12); + err = crypto_aead_copy_ad(req); + if (err) + return err; + return gcm_aes_nx_crypt(req, 1, req->assoclen); } @@ -455,6 +460,7 @@ static int gcm4106_aes_nx_encrypt(struct aead_request *req) struct nx_gcm_rctx *rctx = aead_request_ctx(req); char *iv = rctx->iv; char *nonce = nx_ctx->priv.gcm.nonce; + int err; memcpy(iv, nonce, NX_GCM4106_NONCE_LEN); memcpy(iv + NX_GCM4106_NONCE_LEN, req->iv, 8); @@ -462,6 +468,10 @@ static int gcm4106_aes_nx_encrypt(struct aead_request *req) if (req->assoclen < 8) return -EINVAL; + err = crypto_aead_copy_ad(req); + if (err) + return err; + return gcm_aes_nx_crypt(req, 1, req->assoclen - 8); }