aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/tcrypt.c
diff options
context:
space:
mode:
authorHuang Ying <ying.huang@intel.com>2010-03-10 05:30:32 -0500
committerHerbert Xu <herbert@gondor.apana.org.au>2010-03-10 05:30:32 -0500
commit18bcc9194da3c97e8f458fb1b06ac5b9b35fb23f (patch)
tree67b26424b0bad61cad8ea175b941333137b32f80 /crypto/tcrypt.c
parent12387a46bb150f5608de4aa9a90dfdddbf991e3f (diff)
crypto: tcrypt - Speed testing support for ghash
Because ghash needs setkey, the setkey and keysize template support for test_hash_speed is added. Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto/tcrypt.c')
-rw-r--r--crypto/tcrypt.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index aa3f84ccc786..0b7a8435255b 100644
--- a/crypto/tcrypt.c
+++ b/crypto/tcrypt.c
@@ -437,6 +437,9 @@ static void test_hash_speed(const char *algo, unsigned int sec,
437 goto out; 437 goto out;
438 } 438 }
439 439
440 if (speed[i].klen)
441 crypto_hash_setkey(tfm, tvmem[0], speed[i].klen);
442
440 printk(KERN_INFO "test%3u " 443 printk(KERN_INFO "test%3u "
441 "(%5u byte blocks,%5u bytes per update,%4u updates): ", 444 "(%5u byte blocks,%5u bytes per update,%4u updates): ",
442 i, speed[i].blen, speed[i].plen, speed[i].blen / speed[i].plen); 445 i, speed[i].blen, speed[i].plen, speed[i].blen / speed[i].plen);
@@ -881,6 +884,10 @@ static int do_test(int m)
881 test_hash_speed("rmd320", sec, generic_hash_speed_template); 884 test_hash_speed("rmd320", sec, generic_hash_speed_template);
882 if (mode > 300 && mode < 400) break; 885 if (mode > 300 && mode < 400) break;
883 886
887 case 318:
888 test_hash_speed("ghash-generic", sec, hash_speed_template_16);
889 if (mode > 300 && mode < 400) break;
890
884 case 399: 891 case 399:
885 break; 892 break;
886 893