Commit 15f47ce5 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Herbert Xu
Browse files

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: a794d8d8 ("crypto: ccree - enable support for hardware keys")
Reported-by: default avatarAbdul Haleem <abdhalee@linux.vnet.ibm.com>
Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Tested-by: default avatarAbdul Haleem <abdhalee@linux.vnet.ibm.com>
Tested-by: default avatarCorentin Labbe <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4c826fed

crypto/testmgr.c

+22 −22
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE