From patchwork Thu Jun 27 10:26:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 167904 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2148520ilk; Thu, 27 Jun 2019 03:28:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqyFGDKKGzBPR1J0UxgObqOlItLTNdq6C0HBsittg1lC0DGgFOl4p0S+hFS6GZF4UohVsFF6 X-Received: by 2002:a65:498f:: with SMTP id r15mr3186741pgs.37.1561631282822; Thu, 27 Jun 2019 03:28:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561631282; cv=none; d=google.com; s=arc-20160816; b=BALH03pEcMER8S4l4hVpt7K7oLIZR+yR8LDs0AhPMV32FYQed4VdWdxQKL3ODB9gH/ q2YPnbwY8ZgxY85HKz9DlwOi1JgZ+pZYJ1vl3+QWPIo4lqBq6J4pLsP+3/Jp8KA0C321 l5Zv8iPTNMHoU7SmeMuoPLUJxH8aIAAjjbYEOhjmILPKZ2vAo0tA4wB//n+AukogNOV2 nBy9mrPN8zL2XpYGTkN1y2/cbSCsH0/sR5e+2+rVDwCvjP1+KEKo54clcTNFAETc/uUx xZ9sBxrta46aCY196z+7CpuHzf6xfP+JIcD2OiEI2saBSMAAGgqFLU1i+4NGD5zuiHP1 g1kw== 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=QMunKwfP+ecJeJsjLgotGX9cYxNfDTWVUzGiozUxkpA=; b=fsPfeOjnH8GTs+urpqwbKJEizTMU5BVa4GUkr/PCrm7mxOr4O/63eiMlqdvdWP7XEk NSR1/rMqrbeuONuQ/hEKkoudJm3Y8vSA34LCEL9NSnN8vePtwjPQAws8pXYk6K5UogD1 NwvBS6RfLEC8fwKMbvkQEKwRTWBx4mAxNivPXYPljVLyJLs9U0smKuhhxD5uufdrL2+F DdgC2z4kAnoir7D9YSQ7c8fpLZgdrryNn42k8E+2Vv7Lj+fl9vNexBisPTJ+o4ZgE4D2 CTOQa5pnOoYHe8MxZrOBYOkIvk/bg0B/POVXn3EclLzNdFfQK5jsDpOoCkpQ2OwdiYlP aiLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uLHuagjD; 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 f32si4829522pjg.42.2019.06.27.03.28.02; Thu, 27 Jun 2019 03:28:02 -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=uLHuagjD; 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 S1726605AbfF0K2B (ORCPT + 3 others); Thu, 27 Jun 2019 06:28:01 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:39891 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726659AbfF0K2A (ORCPT ); Thu, 27 Jun 2019 06:28:00 -0400 Received: by mail-wr1-f66.google.com with SMTP id x4so1917535wrt.6 for ; Thu, 27 Jun 2019 03:27:59 -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=QMunKwfP+ecJeJsjLgotGX9cYxNfDTWVUzGiozUxkpA=; b=uLHuagjDQQCYBBnoMEamxGqV4L4MCtbHGa83HxXpNaJVcUgZEpyvA/9DfVcmy95RKl onsUCiWAVXeD/O9pB7EWYxkwoja8E5JbzKdmkpea44TZ9GjvS8U3bD559XIAFXnnhGJ8 JQwckJYgoMFq4K1uxkE4RvYShHHMDglwCvpqUGiCKeKn+F0zBRIybLLcjXdr3tFcxgp4 pGI3N/truUTGhQP+3PnOcNc4xy7FdRywzMQifzuSeNSNTDlauRO64F2fvQkoYhGwGPgD oAx4/THjaLTeJ176idpaP2bo5DdA1xYiehkLPfONRMDBEFz4GXJn6v6RtgkHnUfNs2fF rFaw== 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=QMunKwfP+ecJeJsjLgotGX9cYxNfDTWVUzGiozUxkpA=; b=HQTsUxUEp1x0tax1AnPjQv9a+zRExKWrMtRSbgOO71iRvlhoGTk6gQB/bYAwf+oFia t0pOb5JM6CvLUww1uhZYpGFUs9L7pv3BAZXU+zhJrxRJNkvz9vI+X7Zdf/29igxuKtaH Nv4bHsoKStHxLNw8JfoX20qVDt17kz5CWsd0My6gMTrAZ5QeN9T2wLKMut+0KW3nsYOa 17AexzlXDsXrSZLNKVcmetBmSiLRUQ+K5rlnOxdtH8IWTia7MHLCc1pefxkQyVQ6muoM J0b8lFQJ3YmCxYLIWzHXWK67opN5XnNuCPk2OFQmEpZhnMt4ump54KVh9J08avNiWLVa 5sfw== X-Gm-Message-State: APjAAAVC+YqCr9XFq3UcYV7FWbSraSelS3WVy2U+HEGw4qa/UbKzSMTa zoUk5wcXljHFVgpAOl9qqfzpvxm4sd0= X-Received: by 2002:a05:6000:11c2:: with SMTP id i2mr2723893wrx.199.1561631278266; Thu, 27 Jun 2019 03:27:58 -0700 (PDT) Received: from localhost.localdomain (aaubervilliers-681-1-8-173.w90-88.abo.wanadoo.fr. [90.88.13.173]) by smtp.gmail.com with ESMTPSA id g2sm5584533wmh.0.2019.06.27.03.27.57 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 03:27:57 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org Cc: herbert@gondor.apana.org.au, ebiggers@kernel.org, Ard Biesheuvel Subject: [PATCH v3 07/32] crypto: padlock/aes - switch to library version of key expansion routine Date: Thu, 27 Jun 2019 12:26:22 +0200 Message-Id: <20190627102647.2992-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627102647.2992-1-ard.biesheuvel@linaro.org> References: <20190627102647.2992-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 Switch to the new AES library that also provides an implementation of the AES key expansion routine. This removes the dependency on the generic AES cipher, allowing it to be omitted entirely in the future. Signed-off-by: Ard Biesheuvel --- drivers/crypto/Kconfig | 2 +- drivers/crypto/padlock-aes.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 67af688d7d84..3fca5f7e38f0 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -26,7 +26,7 @@ config CRYPTO_DEV_PADLOCK_AES tristate "PadLock driver for AES algorithm" depends on CRYPTO_DEV_PADLOCK select CRYPTO_BLKCIPHER - select CRYPTO_AES + select CRYPTO_LIB_AES help Use VIA PadLock for AES algorithm. diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index 854539512c35..af90138eddb7 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c @@ -144,7 +144,7 @@ static int aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, ctx->cword.encrypt.keygen = 1; ctx->cword.decrypt.keygen = 1; - if (crypto_aes_expand_key(&gen_aes, in_key, key_len)) { + if (aes_expandkey(&gen_aes, in_key, key_len)) { *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; return -EINVAL; }