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: 135511 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp555211lji; Fri, 11 May 2018 01:05:08 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpd8DUeA956Ib4CVyisYG52so/IBxemNw+eyqIDPiU2SYifHKHwdxH8RXIbDdsnWUDLBRbY X-Received: by 2002:a63:9846:: with SMTP id l6-v6mr3607111pgo.217.1526025908152; Fri, 11 May 2018 01:05:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526025908; cv=none; d=google.com; s=arc-20160816; b=HkfDNFYwoprh9yLx05e7dIjigKYp0Q5ytBGDunyZgDUP5tvTlF7dnB0kjNVmJurIIO sJ/f0IoAvtj4z1iJlHhadeSunitL0kTiOFBJT0D1X79A8Y9270nQ1+URx08v8A6KxbIk Pu1goOVZiI0NtU15fc0c7HFVHPgJwmL6cKCch4tvwlK80feAg+kZKysIfEs1D/6CNQdg fzNFr6c8XUt6KufaLn8LgddWuYG+vqjWi/YhpI3VRC/EMw2X/4ZNuQZgcfNXCOp4l3pn YTen7Ywz1WDuH5OMove0CvyZV6XQ8THVZ55u/0/Fl76f+7jLk8C59C4SlLt8iogqC+jH X/vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=0h3mXVOT1rQa/InrKtQctkSlD5c18OylNL8pFABDaC8=; b=VnqB1TDKHAqiINKK9Ismo25OOW1yNK/VqkATdxMvJuDTkJuopZsdQC6wic0lftV1mK eRvwb9QnwWFy1Vp0GB0iaqfRw8cbvJU3FqLPLrQPgsCJTYBgyoBJow1zgWHeVGEfdNKk 02gqJcTe4N1VvkZsPwLz4sipcWyb5VZDUKKqBbmN6mILS2Q0dKEeP0WNdCoVY/4Oqchl 7+b6UmG+ltz1JPZ79X0q58HFybGn929+T9SkqriTHy7x7jckM1ossbMYjjvcSx9OskC3 F5f5UuwQIGGSkIBTsi5R0SZ1qcS9HPkXBbjctQbMQNjfNzR2BLee0c5DNBNp+koGJGQT tQpA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 31-v6si2565394plj.101.2018.05.11.01.05.07; Fri, 11 May 2018 01:05: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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753072AbeEKIFE (ORCPT + 1 other); 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 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 --- crypto/testmgr.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) -- 2.7.4 Tested-by: Corentin Labbe 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,