Merge tag 'auxdisplay-for-linus-v5.12' of git://github.com/ojeda/linux

[linux-2.6-microblaze.git] / crypto / tcrypt.c

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index a647bb2..6b7c158 100644 (file)
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -70,8 +70,8 @@ static const char *check[] = {
        "des", "md5", "des3_ede", "rot13", "sha1", "sha224", "sha256", "sm3",
        "blowfish", "twofish", "serpent", "sha384", "sha512", "md4", "aes",
        "cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea",
-       "khazad", "wp512", "wp384", "wp256", "tnepres", "xeta",  "fcrypt",
-       "camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320",
+       "khazad", "wp512", "wp384", "wp256", "xeta",  "fcrypt",
+       "camellia", "seed", "rmd160",
        "lzo", "lzo-rle", "cts", "sha3-224", "sha3-256", "sha3-384",
        "sha3-512", "streebog256", "streebog512",
        NULL
@@ -199,8 +199,8 @@ static int test_mb_aead_jiffies(struct test_mb_aead_data *data, int enc,
                        goto out;
        }
 
-       pr_cont("%d operations in %d seconds (%ld bytes)\n",
-               bcount * num_mb, secs, (long)bcount * blen * num_mb);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount * num_mb, secs, (u64)bcount * blen * num_mb);
 
 out:
        kfree(rc);
@@ -471,8 +471,8 @@ static int test_aead_jiffies(struct aead_request *req, int enc,
                        return ret;
        }
 
-       printk("%d operations in %d seconds (%ld bytes)\n",
-              bcount, secs, (long)bcount * blen);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount, secs, (u64)bcount * blen);
        return 0;
 }
 
@@ -764,8 +764,8 @@ static int test_mb_ahash_jiffies(struct test_mb_ahash_data *data, int blen,
                        goto out;
        }
 
-       pr_cont("%d operations in %d seconds (%ld bytes)\n",
-               bcount * num_mb, secs, (long)bcount * blen * num_mb);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount * num_mb, secs, (u64)bcount * blen * num_mb);
 
 out:
        kfree(rc);
@@ -1201,8 +1201,8 @@ static int test_mb_acipher_jiffies(struct test_mb_skcipher_data *data, int enc,
                        goto out;
        }
 
-       pr_cont("%d operations in %d seconds (%ld bytes)\n",
-               bcount * num_mb, secs, (long)bcount * blen * num_mb);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount * num_mb, secs, (u64)bcount * blen * num_mb);
 
 out:
        kfree(rc);
@@ -1441,8 +1441,8 @@ static int test_acipher_jiffies(struct skcipher_request *req, int enc,
                        return ret;
        }
 
-       pr_cont("%d operations in %d seconds (%ld bytes)\n",
-               bcount, secs, (long)bcount * blen);
+       pr_cont("%d operations in %d seconds (%llu bytes)\n",
+               bcount, secs, (u64)bcount * blen);
        return 0;
 }
 
@@ -1806,27 +1806,11 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                ret += tcrypt_test("wp256");
                break;
 
-       case 25:
-               ret += tcrypt_test("ecb(tnepres)");
-               break;
-
        case 26:
                ret += tcrypt_test("ecb(anubis)");
                ret += tcrypt_test("cbc(anubis)");
                break;
 
-       case 27:
-               ret += tcrypt_test("tgr192");
-               break;
-
-       case 28:
-               ret += tcrypt_test("tgr160");
-               break;
-
-       case 29:
-               ret += tcrypt_test("tgr128");
-               break;
-
        case 30:
                ret += tcrypt_test("ecb(xeta)");
                break;
@@ -1847,10 +1831,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                ret += tcrypt_test("sha224");
                break;
 
-       case 34:
-               ret += tcrypt_test("salsa20");
-               break;
-
        case 35:
                ret += tcrypt_test("gcm(aes)");
                break;
@@ -1867,22 +1847,10 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                ret += tcrypt_test("cts(cbc(aes))");
                break;
 
-        case 39:
-               ret += tcrypt_test("rmd128");
-               break;
-
         case 40:
                ret += tcrypt_test("rmd160");
                break;
 
