diff --git a/stress-af-alg-defconfigs.h b/stress-af-alg-defconfigs.h
index 56bf7e8da..17451246a 100644
--- a/stress-af-alg-defconfigs.h
+++ b/stress-af-alg-defconfigs.h
@@ -1,25 +1,44 @@
 { .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "aegis128",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(md5),ecb(cipher_null))",	.block_size = 1,	.max_auth_size = 16 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha1),cbc(aes))",	.block_size = 16,	.max_auth_size = 20,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha1),cbc(des))",	.block_size = 8,	.max_auth_size = 20,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha1),cbc(des3_ede))",	.block_size = 8,	.max_auth_size = 20,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha1),ecb(cipher_null))",	.block_size = 1,	.max_auth_size = 20 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha224),cbc(des))",	.block_size = 8,	.max_auth_size = 28,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha224),cbc(des3_ede))",	.block_size = 8,	.max_auth_size = 28,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha256),cbc(des))",	.block_size = 8,	.max_auth_size = 32,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha256),cbc(des3_ede))",	.block_size = 8,	.max_auth_size = 32,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha384),cbc(des))",	.block_size = 8,	.max_auth_size = 48,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha384),cbc(des3_ede))",	.block_size = 8,	.max_auth_size = 48,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha512),cbc(des))",	.block_size = 8,	.max_auth_size = 64,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "authenc(hmac(sha512),cbc(des3_ede))",	.block_size = 8,	.max_auth_size = 64,	.iv_size = 8 },
 { .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "aegis128l",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 16 },
 { .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "aegis256",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 32 },
 { .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "ccm(aes)",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "ccm(sm4)",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 16 },
 { .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "gcm(aes)",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 12 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "gcm(aria)",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 12 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "gcm(sm4)",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 12 },
 { .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "morus1280",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 16 },
 { .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "morus640",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 16 },
 { .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "rfc4106(gcm(aes))",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "rfc4309(ccm(aes))",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_AEAD, .type = "aead", .name = "rfc4543(gcm(aes))",	.block_size = 1,	.max_auth_size = 16,	.iv_size = 8 },
 { .crypto_type = CRYPTO_AHASH, .type = "ahash", .name = "ghash",	.block_size = 16,	.digest_size = 16 },
 { .crypto_type = CRYPTO_AKCIPHER, .type = "akcipher", .name = "ecrdsa" },
 { .crypto_type = CRYPTO_AKCIPHER, .type = "akcipher", .name = "pkcs1pad(rsa,sha256)" },
 { .crypto_type = CRYPTO_AKCIPHER, .type = "akcipher", .name = "pkcs1pad(rsa,sha512)" },
 { .crypto_type = CRYPTO_AKCIPHER, .type = "akcipher", .name = "rsa" },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "aes",	.block_size = 16,	.max_key_size = 32 },
+{ .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "aria",	.block_size = 16,	.max_key_size = 32 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "anubis",	.block_size = 16,	.max_key_size = 40 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "blowfish",	.block_size = 8,	.max_key_size = 56 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "camellia",	.block_size = 16,	.max_key_size = 32 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "cast5",	.block_size = 8,	.max_key_size = 16 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "cast6",	.block_size = 16,	.max_key_size = 32 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "cipher_null",	.block_size = 1 },
-{ .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "des3_ede",	.block_size = 8,	.max_key_size = 24 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "des",	.block_size = 8,	.max_key_size = 8 },
+{ .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "des3_ede",	.block_size = 8,	.max_key_size = 24 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "fcrypt",	.block_size = 8,	.max_key_size = 8 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "khazad",	.block_size = 8,	.max_key_size = 16 },
 { .crypto_type = CRYPTO_CIPHER, .type = "cipher", .name = "seed",	.block_size = 16,	.max_key_size = 16 },
