From patchwork Fri May 11 08:04:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 10393523 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 20C3360236 for ; Fri, 11 May 2018 08:05:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EA35D289FA for ; Fri, 11 May 2018 08:05:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAD0F28E1E; Fri, 11 May 2018 08:05:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52C5F289FA for ; Fri, 11 May 2018 08:05:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753072AbeEKIFE (ORCPT ); Fri, 11 May 2018 04:05:04 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:37320 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753051AbeEKIFC (ORCPT ); Fri, 11 May 2018 04:05:02 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 181911596; Fri, 11 May 2018 01:05:02 -0700 (PDT) Received: from sugar.benyossef.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 45AC03F53D; Fri, 11 May 2018 01:04:59 -0700 (PDT) From: Gilad Ben-Yossef To: Abdul Haleem , Herbert Xu , "David S. Miller" Cc: Ofir Drang , linux-next , Stephen Rothwell , sachinp , linuxppc-dev , linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: reorder paes test lexicographically Date: Fri, 11 May 2018 09:04:06 +0100 Message-Id: <1526025847-13134-1-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Due to a snafu "paes" testmgr tests were not ordered lexicographically, which led to boot time warnings. Reorder the tests as needed. Fixes: a794d8d ("crypto: ccree - enable support for hardware keys") Reported-by: Abdul Haleem Signed-off-by: Gilad Ben-Yossef Tested-by: Abdul Haleem Tested-by: Corentin Labbe --- crypto/testmgr.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/crypto/testmgr.c b/crypto/testmgr.c index c31da0f..b1b8ebb 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -3012,13 +3012,6 @@ static const struct alg_test_desc alg_test_descs[] = { } } }, { - /* Same as ecb(aes) except the key is stored in - * hardware secure memory which we reference by index - */ - .alg = "ecb(paes)", - .test = alg_test_null, - .fips_allowed = 1, - }, { .alg = "ecb(khazad)", .test = alg_test_skcipher, .suite = { @@ -3028,6 +3021,13 @@ static const struct alg_test_desc alg_test_descs[] = { } } }, { + /* Same as ecb(aes) except the key is stored in + * hardware secure memory which we reference by index + */ + .alg = "ecb(paes)", + .test = alg_test_null, + .fips_allowed = 1, + }, { .alg = "ecb(seed)", .test = alg_test_skcipher, .suite = { @@ -3610,21 +3610,6 @@ static const struct alg_test_desc alg_test_descs[] = { } } }, { - /* Same as xts(aes) except the key is stored in - * hardware secure memory which we reference by index - */ - .alg = "xts(paes)", - .test = alg_test_null, - .fips_allowed = 1, - }, { - .alg = "xts4096(paes)", - .test = alg_test_null, - .fips_allowed = 1, - }, { - .alg = "xts512(paes)", - .test = alg_test_null, - .fips_allowed = 1, - }, { .alg = "xts(camellia)", .test = alg_test_skcipher, .suite = { @@ -3643,6 +3628,13 @@ static const struct alg_test_desc alg_test_descs[] = { } } }, { + /* Same as xts(aes) except the key is stored in + * hardware secure memory which we reference by index + */ + .alg = "xts(paes)", + .test = alg_test_null, + .fips_allowed = 1, + }, { .alg = "xts(serpent)", .test = alg_test_skcipher, .suite = { @@ -3679,6 +3671,14 @@ static const struct alg_test_desc alg_test_descs[] = { } } }, { + .alg = "xts4096(paes)", + .test = alg_test_null, + .fips_allowed = 1, + }, { + .alg = "xts512(paes)", + .test = alg_test_null, + .fips_allowed = 1, + }, { .alg = "zlib-deflate", .test = alg_test_comp, .fips_allowed = 1,