-       case 41:
-               ret += tcrypt_test("rmd256");
-               break;
-
-       case 42:
-               ret += tcrypt_test("rmd320");
-               break;
-
        case 43:
                ret += tcrypt_test("ecb(seed)");
                break;
@@ -1955,10 +1923,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                ret += tcrypt_test("xcbc(aes)");
                break;
 
-       case 107:
-               ret += tcrypt_test("hmac(rmd128)");
-               break;
-
        case 108:
                ret += tcrypt_test("hmac(rmd160)");
                break;
@@ -2181,11 +2145,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                                speed_template_32_48_64);
                break;
 
-       case 206:
-               test_cipher_speed("salsa20", ENCRYPT, sec, NULL, 0,
-                                 speed_template_16_32);
-               break;
-
        case 207:
                test_cipher_speed("ecb(serpent)", ENCRYPT, sec, NULL, 0,
                                  speed_template_16_32);
@@ -2393,38 +2352,14 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                test_hash_speed("wp512", sec, generic_hash_speed_template);
                if (mode > 300 && mode < 400) break;
                fallthrough;
-       case 310:
-               test_hash_speed("tgr128", sec, generic_hash_speed_template);
-               if (mode > 300 && mode < 400) break;
-               fallthrough;
-       case 311:
-               test_hash_speed("tgr160", sec, generic_hash_speed_template);
-               if (mode > 300 && mode < 400) break;
-               fallthrough;
-       case 312:
-               test_hash_speed("tgr192", sec, generic_hash_speed_template);
-               if (mode > 300 && mode < 400) break;
-               fallthrough;
        case 313:
                test_hash_speed("sha224", sec, generic_hash_speed_template);
                if (mode > 300 && mode < 400) break;
                fallthrough;
-       case 314:
-               test_hash_speed("rmd128", sec, generic_hash_speed_template);
-               if (mode > 300 && mode < 400) break;
-               fallthrough;
        case 315:
                test_hash_speed("rmd160", sec, generic_hash_speed_template);
                if (mode > 300 && mode < 400) break;
                fallthrough;
-       case 316:
-               test_hash_speed("rmd256", sec, generic_hash_speed_template);
-               if (mode > 300 && mode < 400) break;
-               fallthrough;
-       case 317:
-               test_hash_speed("rmd320", sec, generic_hash_speed_template);
-               if (mode > 300 && mode < 400) break;
-               fallthrough;
        case 318:
                klen = 16;
                test_hash_speed("ghash", sec, generic_hash_speed_template);
@@ -2517,38 +2452,14 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)
                test_ahash_speed("wp512", sec, generic_hash_speed_template);
                if (mode > 400 && mode < 500) break;
                fallthrough;
-       case 410:
-               test_ahash_speed("tgr128", sec, generic_hash_speed_template);
-               if (mode > 400 && mode < 500) break;
-               fallthrough;
-       case 411:
-               test_ahash_speed("tgr160", sec, generic_hash_speed_template);
-               if (mode > 400 && mode < 500) break;
-               fallthrough;
-       case 412:
-               test_ahash_speed("tgr192", sec, generic_hash_speed_template);
-               if (mode > 400 && mode < 500) break;
-               fallthrough;
        case 413:
                test_ahash_speed("sha224", sec, generic_hash_speed_template);
                if (mode > 400 && mode < 500) break;
                fallthrough;
-       case 414:
-               test_ahash_speed("rmd128", sec, generic_hash_speed_template);
-               if (mode > 400 && mode < 500) break;
-               fallthrough;
        case 415:
                test_ahash_speed("rmd160", sec, generic_hash_speed_template);
                if (mode > 400 && mode < 500) break;
                fallthrough;
-       case 416:
-               test_ahash_speed("rmd256", sec, generic_hash_speed_template);
-               if (mode > 400 && mode < 500) break;
-               fallthrough;
-       case 417:
-               test_ahash_speed("rmd320", sec, generic_hash_speed_template);
-               if (mode > 400 && mode < 500) break;
-               fallthrough;
        case 418:
                test_ahash_speed("sha3-224", sec, generic_hash_speed_template);
                if (mode > 400 && mode < 500) break;