@@ -38,7 +57,10 @@
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "blake2b-384",	.block_size = 128,	.digest_size = 48 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "blake2b-512",	.block_size = 128,	.digest_size = 64 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "cbcmac(aes)",	.block_size = 1,	.digest_size = 16 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "cbcmac(sm4)",	.block_size = 1,	.digest_size = 16 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "cmac(aes)",	.block_size = 16,	.digest_size = 16 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "cmac(des3_ede)",	.block_size = 8,	.digest_size = 8 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "cmac(sm4)",	.block_size = 16,	.digest_size = 16 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "crc32",	.block_size = 1,	.digest_size = 4 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "crc32c",	.block_size = 1,	.digest_size = 4 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "crc64-rocksoft",	.block_size = 1,	.digest_size = 8 },
@@ -46,8 +68,18 @@
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "digest_null",	.block_size = 1 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "ghash",	.block_size = 16,	.digest_size = 16 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(md5)",	.block_size = 64,	.digest_size = 16 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(rmd160)",	.block_size = 64,	.digest_size = 20 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(sha1)",	.block_size = 64,	.digest_size = 20 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(sha224)",	.block_size = 64,	.digest_size = 28 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(sha256)",	.block_size = 64,	.digest_size = 32 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(sha3-224)",	.block_size = 144,	.digest_size = 28 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(sha3-256)",	.block_size = 136,	.digest_size = 32 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(sha3-384)",	.block_size = 104,	.digest_size = 48 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(sha3-512)",	.block_size = 72,	.digest_size = 64 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(sha384)",	.block_size = 128,	.digest_size = 48 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(sha512)",	.block_size = 128,	.digest_size = 64 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(streebog256)",	.block_size = 64,	.digest_size = 32 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "hmac(streebog512)",	.block_size = 64,	.digest_size = 64 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "md4",	.block_size = 64,	.digest_size = 16 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "md5",	.block_size = 64,	.digest_size = 16 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "michael_mic",	.block_size = 8,	.digest_size = 8 },
@@ -70,44 +102,67 @@
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "sm3",	.block_size = 64,	.digest_size = 32 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "streebog256",	.block_size = 64,	.digest_size = 32 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "streebog512",	.block_size = 64,	.digest_size = 64 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "vmac64(aes)",	.block_size = 16,	.digest_size = 8 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "tgr128",	.block_size = 64,	.digest_size = 16 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "tgr160",	.block_size = 64,	.digest_size = 20 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "tgr192",	.block_size = 64,	.digest_size = 24 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "wp256",	.block_size = 64,	.digest_size = 32 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "wp384",	.block_size = 64,	.digest_size = 48 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "wp512",	.block_size = 64,	.digest_size = 64 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "xcbc(aes)",	.block_size = 16,	.digest_size = 16 },
+{ .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "xcbc(sm4)",	.block_size = 16,	.digest_size = 16 },
 { .crypto_type = CRYPTO_SHASH, .type = "shash", .name = "xxhash64",	.block_size = 32,	.digest_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(aes)",	.block_size = 16,	.max_key_size = 32,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(aria)",	.block_size = 16,	.max_key_size = 32,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(blowfish)",	.block_size = 8,	.max_key_size = 56,	.iv_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(camellia)",	.block_size = 16,	.max_key_size = 32,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(cast5)",	.block_size = 8,	.max_key_size = 16,	.iv_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(cast6)",	.block_size = 16,	.max_key_size = 32,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(des)",	.block_size = 8,	.max_key_size = 8,	.iv_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(des3_ede)",	.block_size = 8,	.max_key_size = 24,	.iv_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(serpent)",	.block_size = 16,	.max_key_size = 32,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(sm4)",	.block_size = 16,	.max_key_size = 16,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cbc(twofish)",	.block_size = 16,	.max_key_size = 32,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cfb(aes)",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cfb(aria)",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
+
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cfb(sm4)",	.block_size = 1,	.max_key_size = 16,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "chacha20",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(aes)",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(aria)",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(blowfish)",	.block_size = 1,	.max_key_size = 56,	.iv_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(camellia)",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(cast5)",	.block_size = 1,	.max_key_size = 16,	.iv_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(cast6)",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(des)",	.block_size = 1,	.max_key_size = 8,	.iv_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(des3_ede)",	.block_size = 1,	.max_key_size = 24,	.iv_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(serpent)",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(sm4)",	.block_size = 1,	.max_key_size = 16,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ctr(twofish)",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cts(cbc(aes))",	.block_size = 16,	.max_key_size = 32,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "cts(cbc(sm4))",	.block_size = 16,	.max_key_size = 16,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(aes)",	.block_size = 16,	.max_key_size = 32 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(aria)",	.block_size = 16,	.max_key_size = 32 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(blowfish)",	.block_size = 8,	.max_key_size = 56 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(camellia)",	.block_size = 16,	.max_key_size = 32 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(cast5)",	.block_size = 8,	.max_key_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(cast6)",	.block_size = 16,	.max_key_size = 32 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(cipher_null)",	.block_size = 1 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(des)",	.block_size = 8,	.max_key_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(des3_ede)",	.block_size = 8,	.max_key_size = 24 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(serpent)",	.block_size = 16,	.max_key_size = 32 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(sm4)",	.block_size = 16,	.max_key_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ecb(twofish)",	.block_size = 16,	.max_key_size = 32 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "lrw(aes)",	.block_size = 16,	.max_key_size = 48,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "lrw(camellia)",	.block_size = 16,	.max_key_size = 48,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "lrw(cast6)",	.block_size = 16,	.max_key_size = 48,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "lrw(serpent)",	.block_size = 16,	.max_key_size = 48,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "lrw(twofish)",	.block_size = 16,	.max_key_size = 48,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "ofb(aes)",	.block_size = 1,	.max_key_size = 32,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "pcbc(fcrypt)",	.block_size = 8,	.max_key_size = 8,	.iv_size = 8 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "rfc3686(ctr(aes))",	.block_size = 1,	.max_key_size = 36,	.iv_size = 8 },
+
+
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "salsa20",	.block_size = 1,	.max_key_size = 32,	.iv_size = 8 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "xchacha12",	.block_size = 1,	.max_key_size = 32,	.iv_size = 32 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "xchacha20",	.block_size = 1,	.max_key_size = 32,	.iv_size = 32 },
@@ -116,4 +171,5 @@
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "xts(camellia)",	.block_size = 16,	.max_key_size = 64,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "xts(cast6)",	.block_size = 16,	.max_key_size = 64,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "xts(serpent)",	.block_size = 16,	.max_key_size = 64,	.iv_size = 16 },
+{ .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "xts(sm4)",	.block_size = 16,	.max_key_size = 32,	.iv_size = 16 },
 { .crypto_type = CRYPTO_SKCIPHER, .type = "skcipher", .name = "xts(twofish)",	.block_size = 16,	.max_key_size = 64,	.iv_size = 16 },