2 files changed, 80 insertions, 0 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index e00a4e49e013..2c1c2dfcc02a 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -821,6 +821,26 @@ config CRYPTO_SERPENT_SSE2_586
           See also:
           <http://www.cl.cam.ac.uk/~rja14/serpent.html>
 
+config CRYPTO_SERPENT_AVX_X86_64
+        tristate "Serpent cipher algorithm (x86_64/AVX)"
+        depends on X86 && 64BIT
+        select CRYPTO_ALGAPI
+        select CRYPTO_CRYPTD
+        select CRYPTO_SERPENT
+        select CRYPTO_LRW
+        select CRYPTO_XTS
+        help
+          Serpent cipher algorithm, by Anderson, Biham & Knudsen.
+
+          Keys are allowed to be from 0 to 256 bits in length, in steps
+          of 8 bits.
+
+          This module provides the Serpent cipher algorithm that processes
+          eight blocks parallel using the AVX instruction set.
+
+          See also:
+          <http://www.cl.cam.ac.uk/~rja14/serpent.html>
+
 config CRYPTO_TEA
         tristate "TEA, XTEA and XETA cipher algorithms"
         select CRYPTO_ALGAPI
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 73b3ec6fe1a2..36748a5996e2 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -1534,6 +1534,21 @@ 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 = "__cbc-serpent-avx",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "__cbc-serpent-sse2",
                 .test = alg_test_null,
                 .suite = {
@@ -1579,6 +1594,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "__driver-cbc-serpent-avx",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "__driver-cbc-serpent-sse2",
                 .test = alg_test_null,
                 .suite = {
@@ -1624,6 +1654,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "__driver-ecb-serpent-avx",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "__driver-ecb-serpent-sse2",
                 .test = alg_test_null,
                 .suite = {
@@ -1836,6 +1881,21 @@ static const struct alg_test_desc alg_test_descs[] = {
                         }
                 }
         }, {
+                .alg = "cryptd(__driver-ecb-serpent-avx)",
+                .test = alg_test_null,
+                .suite = {
+                        .cipher = {
+                                .enc = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                },
+                                .dec = {
+                                        .vecs = NULL,
+                                        .count = 0
+                                }
+                        }
+                }
+        }, {
                 .alg = "cryptd(__driver-ecb-serpent-sse2)",
                 .test = alg_test_null,
                 .suite = {