From patchwork Thu Jun 27 10:26:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 167906 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2148550ilk; Thu, 27 Jun 2019 03:28:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqwqIEzo30gJZ0sDuFbD1w6idikRbe3vqARwOBhBD3Zb/yiMt+Y9DgVwXi6wNjcIk6OxmHIV X-Received: by 2002:a17:90a:601:: with SMTP id j1mr5088125pjj.96.1561631283910; Thu, 27 Jun 2019 03:28:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561631283; cv=none; d=google.com; s=arc-20160816; b=hB6WyOlRru5BRwv2iiZRWd6zV4MyIvkjg7+85nY3p5tS/yE2r0cyki884ufcECf1p6 6mj6hXxHSUGucXQSk9XzY3WDHaynC7qjJa+HwuOOPmtME6iDQhDfdpjQGosdUFHJ6c8E DNARTqu8JRyVKqS9aISta1bLZwerI77EH58BxSwNxQjjgDM51erla7xeZM8bvo5N8pNk 5a3vxP0wdUH22u0zZuihNiFH2EXMML9bduqNk+pHRtUBDVimXvmh8ByOlzhwjJ2VyP8E 5djnNCZhQHYzgZWr7C8fwGJfDBfzgV1d2T2kI7k6yk8XN2xSQJJOnRTuGnio6knwI6vr MlzA== 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=TEkyEzYA9z24dLcVZzAphhOs6uMPB3TRScCj5mulxhM=; b=GQ0txNXmzLt1JMfHgWTuRn79fJ3W4TWbe7FGhtvu+NotDnBRL86h8RkCm5VWVTgftY r7k18qcE0GdsY7K9Nc3C+UQzBDCHCBjkYjDCF+Ghe3Yr3s4qkiHi/tfU7SfeNmM0M/CL e3JRelx5TAWeMNO6z/hBucqnW/UUb4ly3d2xZb1p1g5VXqi5mRkSkzPqXjABbVQRXf4g mKG0d/4EE1h0GzLpomo72UNvpNatIayRzCOBnQBPZUBsp23TdmwHyQp1+KFF/BmgJQew lMMvSQ4PpJTlYUg/dlJ2bPNnfU/yYqEXTPChHoF6+T4TSEy2Rnj71BACpnMQKyeml8Bl aAOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F0Qzyeux; 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.03; Thu, 27 Jun 2019 03:28:03 -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=F0Qzyeux; 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 S1726664AbfF0K2D (ORCPT + 3 others); Thu, 27 Jun 2019 06:28:03 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44949 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726659AbfF0K2C (ORCPT ); Thu, 27 Jun 2019 06:28:02 -0400 Received: by mail-wr1-f68.google.com with SMTP id r16so49154wrl.11 for ; Thu, 27 Jun 2019 03:28:01 -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=TEkyEzYA9z24dLcVZzAphhOs6uMPB3TRScCj5mulxhM=; b=F0Qzyeux+dCKngRehSdIDngCe+wHs5fNOoDW3q126dSrSAGOF270GYPZwYhrga9cBy mx/RvqAXRoHBNEc2bz2kuKB7eQjog1PHAukgcxKr8QoiFDwnQQpQbZG6tqMu9Zw/+pKy vE7Fi4EanxaBgLFcLkIVyDgktm+w7S81STdQ1yGvoqdZ72SirCamZPeUFd7q0ejBpSCK HsGEDn4cc7KQRlnaJIpQvxO2q+Ha77KaTfpLbqVgfFPOrNPSfZTCMhKawDCw8p9yEjap NzvOGCriAYL0nYiCaz1zoCkjbDwb9uUq1G8VP7I+6Iv0oNc39g57S4JrEBv24/KaNYmc V2wQ== 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=TEkyEzYA9z24dLcVZzAphhOs6uMPB3TRScCj5mulxhM=; b=GToyu3lokOoe9WccP+uLJ7Fr2vQn0JBjsUoD0skqTI3uT0/w7KEt4W7tYcqFOaLv+2 BVFY5hekwuBMWSlFxwJAulrf0kskKd9MegMBw1wiVvrmt+itBSQUpKY05agwjJaByvVc p1Oacs3anenRUke9//+ORTyh6j/GnbSHSad+cw3Y2DIleEOVcd6u+CE1Mb0kuemNU7xu 70orcMmJtUh8bpKk8z15GiBJQuw6U2WioYs3ySAe1ZJRG+bFJIJ/EI1HsQtcLot1ihZr dZADcqy7P4QFMvU63hVvu09ID6d+o+PLfPmms1S7J/+a2HoKXWIlsZQuKjY9L60j5lbO B1AQ== X-Gm-Message-State: APjAAAXF5FZvdqpWg/NnS81g3YVpBQRFq3NtFsI54bV+gwQIcMhciNOt OilNJVwma2FDqo+J+Oe0ZNwZe1p0NGg= X-Received: by 2002:a5d:63c9:: with SMTP id c9mr2802409wrw.81.1561631280581; Thu, 27 Jun 2019 03:28:00 -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.59 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 03:27:59 -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 09/32] crypto: safexcel/aes - switch to library version of key expansion routine Date: Thu, 27 Jun 2019 12:26:24 +0200 Message-Id: <20190627102647.2992-10-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/inside-secure/safexcel_cipher.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index fdccadc94819..b30b84089d11 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -718,7 +718,7 @@ config CRYPTO_DEV_SAFEXCEL tristate "Inside Secure's SafeXcel cryptographic engine driver" depends on OF depends on (ARM64 && ARCH_MVEBU) || (COMPILE_TEST && 64BIT) - select CRYPTO_AES + select CRYPTO_LIB_AES select CRYPTO_AUTHENC select CRYPTO_BLKCIPHER select CRYPTO_DES diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c index 8cdbdbe35681..19ec086dce4f 100644 --- a/drivers/crypto/inside-secure/safexcel_cipher.c +++ b/drivers/crypto/inside-secure/safexcel_cipher.c @@ -178,7 +178,7 @@ static int safexcel_skcipher_aes_setkey(struct crypto_skcipher *ctfm, struct crypto_aes_ctx aes; int ret, i; - ret = crypto_aes_expand_key(&aes, key, len); + ret = aes_expandkey(&aes, key, len); if (ret) { crypto_skcipher_set_flags(ctfm, CRYPTO_TFM_RES_BAD_KEY_LEN); return ret;