crypto: tcrypt - Remove unused poly1305 support

Since the crypto_shash support for poly1305 was removed, the tcrypt
support for it is now unused as well.  Support for benchmarking the
kernel's Poly1305 code is now provided by the poly1305 kunit test.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index ea58a4f6dd868cba09bad5d24b543fd519c3814b..81f1871eccf576c7bc907a70f35bbc1076615228 100644 (file)
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -2264,10 +2264,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                test_hash_speed("crc32c", sec, generic_hash_speed_template);
                if (mode > 300 && mode < 400) break;
                fallthrough;
-       case 321:
-               test_hash_speed("poly1305", sec, poly1305_speed_template);
-               if (mode > 300 && mode < 400) break;
-               fallthrough;
        case 322:
                test_hash_speed("sha3-224", sec, generic_hash_speed_template);
                if (mode > 300 && mode < 400) break;

diff --git a/crypto/tcrypt.h b/crypto/tcrypt.h
index 7f938ac93e583bf8f6c4363aa0cc34812b0734f9..85c3f77bcfb462938a62c41f43ec04700d8e4d94 100644 (file)
--- a/crypto/tcrypt.h
+++ b/crypto/tcrypt.h
@@ -96,22 +96,4 @@ static struct hash_speed generic_hash_speed_template[] = {
        {  .blen = 0,   .plen = 0, }
 };
 
-static struct hash_speed poly1305_speed_template[] = {
-       { .blen = 96,   .plen = 16, },
-       { .blen = 96,   .plen = 32, },
-       { .blen = 96,   .plen = 96, },
-       { .blen = 288,  .plen = 16, },
-       { .blen = 288,  .plen = 32, },
-       { .blen = 288,  .plen = 288, },
-       { .blen = 1056, .plen = 32, },
-       { .blen = 1056, .plen = 1056, },
-       { .blen = 2080, .plen = 32, },
-       { .blen = 2080, .plen = 2080, },
-       { .blen = 4128, .plen = 4128, },
-       { .blen = 8224, .plen = 8224, },
-
-       /* End marker */
-       {  .blen = 0,   .plen = 0, }
-};
-
 #endif /* _CRYPTO_TCRYPT_H */