From 15f47ce57572adaeddd763b7086e52fccc23ed7c Mon Sep 17 00:00:00 2001
From: Gilad Ben-Yossef <gilad@benyossef.com>
Date: Fri, 11 May 2018 09:04:06 +0100
Subject: [PATCH] crypto: testmgr - reorder paes test lexicographically
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 <abdhalee@linux.vnet.ibm.com>
Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com>
Tested-by: Abdul Haleem <abdhalee@linux.vnet.ibm.com>
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---
crypto/testmgr.c | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index c31da0f3f6804..b1b8ebb9c3b6c 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -3011,13 +3011,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,
@@ -3027,6 +3020,13 @@ static const struct alg_test_desc alg_test_descs[] = {
.dec = __VECS(khazad_dec_tv_template)
}
}
+ }, {
+ /* 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,
@@ -3609,21 +3609,6 @@ static const struct alg_test_desc alg_test_descs[] = {
.dec = __VECS(aes_xts_dec_tv_template)
}
}
- }, {
- /* 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,
@@ -3642,6 +3627,13 @@ static const struct alg_test_desc alg_test_descs[] = {
.dec = __VECS(cast6_xts_dec_tv_template)
}
}
+ }, {
+ /* 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,
@@ -3678,6 +3670,14 @@ static const struct alg_test_desc alg_test_descs[] = {
.dec = __VECS(tf_xts_dec_tv_template)
}
}
+ }, {
+ .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,
--
GitLab