From patchwork Thu Jun 27 10:26:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 167905 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp2148536ilk; Thu, 27 Jun 2019 03:28:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqzzDVGC/kWlyEB8Xa6yCiWK7ol7VJGTAo/P7B/4Gpx1MfSo05ruVwyyQLfNjG4fQzcea0d/ X-Received: by 2002:a65:63cd:: with SMTP id n13mr3055471pgv.153.1561631283522; 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=BE2oYlxdm7PB35BjXpQYwLeqlUgqX4m3o2IH+au65taiecG/6HXH/968XeUX7oInYY L/+qqmMeYzL+qcWLpUJiMDBJsTZAi5FFU+YMuFaEpEnurZBacC0n27KWRBQ149dL9tlA 5OSD4RJsXjSfK08zTW6+f6hF4woHmiv1jQGbFnvXsaxyOmnnuTfF9M46T5hLF841MsbE xm9bXsMUdDnsfxtBwT0zxAzD7YF6t6ahav1W/erlxnCzMnPoafX1QYlkGqAbTvOKg1eZ 1V8Mjqnl/H8LgjgzBSL/Zqe69feY0Rch9F2P0fdbeVtmKg+X9oLEwlLy8WAoCMbwpCo6 eyhw== 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=lQLA1Z6u9tD3If/MHOVikbtefg1FLPAfk8jJsqm/d/c=; b=BWw1O4jr3HBshWRVoR5juGdE0jKn7VhiJRjyN0Av+LY3PYp4G4+3P3fNy9NGX8tJmm 4CgJc1UklOrVDLDxclkBxQgnZbMQOtVCJqUZTBlj1/yb5Pd9dOwHTYC8CP/qX9k/NYL3 xEd7zH/7ydA0UeNQzSACbF2gjyjbfn74wKFMjTQt4ZgbiUAfxIjMcwCJYk1OgZLfi73Y KDu7RCLk5Z+dEqGWfge0kMmnAvVwd67gD1sg+ttA2e1ni7ywRtJi1iDRTskVzAGZRyMh rrs+0R3TGtfEihlT9JG8Xl1U6ug31J0CnbPAJfLsm21pIGVrYNDoRKkuMGkY5WDDygwh PdyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lxLzt3NF; 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=lxLzt3NF; 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 S1726668AbfF0K2C (ORCPT + 3 others); Thu, 27 Jun 2019 06:28:02 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:46507 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726664AbfF0K2C (ORCPT ); Thu, 27 Jun 2019 06:28:02 -0400 Received: by mail-wr1-f65.google.com with SMTP id n4so1887287wrw.13 for ; Thu, 27 Jun 2019 03:28:00 -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=lQLA1Z6u9tD3If/MHOVikbtefg1FLPAfk8jJsqm/d/c=; b=lxLzt3NFRfs6f4epK37Ltp6P42+8nW+jSteVOJmx+PVMzF8CiB0qq1PuFWKxbSE/Gz FWaVyiOebaq0oEA4LaB4G04SPBXm7uaOzewDGxwEcfb5DOYkbmA76+qfjMBBThUVl10C 4sJi0XWZECubmCmdvalGxqbAGptUz21vuN6EUEzPrvTsndZrvkSDbMwriQnirl2C5G12 U6ZnRSmLg9Ai8o4r4NW6vilB9Qs0JckXVQwq1Iv2XNrjo6i+wF8vLV4R8S+EFVA8AmFe 5Wam4ah9cVv0haFjoR6rlLgeB4uJPhSbZ7JGhj4sBvLAOI08ZnGFrniADZMgFuttDpan jpIg== 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=lQLA1Z6u9tD3If/MHOVikbtefg1FLPAfk8jJsqm/d/c=; b=JFb/JtTmAx3EHuYSjJIM/OUmhOo1tadJETOL5eLX1c/x6gEUixMuJY0jjDxyuBWudJ 7QvbqjWtfb0z3g9y6IpyD7uE/k4yo8iEJw4n8iAVdRPlepd/rnWJFe10Ul+1OBZpFBRJ SOYvv++xwqdB5CLHnDqxa3AJHYJvCcW95ZZ1sW7mMJBzkIMSaIKhBntFmCLEtUIjRHns 7sgiVoa3ADKad6neaw43guMF03Ebv8gnlP85BiHT9b5Yh/CvoJlDxac2rXEcE30GrM/C I0hgDgQqAA/NhhGU6uG1FKHsPCMGgFzg+IT+D+JLkP0DL8y1Dwgr3QmeH1ZqumTe6jE0 s3zw== X-Gm-Message-State: APjAAAW7hvoXpC/v31t2GjxH7FfLde/0L4W1dcvBXGi6GbWZKLT66a8X pnAjIimkEG7Uw3qwiFgbdbmWs+e4Hbc= X-Received: by 2002:a5d:5745:: with SMTP id q5mr2798134wrw.75.1561631279558; Thu, 27 Jun 2019 03:27:59 -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.58 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 27 Jun 2019 03:27:58 -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 08/32] crypto: cesa/aes - switch to library version of key expansion routine Date: Thu, 27 Jun 2019 12:26:23 +0200 Message-Id: <20190627102647.2992-9-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/marvell/cipher.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 3fca5f7e38f0..fdccadc94819 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -213,7 +213,7 @@ config CRYPTO_CRC32_S390 config CRYPTO_DEV_MARVELL_CESA tristate "Marvell's Cryptographic Engine driver" depends on PLAT_ORION || ARCH_MVEBU - select CRYPTO_AES + select CRYPTO_LIB_AES select CRYPTO_DES select CRYPTO_BLKCIPHER select CRYPTO_HASH diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c index 2fd936b19c6d..debe7d9f00ae 100644 --- a/drivers/crypto/marvell/cipher.c +++ b/drivers/crypto/marvell/cipher.c @@ -257,7 +257,7 @@ static int mv_cesa_aes_setkey(struct crypto_skcipher *cipher, const u8 *key, int ret; int i; - ret = crypto_aes_expand_key(&ctx->aes, key, len); + ret = aes_expandkey(&ctx->aes, key, len); if (ret) { crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN); return ret;