From patchwork Sat Jun 22 19:34:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 167507 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2256106ilk; Sat, 22 Jun 2019 12:35:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqwOgZj2Oi7tLLlmyY+4nK28dn+Oc7QftRscvEmdZv8A3Igor/q4fv3fJ5D26o1tlYHC4H0w X-Received: by 2002:a17:90a:37c8:: with SMTP id v66mr14955054pjb.33.1561232108517; Sat, 22 Jun 2019 12:35:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561232108; cv=none; d=google.com; s=arc-20160816; b=JQkSWW+muV9YeYgT4a50YRnrauKgaDxtFOzDXXrvNnm081EWCUb8aZDsv4iuccxw6i WBfsM73MD7JmMlZO1Ur4yEudmyQtfZvx6jfRPaqs7t9ELQzX+5coGACh/5Om/OASNhJA n12Iso//3hRxr8ttlfw8YRMsgmMyvY5Sap3ThhFd6wjOmaE3UhR+OYIOjnDQ8dn5XlWM jgPIwTSlWVEzVQ67kcO6jnpyopjKR8AhUSCJkpgE3CD8s/HrTF3YYa4Nke6pkyIS/rf2 cvZZaH/FfYzL3yKatsDfGUXQwBxVGYb+5Cd3SIUW5z6vIR7F5i4oucWngN2jMKMKIxlL JHmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=h9xdExBrqYFWsuLQCJksPQkQTr4z/marqcQjFd4StkE=; b=vPi168HSws+raaMAl/zLKem1Uk3p0ui3QYfWPjkKehNRwTCcYq9D7Z1hwemgV/Wl8s Emz3ea85ZDOHEaw7TQplg5MEqAWkJxQdrBKC2kajLpoFTVyIvJDAfs85QGQkG+sa1dnZ IRCFTgwus5QoPySOXcbpWGjbhgn5BYqGuDSkQl2wykAMzLWxZURkiONIRW9Bn0B9zqs4 UWwEw23TnAnzkot7wL9DF2VZ8YBkQg1MMTlw4Q2y0Nodrr6wlYT1QJL81R6sD6DNiCdN 9XWdkbtOSAarAgwIZznMNtXR2uY2ZdCxAN2B6ZH89hXN9nMz64/zcjhHsZBEFlPgQR67 OsQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PsBUE0nV; 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 l21si5511699pgb.409.2019.06.22.12.35.08; Sat, 22 Jun 2019 12:35:08 -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=PsBUE0nV; 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 S1726397AbfFVTfH (ORCPT + 3 others); Sat, 22 Jun 2019 15:35:07 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39432 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726379AbfFVTfH (ORCPT ); Sat, 22 Jun 2019 15:35:07 -0400 Received: by mail-wr1-f66.google.com with SMTP id x4so9707938wrt.6 for ; Sat, 22 Jun 2019 12:35:06 -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 :mime-version:content-transfer-encoding; bh=h9xdExBrqYFWsuLQCJksPQkQTr4z/marqcQjFd4StkE=; b=PsBUE0nVB+7NLTRtR6PyHt8kVIKwtKhXM6MbVB3kmBDZ2Q5zJhkIli8SQnxDQIVcO+ LTzL/3qbyvZUvuaC7BsoW+212GWkRVUA1/3CUSu5l9zMD92q5WiRmf17khCwR2dB6/gD x4YvZZ+MmpRkcf0iELtnKBcr0QUlDve0+gI1V7+WD77ba4mgSNpXA8dyxW5VbuXJKGIS nWCAWMn42S/scchluEKUaN+rWc0fuKBFufPf2+pk+L1EmlAsRtFoiAXSviPVjlgIMOyX 8V1jXySbsLywmRGOlOpYXIhykxYKCa//Ss3BK3jsLW42RqNBLDQrkkYz2PJH1rh3Gjib WRcw== 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:mime-version:content-transfer-encoding; bh=h9xdExBrqYFWsuLQCJksPQkQTr4z/marqcQjFd4StkE=; b=FxLjAkDkpFgxchSQdLgk7qx+j7cqUi6PYRt1MGmvHucYxBoN9dnT8MPGC9QVOVvbad sPYpmBSNPAnalTFLNdJWJYRETHtRe09kRw9l5dRga9wtBcGzsuO9mAP8zCsTtNKHCHXj SfUP8KxVdl9XUGl3ywSyMndjKF9IHHArwFc2z+de0AdPsfWv2v5cKD59fU5qXZ3ejwPM tAfPmG5vpkzedDWjpsSYFczLAfaW4CQRPzZNq6sAEbnUHFLAizLUW+zaB4+teZjAdJU7 a7adfpjPExfHgxoOet50IYKTOGQQDwDynsc3V3HpeL1OOTbgBvyb+NYFw7tvbIwvLij2 Xnzw== X-Gm-Message-State: APjAAAWYL0X/bmhHV7IT4fIFRq7R+dNrOAQ9D0ZK8ASp/T/IAKhcUVWt 2w9+e5e8Wg5+1jEVmGavDXSeFTZ6EVZEQTFN X-Received: by 2002:a5d:5607:: with SMTP id l7mr15715931wrv.228.1561232105612; Sat, 22 Jun 2019 12:35:05 -0700 (PDT) Received: from sudo.home ([2a01:cb1d:112:6f00:4bd:3f91:4ef8:ae7e]) by smtp.gmail.com with ESMTPSA id h8sm4814494wmf.12.2019.06.22.12.35.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Jun 2019 12:35:04 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@google.com, Ard Biesheuvel Subject: [PATCH v2 24/26] crypto: amcc/aes - switch to AES library for GCM key derivation Date: Sat, 22 Jun 2019 21:34:25 +0200 Message-Id: <20190622193427.20336-25-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190622193427.20336-1-ard.biesheuvel@linaro.org> References: <20190622193427.20336-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org The AMCC code for GCM key derivation allocates a AES cipher to perform a single block encryption. So let's switch to the new and more lightweight AES library instead. Signed-off-by: Ard Biesheuvel --- drivers/crypto/Kconfig | 2 +- drivers/crypto/amcc/crypto4xx_alg.c | 24 +++++++------------- 2 files changed, 9 insertions(+), 17 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index b30b84089d11..c7ac1e6d23d4 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -311,7 +311,7 @@ config CRYPTO_DEV_PPC4XX depends on PPC && 4xx select CRYPTO_HASH select CRYPTO_AEAD - select CRYPTO_AES + select CRYPTO_LIB_AES select CRYPTO_CCM select CRYPTO_CTR select CRYPTO_GCM diff --git a/drivers/crypto/amcc/crypto4xx_alg.c b/drivers/crypto/amcc/crypto4xx_alg.c index 26f86fd7532b..d3660703a36c 100644 --- a/drivers/crypto/amcc/crypto4xx_alg.c +++ b/drivers/crypto/amcc/crypto4xx_alg.c @@ -536,28 +536,20 @@ static int crypto4xx_aes_gcm_validate_keylen(unsigned int keylen) static int crypto4xx_compute_gcm_hash_key_sw(__le32 *hash_start, const u8 *key, unsigned int keylen) { - struct crypto_cipher *aes_tfm = NULL; + struct crypto_aes_ctx ctx; uint8_t src[16] = { 0 }; - int rc = 0; - - aes_tfm = crypto_alloc_cipher("aes", 0, CRYPTO_ALG_NEED_FALLBACK); - if (IS_ERR(aes_tfm)) { - rc = PTR_ERR(aes_tfm); - pr_warn("could not load aes cipher driver: %d\n", rc); - return rc; - } + int rc; - rc = crypto_cipher_setkey(aes_tfm, key, keylen); + rc = aes_expandkey(&ctx, key, keylen); if (rc) { - pr_err("setkey() failed: %d\n", rc); - goto out; + pr_err("aes_expandkey() failed: %d\n", rc); + return rc; } - crypto_cipher_encrypt_one(aes_tfm, src, src); + aes_encrypt(&ctx, src, src); crypto4xx_memcpy_to_le32(hash_start, src, 16); -out: - crypto_free_cipher(aes_tfm); - return rc; + memzero_explicit(&ctx, sizeof(ctx)); + return 0; } int crypto4xx_setkey_aes_gcm(struct crypto_aead *cipher,