From patchwork Tue Jul 2 19:41:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 168358 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4653456ilk; Tue, 2 Jul 2019 12:42:29 -0700 (PDT) X-Google-Smtp-Source: APXvYqxvbKioawmUXK5Ug1e85UaENIvAfq66Ey7Txe7JjNfK09l1myj0aU3kjGh2JYw8FuPEW4+x X-Received: by 2002:a17:90a:35e6:: with SMTP id r93mr7603627pjb.20.1562096549639; Tue, 02 Jul 2019 12:42:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562096549; cv=none; d=google.com; s=arc-20160816; b=w3N0pZA1b1WFaU6L+3jEmPL+JbnPRMbHaLVCeSOP/79mQXSGMiAc6l/XuiTMV6tTj8 8Yo25dWULuFoJSblw9Lvbyxm9G5ZoN1ptHHUhxUsvI/xeGsH8fHiVBdCTjWhFNvcGHbh zOKsSz6/yJIFGdTILZGzOQLwrwLxAjzTo9HOKzdJ9edKX5mSlwCEMfdR+ihJtT4407nI x71EaqMeIglCkBm0cYT9h/5V9b9gD5E6lOWmtBqS0prUkkTCzm9rsknv3M/OIhNXbxOU YXD7hHLaKMR2nckmg0Ns/5zVaF+G4tWJ7g0YPIayXqhGmJ+XJw/cZ0Vpb2YfSSdqjSNq ywMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Ad0DoiAKzwKoTLL/HCg690cbeFEcYdQtGzvCJEzt4Xw=; b=mp24Fhyr97kDrfOaZvWOuxRyHfvszt/hpIcJbz3/XMRANPHkxFzS1SAirSJ2fBHRcJ j1NjC27ft6aT4UGLCXLJjAjYDiqwDlRvLwvALpo8nxHfM/4ZDPXyY2VLkM1LwSt23xK3 D5s+8NxPR8n9nzHmYA+o9btp2cEacwWUs3CBaFbOWmgL1psjcX3T7VqUoU3GNnp6qXXz 0FMpxo4lK+gOmhR+WHirZy1jpcY2dcF2aVwj4A2hc6HB2HB/pKqSD++vbI2/9PIRJNsr RTawagsJCOrVhVz/RKTuV2A6N3aphy5NZYHgPJ67U4okIEerbHPZQxf1XhtiVObNDB4X +JVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lxWeD94g; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x13si13373092pgh.116.2019.07.02.12.42.29; Tue, 02 Jul 2019 12:42:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lxWeD94g; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726329AbfGBTm3 (ORCPT + 3 others); Tue, 2 Jul 2019 15:42:29 -0400 Received: from mail-lj1-f193.google.com ([209.85.208.193]:39750 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727049AbfGBTm2 (ORCPT ); Tue, 2 Jul 2019 15:42:28 -0400 Received: by mail-lj1-f193.google.com with SMTP id v18so18158402ljh.6 for ; Tue, 02 Jul 2019 12:42:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ad0DoiAKzwKoTLL/HCg690cbeFEcYdQtGzvCJEzt4Xw=; b=lxWeD94g5yFO8oJjW/CzUVUNo7qwef+GL23iStNXnZM45mM94ZjY7gdpwoFSkheOwf tp7HPHofcHOl2i8JmwJoOXxzZLSJ18UFGTnZHNuqEfgwuF8qkkpX4i9i1m5kJ3JGgZLf 3RcgGloEzBvatSyE01v/iIwNrTvm0SmzbgroWWLXZwSIARChYPX+85VL7hwJTCWsZIdp ncW8T4jQheH4O2h1wxS4oTuHj8+qXKCk/pD/Gz/Fmj1NOZmop5SybaDanT1OmuZSLa3U p+YvF5uXagnoQxvvqaDcuhG3RZV9/HMYmYFCpCmlri4dzyvEqy0UQOyrfwZYeXWOLXIF zEHw== 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=Ad0DoiAKzwKoTLL/HCg690cbeFEcYdQtGzvCJEzt4Xw=; b=gKiLSaCybINuM8OfdBWXP53Ul6zNpwsquUiLsREJd/wQPnTXYw+jrgvJbKvjGLYTZs cBiBZwYVtoka+6ZT5x0u6TLyGTPbpYtSYtOEDLXeH7ZOyYVZon4rxtgCHT3tas+T0a4V 2RPOQgBnphxgSLsEzfwAOQHlXpwi6rwd9j1oSQL0um9SKoPpTDk2Gret3XwDeus2ThhB tfo0qM9Gcl+15mxIlmnHa7M52wBiW4XFd8qCp97ZazUTfpkAiAsYPD1oIBE332H6eSTm kQHQPSq9Ob1UoksKxggL6y6rOZ25ayK6qw3C5KjFaiId9SzeGeS4ZneZsjrWSJK4yze5 50pQ== X-Gm-Message-State: APjAAAXFJYrg3dvM3J3Uqsv34UB+4BaSgySuyWQESuTRYs1o3921rhzv uQlPKRnQylL2GhLFqsN+GBzHseqWBa6RETAz X-Received: by 2002:a2e:5bdd:: with SMTP id m90mr17802446lje.46.1562096546620; Tue, 02 Jul 2019 12:42:26 -0700 (PDT) Received: from e111045-lin.arm.com (89-212-78-239.static.t-2.net. [89.212.78.239]) by smtp.gmail.com with ESMTPSA id 24sm4475163ljs.63.2019.07.02.12.42.25 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 02 Jul 2019 12:42:25 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@google.com, Ard Biesheuvel Subject: [PATCH v4 12/32] crypto: arm64/aes-ccm - switch to AES library Date: Tue, 2 Jul 2019 21:41:30 +0200 Message-Id: <20190702194150.10405-13-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190702194150.10405-1-ard.biesheuvel@linaro.org> References: <20190702194150.10405-1-ard.biesheuvel@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The CCM code calls directly into the scalar table based AES cipher for arm64 from the fallback path, and since this implementation is known to be non-time invariant, doing so from a time invariant SIMD cipher is a bit nasty. So let's switch to the AES library - this makes the code more robust, and drops the dependency on the generic AES cipher, allowing us to omit it entirely in the future. Signed-off-by: Ard Biesheuvel --- arch/arm64/crypto/Kconfig | 2 +- arch/arm64/crypto/aes-ce-ccm-glue.c | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) -- 2.17.1 diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig index 1762055e7093..c6032bfb44fb 100644 --- a/arch/arm64/crypto/Kconfig +++ b/arch/arm64/crypto/Kconfig @@ -80,8 +80,8 @@ config CRYPTO_AES_ARM64_CE_CCM depends on ARM64 && KERNEL_MODE_NEON select CRYPTO_ALGAPI select CRYPTO_AES_ARM64_CE - select CRYPTO_AES_ARM64 select CRYPTO_AEAD + select CRYPTO_LIB_AES config CRYPTO_AES_ARM64_CE_BLK tristate "AES in ECB/CBC/CTR/XTS modes using ARMv8 Crypto Extensions" diff --git a/arch/arm64/crypto/aes-ce-ccm-glue.c b/arch/arm64/crypto/aes-ce-ccm-glue.c index cb89c80800b5..b9b7cf4b5a8f 100644 --- a/arch/arm64/crypto/aes-ce-ccm-glue.c +++ b/arch/arm64/crypto/aes-ce-ccm-glue.c @@ -46,8 +46,6 @@ asmlinkage void ce_aes_ccm_decrypt(u8 out[], u8 const in[], u32 cbytes, asmlinkage void ce_aes_ccm_final(u8 mac[], u8 const ctr[], u32 const rk[], u32 rounds); -asmlinkage void __aes_arm64_encrypt(u32 *rk, u8 *out, const u8 *in, int rounds); - static int ccm_setkey(struct crypto_aead *tfm, const u8 *in_key, unsigned int key_len) { @@ -127,8 +125,7 @@ static void ccm_update_mac(struct crypto_aes_ctx *key, u8 mac[], u8 const in[], } while (abytes >= AES_BLOCK_SIZE) { - __aes_arm64_encrypt(key->key_enc, mac, mac, - num_rounds(key)); + aes_encrypt(key, mac, mac); crypto_xor(mac, in, AES_BLOCK_SIZE); in += AES_BLOCK_SIZE; @@ -136,8 +133,7 @@ static void ccm_update_mac(struct crypto_aes_ctx *key, u8 mac[], u8 const in[], } if (abytes > 0) { - __aes_arm64_encrypt(key->key_enc, mac, mac, - num_rounds(key)); + aes_encrypt(key, mac, mac); crypto_xor(mac, in, abytes); *macp = abytes; } @@ -209,10 +205,8 @@ static int ccm_crypt_fallback(struct skcipher_walk *walk, u8 mac[], u8 iv0[], bsize = nbytes; crypto_inc(walk->iv, AES_BLOCK_SIZE); - __aes_arm64_encrypt(ctx->key_enc, buf, walk->iv, - num_rounds(ctx)); - __aes_arm64_encrypt(ctx->key_enc, mac, mac, - num_rounds(ctx)); + aes_encrypt(ctx, buf, walk->iv); + aes_encrypt(ctx, mac, mac); if (enc) crypto_xor(mac, src, bsize); crypto_xor_cpy(dst, src, buf, bsize); @@ -227,8 +221,8 @@ static int ccm_crypt_fallback(struct skcipher_walk *walk, u8 mac[], u8 iv0[], } if (!err) { - __aes_arm64_encrypt(ctx->key_enc, buf, iv0, num_rounds(ctx)); - __aes_arm64_encrypt(ctx->key_enc, mac, mac, num_rounds(ctx)); + aes_encrypt(ctx, buf, iv0); + aes_encrypt(ctx, mac, mac); crypto_xor(mac, buf, AES_BLOCK_SIZE); } return err;