diff options
Diffstat (limited to 'crypto/testmgr.c')
| -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 c31da0f3f680..b1b8ebb9c3b6 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c | |||
| @@ -3012,13 +3012,6 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
| 3012 | } | 3012 | } |
| 3013 | } | 3013 | } |
| 3014 | }, { | 3014 | }, { |
| 3015 | /* Same as ecb(aes) except the key is stored in | ||
| 3016 | * hardware secure memory which we reference by index | ||
| 3017 | */ | ||
| 3018 | .alg = "ecb(paes)", | ||
| 3019 | .test = alg_test_null, | ||
| 3020 | .fips_allowed = 1, | ||
| 3021 | }, { | ||
| 3022 | .alg = "ecb(khazad)", | 3015 | .alg = "ecb(khazad)", |
| 3023 | .test = alg_test_skcipher, | 3016 | .test = alg_test_skcipher, |
| 3024 | .suite = { | 3017 | .suite = { |
| @@ -3028,6 +3021,13 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
| 3028 | } | 3021 | } |
| 3029 | } | 3022 | } |
| 3030 | }, { | 3023 | }, { |
| 3024 | /* Same as ecb(aes) except the key is stored in | ||
| 3025 | * hardware secure memory which we reference by index | ||
| 3026 | */ | ||
| 3027 | .alg = "ecb(paes)", | ||
| 3028 | .test = alg_test_null, | ||
| 3029 | .fips_allowed = 1, | ||
| 3030 | }, { | ||
| 3031 | .alg = "ecb(seed)", | 3031 | .alg = "ecb(seed)", |
| 3032 | .test = alg_test_skcipher, | 3032 | .test = alg_test_skcipher, |
| 3033 | .suite = { | 3033 | .suite = { |
| @@ -3610,21 +3610,6 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
| 3610 | } | 3610 | } |
| 3611 | } | 3611 | } |
| 3612 | }, { | 3612 | }, { |
| 3613 | /* Same as xts(aes) except the key is stored in | ||
| 3614 | * hardware secure memory which we reference by index | ||
| 3615 | */ | ||
| 3616 | .alg = "xts(paes)", | ||
| 3617 | .test = alg_test_null, | ||
| 3618 | .fips_allowed = 1, | ||
| 3619 | }, { | ||
| 3620 | .alg = "xts4096(paes)", | ||
| 3621 | .test = alg_test_null, | ||
| 3622 | .fips_allowed = 1, | ||
| 3623 | }, { | ||
| 3624 | .alg = "xts512(paes)", | ||
| 3625 | .test = alg_test_null, | ||
| 3626 | .fips_allowed = 1, | ||
| 3627 | }, { | ||
| 3628 | .alg = "xts(camellia)", | 3613 | .alg = "xts(camellia)", |
| 3629 | .test = alg_test_skcipher, | 3614 | .test = alg_test_skcipher, |
| 3630 | .suite = { | 3615 | .suite = { |
| @@ -3643,6 +3628,13 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
| 3643 | } | 3628 | } |
| 3644 | } | 3629 | } |
| 3645 | }, { | 3630 | }, { |
| 3631 | /* Same as xts(aes) except the key is stored in | ||
| 3632 | * hardware secure memory which we reference by index | ||
| 3633 | */ | ||
| 3634 | .alg = "xts(paes)", | ||
| 3635 | .test = alg_test_null, | ||
| 3636 | .fips_allowed = 1, | ||
| 3637 | }, { | ||
| 3646 | .alg = "xts(serpent)", | 3638 | .alg = "xts(serpent)", |
| 3647 | .test = alg_test_skcipher, | 3639 | .test = alg_test_skcipher, |
| 3648 | .suite = { | 3640 | .suite = { |
| @@ -3679,6 +3671,14 @@ static const struct alg_test_desc alg_test_descs[] = { | |||
| 3679 | } | 3671 | } |
| 3680 | } | 3672 | } |
| 3681 | }, { | 3673 | }, { |
| 3674 | .alg = "xts4096(paes)", | ||
| 3675 | .test = alg_test_null, | ||
| 3676 | .fips_allowed = 1, | ||
| 3677 | }, { | ||
| 3678 | .alg = "xts512(paes)", | ||
| 3679 | .test = alg_test_null, | ||
| 3680 | .fips_allowed = 1, | ||
| 3681 | }, { | ||
| 3682 | .alg = "zlib-deflate", | 3682 | .alg = "zlib-deflate", |
| 3683 | .test = alg_test_comp, | 3683 | .test = alg_test_comp, |
| 3684 | .fips_allowed = 1, | 3684 | .fips_allowed = 1, |
