From patchwork Tue Jan 10 01:38:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Mueller X-Patchwork-Id: 9506221 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 4CE2D60710 for ; Tue, 10 Jan 2017 01:42:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A21B28375 for ; Tue, 10 Jan 2017 01:42:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F43C28461; Tue, 10 Jan 2017 01:42:14 +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 C07C028375 for ; Tue, 10 Jan 2017 01:42:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941464AbdAJBmN (ORCPT ); Mon, 9 Jan 2017 20:42:13 -0500 Received: from mail.eperm.de ([89.247.134.16]:55396 "EHLO mail.eperm.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933311AbdAJBmM (ORCPT ); Mon, 9 Jan 2017 20:42:12 -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 C20C4181601C; Tue, 10 Jan 2017 02:42:10 +0100 (CET) From: Stephan =?ISO-8859-1?Q?M=FCller?= To: herbert@gondor.apana.org.au Cc: linux-crypto@vger.kernel.org Subject: [PATCH 05/13] crypto: ccm-aes-ce - copy AAD during encryption Date: Tue, 10 Jan 2017 02:38:04 +0100 Message-ID: <23557836.vhvS21O3kI@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 From acad5f6af68d18bc1dbac460bd44f2298902018b Mon Sep 17 00:00:00 2001 From: Stephan Mueller Date: Mon, 9 Jan 2017 14:32:02 +0100 Subject: 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 --- arch/arm64/crypto/aes-ce-ccm-glue.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/crypto/aes-ce-ccm-glue.c b/arch/arm64/crypto/aes-ce-ccm-glue.c index cc5515d..7dfcb1f 100644 --- a/arch/arm64/crypto/aes-ce-ccm-glue.c +++ b/arch/arm64/crypto/aes-ce-ccm-glue.c @@ -155,6 +155,10 @@ static int ccm_encrypt(struct aead_request *req) u32 len = req->cryptlen; int err; + err = crypto_aead_copy_ad(req); + if (err) + return err; + err = ccm_init_mac(req, mac, len); if (err) return err;