2 files changed, 21 insertions, 0 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index 943a514478bd..0cfb8ebb22ba 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -1668,6 +1668,11 @@ static void do_test(void)
                                 camellia_speed_template);
                 break;
 
+        case 206:
+                test_cipher_speed("salsa20", ENCRYPT, sec, NULL, 0,
+                                  salsa20_speed_template);
+                break;
+
         case 300:
                 /* fall through */
 
diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h
index 175f26a58e2d..5b865092151d 100644
--- a/crypto/tcrypt.h
+++ b/crypto/tcrypt.h
@@ -7947,4 +7947,20 @@ static struct cipher_speed camellia_speed_template[] = {
       {  .klen = 0, .blen = 0, }
 };
 
+static struct cipher_speed salsa20_speed_template[] = {
+      { .klen = 16, .blen = 16, },
+      { .klen = 16, .blen = 64, },
+      { .klen = 16, .blen = 256, },
+      { .klen = 16, .blen = 1024, },
+      { .klen = 16, .blen = 8192, },
+      { .klen = 32, .blen = 16, },
+      { .klen = 32, .blen = 64, },
+      { .klen = 32, .blen = 256, },
+      { .klen = 32, .blen = 1024, },
+      { .klen = 32, .blen = 8192, },
+
+      /* End marker */
+      {  .klen = 0, .blen = 0, }
+};
+
 #endif  /* _CRYPTO_TCRYPT_H */