diff options
author | James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
---|---|---|
committer | James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
commit | 7ff17fe228094bad025c79c39e9e23af4364644c (patch) | |
tree | 05dc0dd252df9b5e3ed8e4429dc5f31c070e0f23 /crypto/testmgr.c | |
parent | 7271e588c712517a184f75744b6e94d05c8251a4 (diff) | |
parent | 9b882a6a998381cc1ea34edef55b8a6315114b7b (diff) | |
download | linux-crypto-7ff17fe228094bad025c79c39e9e23af4364644c.tar.gz linux-crypto-7ff17fe228094bad025c79c39e9e23af4364644c.zip |
Merge tag 'v5.0-rc1' into next-general
Linux 5.0-rc1
Sync to pick up LSM stacking work (which is based on -rc1).
Diffstat (limited to 'crypto/testmgr.c')
-rw-r--r-- | crypto/testmgr.c | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/crypto/testmgr.c b/crypto/testmgr.c index b1f79c6b..0f684a41 100644 --- a/crypto/testmgr.c +++ b/crypto/testmgr.c @@ -2404,6 +2404,18 @@ static int alg_test_null(const struct alg_test_desc *desc, /* Please keep this list sorted by algorithm name. */ static const struct alg_test_desc alg_test_descs[] = { { + .alg = "adiantum(xchacha12,aes)", + .test = alg_test_skcipher, + .suite = { + .cipher = __VECS(adiantum_xchacha12_aes_tv_template) + }, + }, { + .alg = "adiantum(xchacha20,aes)", + .test = alg_test_skcipher, + .suite = { + .cipher = __VECS(adiantum_xchacha20_aes_tv_template) + }, + }, { .alg = "aegis128", .test = alg_test_aead, .suite = { @@ -2691,6 +2703,13 @@ static const struct alg_test_desc alg_test_descs[] = { } } }, { + .alg = "cfb(aes)", + .test = alg_test_skcipher, + .fips_allowed = 1, + .suite = { + .cipher = __VECS(aes_cfb_tv_template) + }, + }, { .alg = "chacha20", .test = alg_test_skcipher, .suite = { @@ -2805,6 +2824,7 @@ static const struct alg_test_desc alg_test_descs[] = { }, { .alg = "cts(cbc(aes))", .test = alg_test_skcipher, + .fips_allowed = 1, .suite = { .cipher = __VECS(cts_mode_tv_template) } @@ -3185,6 +3205,18 @@ static const struct alg_test_desc alg_test_descs[] = { .hash = __VECS(hmac_sha512_tv_template) } }, { + .alg = "hmac(streebog256)", + .test = alg_test_hash, + .suite = { + .hash = __VECS(hmac_streebog256_tv_template) + } + }, { + .alg = "hmac(streebog512)", + .test = alg_test_hash, + .suite = { + .hash = __VECS(hmac_streebog512_tv_template) + } + }, { .alg = "jitterentropy_rng", .fips_allowed = 1, .test = alg_test_null, @@ -3292,6 +3324,12 @@ static const struct alg_test_desc alg_test_descs[] = { } } }, { + .alg = "nhpoly1305", + .test = alg_test_hash, + .suite = { + .hash = __VECS(nhpoly1305_tv_template) + } + }, { .alg = "ofb(aes)", .test = alg_test_skcipher, .fips_allowed = 1, @@ -3497,6 +3535,18 @@ static const struct alg_test_desc alg_test_descs[] = { .hash = __VECS(sm3_tv_template) } }, { + .alg = "streebog256", + .test = alg_test_hash, + .suite = { + .hash = __VECS(streebog256_tv_template) + } + }, { + .alg = "streebog512", + .test = alg_test_hash, + .suite = { + .hash = __VECS(streebog512_tv_template) + } + }, { .alg = "tgr128", .test = alg_test_hash, .suite = { @@ -3545,6 +3595,18 @@ static const struct alg_test_desc alg_test_descs[] = { .hash = __VECS(aes_xcbc128_tv_template) } }, { + .alg = "xchacha12", + .test = alg_test_skcipher, + .suite = { + .cipher = __VECS(xchacha12_tv_template) + }, + }, { + .alg = "xchacha20", + .test = alg_test_skcipher, + .suite = { + .cipher = __VECS(xchacha20_tv_template) + }, + }, { .alg = "xts(aes)", .test = alg_test_skcipher, .fips_allowed = 1, |