diff options
| author | Gilad Ben-Yossef <gilad@benyossef.com> | 2018-05-11 09:04:06 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-05-19 00:13:57 +0800 |
| commit | 15f47ce57572adaeddd763b7086e52fccc23ed7c (patch) | |
| tree | a79c5f37dd4fba44d0ac41e7d6561ea4d7c10df4 /crypto | |
| parent | 4c826fed675dfffd8485c5477b616d61d1ec9e9a (diff) | |
| download | linux-0-day-15f47ce57572adaeddd763b7086e52fccc23ed7c.tar.gz linux-0-day-15f47ce57572adaeddd763b7086e52fccc23ed7c.tar.xz | |
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>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/testmgr.c | 44 |
1 files 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 @@ -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, |