2005-06-22 22:26:03 +02:00
|
|
|
/*
|
2005-04-17 00:20:36 +02:00
|
|
|
* Quick & dirty crypto testing module.
|
|
|
|
*
|
|
|
|
* This will only exist until we have a better testing mechanism
|
|
|
|
* (e.g. a char device).
|
|
|
|
*
|
|
|
|
* Copyright (c) 2002 James Morris <jmorris@intercode.com.au>
|
|
|
|
* Copyright (c) 2002 Jean-Francois Dive <jef@linuxbe.org>
|
2007-11-26 15:12:07 +01:00
|
|
|
* Copyright (c) 2007 Nokia Siemens Networks
|
2005-04-17 00:20:36 +02:00
|
|
|
*
|
2010-11-04 20:02:04 +01:00
|
|
|
* Updated RFC4106 AES-GCM testing.
|
|
|
|
* Authors: Aidan O'Mahony (aidan.o.mahony@intel.com)
|
|
|
|
* Adrian Hoban <adrian.hoban@intel.com>
|
|
|
|
* Gabriele Paoloni <gabriele.paoloni@intel.com>
|
|
|
|
* Tadeusz Struk (tadeusz.struk@intel.com)
|
|
|
|
* Copyright (c) 2010, Intel Corporation.
|
|
|
|
*
|
2005-04-17 00:20:36 +02:00
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the Free
|
2005-06-22 22:26:03 +02:00
|
|
|
* Software Foundation; either version 2 of the License, or (at your option)
|
2005-04-17 00:20:36 +02:00
|
|
|
* any later version.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2008-07-10 10:01:22 +02:00
|
|
|
#include <crypto/hash.h>
|
2006-08-13 00:26:09 +02:00
|
|
|
#include <linux/err.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/init.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 09:04:11 +01:00
|
|
|
#include <linux/gfp.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/module.h>
|
2005-09-17 09:55:31 +02:00
|
|
|
#include <linux/scatterlist.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include <linux/string.h>
|
|
|
|
#include <linux/moduleparam.h>
|
2005-06-22 22:27:23 +02:00
|
|
|
#include <linux/jiffies.h>
|
2005-06-22 22:29:03 +02:00
|
|
|
#include <linux/timex.h>
|
|
|
|
#include <linux/interrupt.h>
|
2005-04-17 00:20:36 +02:00
|
|
|
#include "tcrypt.h"
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
#include "internal.h"
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/*
|
2008-07-31 06:23:53 +02:00
|
|
|
* Need slab memory for testing (size in number of pages).
|
2005-04-17 00:20:36 +02:00
|
|
|
*/
|
2008-07-31 06:23:53 +02:00
|
|
|
#define TVMEMSIZE 4
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
/*
|
2008-07-31 11:08:25 +02:00
|
|
|
* Used by test_cipher_speed()
|
2005-04-17 00:20:36 +02:00
|
|
|
*/
|
|
|
|
#define ENCRYPT 1
|
|
|
|
#define DECRYPT 0
|
|
|
|
|
2005-06-22 22:27:23 +02:00
|
|
|
/*
|
|
|
|
* Used by test_cipher_speed()
|
|
|
|
*/
|
2005-06-22 22:29:03 +02:00
|
|
|
static unsigned int sec;
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2009-06-19 13:46:53 +02:00
|
|
|
static char *alg = NULL;
|
|
|
|
static u32 type;
|
2009-07-14 10:06:54 +02:00
|
|
|
static u32 mask;
|
2005-04-17 00:20:36 +02:00
|
|
|
static int mode;
|
2008-07-31 06:23:53 +02:00
|
|
|
static char *tvmem[TVMEMSIZE];
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
static char *check[] = {
|
2007-11-10 13:08:25 +01:00
|
|
|
"des", "md5", "des3_ede", "rot13", "sha1", "sha224", "sha256",
|
|
|
|
"blowfish", "twofish", "serpent", "sha384", "sha512", "md4", "aes",
|
|
|
|
"cast6", "arc4", "michael_mic", "deflate", "crc32c", "tea", "xtea",
|
2006-12-16 02:13:14 +01:00
|
|
|
"khazad", "wp512", "wp384", "wp256", "tnepres", "xeta", "fcrypt",
|
2008-05-09 15:29:35 +02:00
|
|
|
"camellia", "seed", "salsa20", "rmd128", "rmd160", "rmd256", "rmd320",
|
2009-03-04 08:42:15 +01:00
|
|
|
"lzo", "cts", "zlib", NULL
|
2005-04-17 00:20:36 +02:00
|
|
|
};
|
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
static int test_cipher_jiffies(struct blkcipher_desc *desc, int enc,
|
|
|
|
struct scatterlist *sg, int blen, int sec)
|
2005-06-22 22:29:03 +02:00
|
|
|
{
|
|
|
|
unsigned long start, end;
|
|
|
|
int bcount;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
for (start = jiffies, end = start + sec * HZ, bcount = 0;
|
|
|
|
time_before(jiffies, end); bcount++) {
|
|
|
|
if (enc)
|
2006-08-13 00:26:09 +02:00
|
|
|
ret = crypto_blkcipher_encrypt(desc, sg, sg, blen);
|
2005-06-22 22:29:03 +02:00
|
|
|
else
|
2006-08-13 00:26:09 +02:00
|
|
|
ret = crypto_blkcipher_decrypt(desc, sg, sg, blen);
|
2005-06-22 22:29:03 +02:00
|
|
|
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
printk("%d operations in %d seconds (%ld bytes)\n",
|
|
|
|
bcount, sec, (long)bcount * blen);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
static int test_cipher_cycles(struct blkcipher_desc *desc, int enc,
|
|
|
|
struct scatterlist *sg, int blen)
|
2005-06-22 22:29:03 +02:00
|
|
|
{
|
|
|
|
unsigned long cycles = 0;
|
|
|
|
int ret = 0;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
local_bh_disable();
|
|
|
|
local_irq_disable();
|
|
|
|
|
|
|
|
/* Warm-up run. */
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
if (enc)
|
2006-08-13 00:26:09 +02:00
|
|
|
ret = crypto_blkcipher_encrypt(desc, sg, sg, blen);
|
2005-06-22 22:29:03 +02:00
|
|
|
else
|
2006-08-13 00:26:09 +02:00
|
|
|
ret = crypto_blkcipher_decrypt(desc, sg, sg, blen);
|
2005-06-22 22:29:03 +02:00
|
|
|
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The real thing. */
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
|
cycles_t start, end;
|
|
|
|
|
|
|
|
start = get_cycles();
|
|
|
|
if (enc)
|
2006-08-13 00:26:09 +02:00
|
|
|
ret = crypto_blkcipher_encrypt(desc, sg, sg, blen);
|
2005-06-22 22:29:03 +02:00
|
|
|
else
|
2006-08-13 00:26:09 +02:00
|
|
|
ret = crypto_blkcipher_decrypt(desc, sg, sg, blen);
|
2005-06-22 22:29:03 +02:00
|
|
|
end = get_cycles();
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
cycles += end - start;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
local_irq_enable();
|
|
|
|
local_bh_enable();
|
|
|
|
|
|
|
|
if (ret == 0)
|
|
|
|
printk("1 operation in %lu cycles (%d bytes)\n",
|
|
|
|
(cycles + 4) / 8, blen);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-03-11 14:27:11 +01:00
|
|
|
static u32 block_sizes[] = { 16, 64, 256, 1024, 8192, 0 };
|
|
|
|
|
2008-07-31 09:41:55 +02:00
|
|
|
static void test_cipher_speed(const char *algo, int enc, unsigned int sec,
|
2008-07-31 11:08:25 +02:00
|
|
|
struct cipher_speed_template *template,
|
2008-03-11 14:27:11 +01:00
|
|
|
unsigned int tcount, u8 *keysize)
|
2005-06-22 22:27:23 +02:00
|
|
|
{
|
2005-06-22 22:27:51 +02:00
|
|
|
unsigned int ret, i, j, iv_len;
|
2011-03-04 08:28:52 +01:00
|
|
|
const char *key;
|
|
|
|
char iv[128];
|
2006-08-13 00:26:09 +02:00
|
|
|
struct crypto_blkcipher *tfm;
|
|
|
|
struct blkcipher_desc desc;
|
|
|
|
const char *e;
|
2008-03-11 14:27:11 +01:00
|
|
|
u32 *b_size;
|
2005-06-22 22:27:23 +02:00
|
|
|
|
|
|
|
if (enc == ENCRYPT)
|
|
|
|
e = "encryption";
|
|
|
|
else
|
|
|
|
e = "decryption";
|
|
|
|
|
2006-08-13 00:26:09 +02:00
|
|
|
printk("\ntesting speed of %s %s\n", algo, e);
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2006-08-13 00:26:09 +02:00
|
|
|
tfm = crypto_alloc_blkcipher(algo, 0, CRYPTO_ALG_ASYNC);
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2006-08-13 00:26:09 +02:00
|
|
|
if (IS_ERR(tfm)) {
|
|
|
|
printk("failed to load transform for %s: %ld\n", algo,
|
|
|
|
PTR_ERR(tfm));
|
2005-06-22 22:27:23 +02:00
|
|
|
return;
|
|
|
|
}
|
2006-08-13 00:26:09 +02:00
|
|
|
desc.tfm = tfm;
|
|
|
|
desc.flags = 0;
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2008-03-11 14:27:11 +01:00
|
|
|
i = 0;
|
|
|
|
do {
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2008-03-11 14:27:11 +01:00
|
|
|
b_size = block_sizes;
|
|
|
|
do {
|
2008-07-31 06:23:53 +02:00
|
|
|
struct scatterlist sg[TVMEMSIZE];
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
if ((*keysize + *b_size) > TVMEMSIZE * PAGE_SIZE) {
|
|
|
|
printk("template (%u) too big for "
|
|
|
|
"tvmem (%lu)\n", *keysize + *b_size,
|
|
|
|
TVMEMSIZE * PAGE_SIZE);
|
2008-03-11 14:27:11 +01:00
|
|
|
goto out;
|
|
|
|
}
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2008-03-11 14:27:11 +01:00
|
|
|
printk("test %u (%d bit key, %d byte blocks): ", i,
|
|
|
|
*keysize * 8, *b_size);
|
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
memset(tvmem[0], 0xff, PAGE_SIZE);
|
2008-03-11 14:27:11 +01:00
|
|
|
|
|
|
|
/* set key, plain text and IV */
|
2008-07-31 11:08:25 +02:00
|
|
|
key = tvmem[0];
|
2008-03-11 14:27:11 +01:00
|
|
|
for (j = 0; j < tcount; j++) {
|
|
|
|
if (template[j].klen == *keysize) {
|
|
|
|
key = template[j].key;
|
|
|
|
break;
|
|
|
|
}
|
2005-06-22 22:27:51 +02:00
|
|
|
}
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2008-03-11 14:27:11 +01:00
|
|
|
ret = crypto_blkcipher_setkey(tfm, key, *keysize);
|
|
|
|
if (ret) {
|
|
|
|
printk("setkey() failed flags=%x\n",
|
|
|
|
crypto_blkcipher_get_flags(tfm));
|
|
|
|
goto out;
|
|
|
|
}
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
sg_init_table(sg, TVMEMSIZE);
|
|
|
|
sg_set_buf(sg, tvmem[0] + *keysize,
|
|
|
|
PAGE_SIZE - *keysize);
|
|
|
|
for (j = 1; j < TVMEMSIZE; j++) {
|
|
|
|
sg_set_buf(sg + j, tvmem[j], PAGE_SIZE);
|
|
|
|
memset (tvmem[j], 0xff, PAGE_SIZE);
|
|
|
|
}
|
|
|
|
|
2008-03-11 14:27:11 +01:00
|
|
|
iv_len = crypto_blkcipher_ivsize(tfm);
|
|
|
|
if (iv_len) {
|
|
|
|
memset(&iv, 0xff, iv_len);
|
|
|
|
crypto_blkcipher_set_iv(tfm, iv, iv_len);
|
|
|
|
}
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2008-03-11 14:27:11 +01:00
|
|
|
if (sec)
|
2008-07-31 06:23:53 +02:00
|
|
|
ret = test_cipher_jiffies(&desc, enc, sg,
|
|
|
|
*b_size, sec);
|
2008-03-11 14:27:11 +01:00
|
|
|
else
|
2008-07-31 06:23:53 +02:00
|
|
|
ret = test_cipher_cycles(&desc, enc, sg,
|
|
|
|
*b_size);
|
2005-06-22 22:27:23 +02:00
|
|
|
|
2008-03-11 14:27:11 +01:00
|
|
|
if (ret) {
|
|
|
|
printk("%s() failed flags=%x\n", e, desc.flags);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
b_size++;
|
|
|
|
i++;
|
|
|
|
} while (*b_size);
|
|
|
|
keysize++;
|
|
|
|
} while (*keysize);
|
2005-06-22 22:27:23 +02:00
|
|
|
|
|
|
|
out:
|
2006-08-13 00:26:09 +02:00
|
|
|
crypto_free_blkcipher(tfm);
|
2005-06-22 22:27:23 +02:00
|
|
|
}
|
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
static int test_hash_jiffies_digest(struct hash_desc *desc,
|
|
|
|
struct scatterlist *sg, int blen,
|
2006-08-19 13:38:49 +02:00
|
|
|
char *out, int sec)
|
|
|
|
{
|
|
|
|
unsigned long start, end;
|
|
|
|
int bcount;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
for (start = jiffies, end = start + sec * HZ, bcount = 0;
|
|
|
|
time_before(jiffies, end); bcount++) {
|
|
|
|
ret = crypto_hash_digest(desc, sg, blen, out);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
printk("%6u opers/sec, %9lu bytes/sec\n",
|
|
|
|
bcount / sec, ((long)bcount * blen) / sec);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
static int test_hash_jiffies(struct hash_desc *desc, struct scatterlist *sg,
|
|
|
|
int blen, int plen, char *out, int sec)
|
2006-05-30 14:04:19 +02:00
|
|
|
{
|
|
|
|
unsigned long start, end;
|
|
|
|
int bcount, pcount;
|
2006-08-19 13:38:49 +02:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (plen == blen)
|
2008-07-31 06:23:53 +02:00
|
|
|
return test_hash_jiffies_digest(desc, sg, blen, out, sec);
|
2007-10-27 09:51:21 +02:00
|
|
|
|
2006-05-30 14:04:19 +02:00
|
|
|
for (start = jiffies, end = start + sec * HZ, bcount = 0;
|
|
|
|
time_before(jiffies, end); bcount++) {
|
2006-08-19 13:38:49 +02:00
|
|
|
ret = crypto_hash_init(desc);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2006-05-30 14:04:19 +02:00
|
|
|
for (pcount = 0; pcount < blen; pcount += plen) {
|
2006-08-19 13:38:49 +02:00
|
|
|
ret = crypto_hash_update(desc, sg, plen);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2006-05-30 14:04:19 +02:00
|
|
|
}
|
|
|
|
/* we assume there is enough space in 'out' for the result */
|
2006-08-19 13:38:49 +02:00
|
|
|
ret = crypto_hash_final(desc, out);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
2006-05-30 14:04:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
printk("%6u opers/sec, %9lu bytes/sec\n",
|
|
|
|
bcount / sec, ((long)bcount * blen) / sec);
|
|
|
|
|
2006-08-19 13:38:49 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
static int test_hash_cycles_digest(struct hash_desc *desc,
|
|
|
|
struct scatterlist *sg, int blen, char *out)
|
2006-08-19 13:38:49 +02:00
|
|
|
{
|
|
|
|
unsigned long cycles = 0;
|
|
|
|
int i;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
local_bh_disable();
|
|
|
|
local_irq_disable();
|
|
|
|
|
|
|
|
/* Warm-up run. */
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
ret = crypto_hash_digest(desc, sg, blen, out);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The real thing. */
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
|
cycles_t start, end;
|
|
|
|
|
|
|
|
start = get_cycles();
|
|
|
|
|
|
|
|
ret = crypto_hash_digest(desc, sg, blen, out);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
end = get_cycles();
|
|
|
|
|
|
|
|
cycles += end - start;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
local_irq_enable();
|
|
|
|
local_bh_enable();
|
|
|
|
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
printk("%6lu cycles/operation, %4lu cycles/byte\n",
|
|
|
|
cycles / 8, cycles / (8 * blen));
|
|
|
|
|
|
|
|
return 0;
|
2006-05-30 14:04:19 +02:00
|
|
|
}
|
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
static int test_hash_cycles(struct hash_desc *desc, struct scatterlist *sg,
|
|
|
|
int blen, int plen, char *out)
|
2006-05-30 14:04:19 +02:00
|
|
|
{
|
|
|
|
unsigned long cycles = 0;
|
|
|
|
int i, pcount;
|
2006-08-19 13:38:49 +02:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (plen == blen)
|
2008-07-31 06:23:53 +02:00
|
|
|
return test_hash_cycles_digest(desc, sg, blen, out);
|
2007-10-27 09:51:21 +02:00
|
|
|
|
2006-05-30 14:04:19 +02:00
|
|
|
local_bh_disable();
|
|
|
|
local_irq_disable();
|
|
|
|
|
|
|
|
/* Warm-up run. */
|
|
|
|
for (i = 0; i < 4; i++) {
|
2006-08-19 13:38:49 +02:00
|
|
|
ret = crypto_hash_init(desc);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2006-05-30 14:04:19 +02:00
|
|
|
for (pcount = 0; pcount < blen; pcount += plen) {
|
2006-08-19 13:38:49 +02:00
|
|
|
ret = crypto_hash_update(desc, sg, plen);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2006-05-30 14:04:19 +02:00
|
|
|
}
|
2007-05-18 08:25:19 +02:00
|
|
|
ret = crypto_hash_final(desc, out);
|
2006-08-19 13:38:49 +02:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2006-05-30 14:04:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* The real thing. */
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
|
cycles_t start, end;
|
|
|
|
|
|
|
|
start = get_cycles();
|
|
|
|
|
2006-08-19 13:38:49 +02:00
|
|
|
ret = crypto_hash_init(desc);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2006-05-30 14:04:19 +02:00
|
|
|
for (pcount = 0; pcount < blen; pcount += plen) {
|
2006-08-19 13:38:49 +02:00
|
|
|
ret = crypto_hash_update(desc, sg, plen);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2006-05-30 14:04:19 +02:00
|
|
|
}
|
2006-08-19 13:38:49 +02:00
|
|
|
ret = crypto_hash_final(desc, out);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2006-05-30 14:04:19 +02:00
|
|
|
|
|
|
|
end = get_cycles();
|
|
|
|
|
|
|
|
cycles += end - start;
|
|
|
|
}
|
|
|
|
|
2006-08-19 13:38:49 +02:00
|
|
|
out:
|
2006-05-30 14:04:19 +02:00
|
|
|
local_irq_enable();
|
|
|
|
local_bh_enable();
|
|
|
|
|
2006-08-19 13:38:49 +02:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2006-05-30 14:04:19 +02:00
|
|
|
printk("%6lu cycles/operation, %4lu cycles/byte\n",
|
|
|
|
cycles / 8, cycles / (8 * blen));
|
|
|
|
|
2006-08-19 13:38:49 +02:00
|
|
|
return 0;
|
2006-05-30 14:04:19 +02:00
|
|
|
}
|
|
|
|
|
crypto: tcrypt - Add speed tests for async hashing
These are invoked in the 'mode' range of 400 to 499.
The cost of async vs. sync for the software algorithm implementations
varies. It can be as low as 16 cycles but as much as a couple hundred.
Here two runs of md5 testing, async then sync:
testing speed of async md5
test 0 ( 16 byte blocks, 16 bytes per update, 1 updates): 2448 cycles/operation, 153 cycles/byte
test 1 ( 64 byte blocks, 16 bytes per update, 4 updates): 4992 cycles/operation, 78 cycles/byte
test 2 ( 64 byte blocks, 64 bytes per update, 1 updates): 3808 cycles/operation, 59 cycles/byte
test 3 ( 256 byte blocks, 16 bytes per update, 16 updates): 14000 cycles/operation, 54 cycles/byte
test 4 ( 256 byte blocks, 64 bytes per update, 4 updates): 8480 cycles/operation, 33 cycles/byte
test 5 ( 256 byte blocks, 256 bytes per update, 1 updates): 7280 cycles/operation, 28 cycles/byte
test 6 ( 1024 byte blocks, 16 bytes per update, 64 updates): 50016 cycles/operation, 48 cycles/byte
test 7 ( 1024 byte blocks, 256 bytes per update, 4 updates): 22496 cycles/operation, 21 cycles/byte
test 8 ( 1024 byte blocks, 1024 bytes per update, 1 updates): 21232 cycles/operation, 20 cycles/byte
test 9 ( 2048 byte blocks, 16 bytes per update, 128 updates): 117184 cycles/operation, 57 cycles/byte
test 10 ( 2048 byte blocks, 256 bytes per update, 8 updates): 43008 cycles/operation, 21 cycles/byte
test 11 ( 2048 byte blocks, 1024 bytes per update, 2 updates): 40176 cycles/operation, 19 cycles/byte
test 12 ( 2048 byte blocks, 2048 bytes per update, 1 updates): 39888 cycles/operation, 19 cycles/byte
test 13 ( 4096 byte blocks, 16 bytes per update, 256 updates): 194176 cycles/operation, 47 cycles/byte
test 14 ( 4096 byte blocks, 256 bytes per update, 16 updates): 84096 cycles/operation, 20 cycles/byte
test 15 ( 4096 byte blocks, 1024 bytes per update, 4 updates): 78336 cycles/operation, 19 cycles/byte
test 16 ( 4096 byte blocks, 4096 bytes per update, 1 updates): 77120 cycles/operation, 18 cycles/byte
test 17 ( 8192 byte blocks, 16 bytes per update, 512 updates): 403056 cycles/operation, 49 cycles/byte
test 18 ( 8192 byte blocks, 256 bytes per update, 32 updates): 166112 cycles/operation, 20 cycles/byte
test 19 ( 8192 byte blocks, 1024 bytes per update, 8 updates): 154768 cycles/operation, 18 cycles/byte
test 20 ( 8192 byte blocks, 4096 bytes per update, 2 updates): 151904 cycles/operation, 18 cycles/byte
test 21 ( 8192 byte blocks, 8192 bytes per update, 1 updates): 155456 cycles/operation, 18 cycles/byte
testing speed of md5
test 0 ( 16 byte blocks, 16 bytes per update, 1 updates): 2208 cycles/operation, 138 cycles/byte
test 1 ( 64 byte blocks, 16 bytes per update, 4 updates): 5008 cycles/operation, 78 cycles/byte
test 2 ( 64 byte blocks, 64 bytes per update, 1 updates): 3600 cycles/operation, 56 cycles/byte
test 3 ( 256 byte blocks, 16 bytes per update, 16 updates): 14080 cycles/operation, 55 cycles/byte
test 4 ( 256 byte blocks, 64 bytes per update, 4 updates): 8560 cycles/operation, 33 cycles/byte
test 5 ( 256 byte blocks, 256 bytes per update, 1 updates): 7040 cycles/operation, 27 cycles/byte
test 6 ( 1024 byte blocks, 16 bytes per update, 64 updates): 50592 cycles/operation, 49 cycles/byte
test 7 ( 1024 byte blocks, 256 bytes per update, 4 updates): 22736 cycles/operation, 22 cycles/byte
test 8 ( 1024 byte blocks, 1024 bytes per update, 1 updates): 24960 cycles/operation, 24 cycles/byte
test 9 ( 2048 byte blocks, 16 bytes per update, 128 updates): 99312 cycles/operation, 48 cycles/byte
test 10 ( 2048 byte blocks, 256 bytes per update, 8 updates): 43520 cycles/operation, 21 cycles/byte
test 11 ( 2048 byte blocks, 1024 bytes per update, 2 updates): 40704 cycles/operation, 19 cycles/byte
test 12 ( 2048 byte blocks, 2048 bytes per update, 1 updates): 39552 cycles/operation, 19 cycles/byte
test 13 ( 4096 byte blocks, 16 bytes per update, 256 updates): 196720 cycles/operation, 48 cycles/byte
test 14 ( 4096 byte blocks, 256 bytes per update, 16 updates): 85152 cycles/operation, 20 cycles/byte
test 15 ( 4096 byte blocks, 1024 bytes per update, 4 updates): 79408 cycles/operation, 19 cycles/byte
test 16 ( 4096 byte blocks, 4096 bytes per update, 1 updates): 76816 cycles/operation, 18 cycles/byte
test 17 ( 8192 byte blocks, 16 bytes per update, 512 updates): 391520 cycles/operation, 47 cycles/byte
test 18 ( 8192 byte blocks, 256 bytes per update, 32 updates): 168464 cycles/operation, 20 cycles/byte
test 19 ( 8192 byte blocks, 1024 bytes per update, 8 updates): 156912 cycles/operation, 19 cycles/byte
test 20 ( 8192 byte blocks, 4096 bytes per update, 2 updates): 154016 cycles/operation, 18 cycles/byte
test 21 ( 8192 byte blocks, 8192 bytes per update, 1 updates): 153856 cycles/operation, 18 cycles/byte
We can ditch the sync hash code at some point if we feel that makes
sense. For now I've left it there.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2010-05-19 06:11:21 +02:00
|
|
|
static void test_hash_sg_init(struct scatterlist *sg)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
sg_init_table(sg, TVMEMSIZE);
|
|
|
|
for (i = 0; i < TVMEMSIZE; i++) {
|
|
|
|
sg_set_buf(sg + i, tvmem[i], PAGE_SIZE);
|
|
|
|
memset(tvmem[i], 0xff, PAGE_SIZE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-07-31 09:41:55 +02:00
|
|
|
static void test_hash_speed(const char *algo, unsigned int sec,
|
|
|
|
struct hash_speed *speed)
|
2006-05-30 14:04:19 +02:00
|
|
|
{
|
2008-07-31 06:23:53 +02:00
|
|
|
struct scatterlist sg[TVMEMSIZE];
|
2006-08-19 13:38:49 +02:00
|
|
|
struct crypto_hash *tfm;
|
|
|
|
struct hash_desc desc;
|
2009-03-29 09:18:39 +02:00
|
|
|
static char output[1024];
|
2006-05-30 14:04:19 +02:00
|
|
|
int i;
|
2006-08-19 13:38:49 +02:00
|
|
|
int ret;
|
2006-05-30 14:04:19 +02:00
|
|
|
|
2009-03-29 09:18:39 +02:00
|
|
|
printk(KERN_INFO "\ntesting speed of %s\n", algo);
|
2006-05-30 14:04:19 +02:00
|
|
|
|
2006-08-19 13:38:49 +02:00
|
|
|
tfm = crypto_alloc_hash(algo, 0, CRYPTO_ALG_ASYNC);
|
2006-05-30 14:04:19 +02:00
|
|
|
|
2006-08-19 13:38:49 +02:00
|
|
|
if (IS_ERR(tfm)) {
|
2009-03-29 09:18:39 +02:00
|
|
|
printk(KERN_ERR "failed to load transform for %s: %ld\n", algo,
|
2006-08-19 13:38:49 +02:00
|
|
|
PTR_ERR(tfm));
|
2006-05-30 14:04:19 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-08-19 13:38:49 +02:00
|
|
|
desc.tfm = tfm;
|
|
|
|
desc.flags = 0;
|
|
|
|
|
|
|
|
if (crypto_hash_digestsize(tfm) > sizeof(output)) {
|
2009-03-29 09:18:39 +02:00
|
|
|
printk(KERN_ERR "digestsize(%u) > outputbuffer(%zu)\n",
|
2006-08-19 13:38:49 +02:00
|
|
|
crypto_hash_digestsize(tfm), sizeof(output));
|
2006-05-30 14:04:19 +02:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
crypto: tcrypt - Add speed tests for async hashing
These are invoked in the 'mode' range of 400 to 499.
The cost of async vs. sync for the software algorithm implementations
varies. It can be as low as 16 cycles but as much as a couple hundred.
Here two runs of md5 testing, async then sync:
testing speed of async md5
test 0 ( 16 byte blocks, 16 bytes per update, 1 updates): 2448 cycles/operation, 153 cycles/byte
test 1 ( 64 byte blocks, 16 bytes per update, 4 updates): 4992 cycles/operation, 78 cycles/byte
test 2 ( 64 byte blocks, 64 bytes per update, 1 updates): 3808 cycles/operation, 59 cycles/byte
test 3 ( 256 byte blocks, 16 bytes per update, 16 updates): 14000 cycles/operation, 54 cycles/byte
test 4 ( 256 byte blocks, 64 bytes per update, 4 updates): 8480 cycles/operation, 33 cycles/byte
test 5 ( 256 byte blocks, 256 bytes per update, 1 updates): 7280 cycles/operation, 28 cycles/byte
test 6 ( 1024 byte blocks, 16 bytes per update, 64 updates): 50016 cycles/operation, 48 cycles/byte
test 7 ( 1024 byte blocks, 256 bytes per update, 4 updates): 22496 cycles/operation, 21 cycles/byte
test 8 ( 1024 byte blocks, 1024 bytes per update, 1 updates): 21232 cycles/operation, 20 cycles/byte
test 9 ( 2048 byte blocks, 16 bytes per update, 128 updates): 117184 cycles/operation, 57 cycles/byte
test 10 ( 2048 byte blocks, 256 bytes per update, 8 updates): 43008 cycles/operation, 21 cycles/byte
test 11 ( 2048 byte blocks, 1024 bytes per update, 2 updates): 40176 cycles/operation, 19 cycles/byte
test 12 ( 2048 byte blocks, 2048 bytes per update, 1 updates): 39888 cycles/operation, 19 cycles/byte
test 13 ( 4096 byte blocks, 16 bytes per update, 256 updates): 194176 cycles/operation, 47 cycles/byte
test 14 ( 4096 byte blocks, 256 bytes per update, 16 updates): 84096 cycles/operation, 20 cycles/byte
test 15 ( 4096 byte blocks, 1024 bytes per update, 4 updates): 78336 cycles/operation, 19 cycles/byte
test 16 ( 4096 byte blocks, 4096 bytes per update, 1 updates): 77120 cycles/operation, 18 cycles/byte
test 17 ( 8192 byte blocks, 16 bytes per update, 512 updates): 403056 cycles/operation, 49 cycles/byte
test 18 ( 8192 byte blocks, 256 bytes per update, 32 updates): 166112 cycles/operation, 20 cycles/byte
test 19 ( 8192 byte blocks, 1024 bytes per update, 8 updates): 154768 cycles/operation, 18 cycles/byte
test 20 ( 8192 byte blocks, 4096 bytes per update, 2 updates): 151904 cycles/operation, 18 cycles/byte
test 21 ( 8192 byte blocks, 8192 bytes per update, 1 updates): 155456 cycles/operation, 18 cycles/byte
testing speed of md5
test 0 ( 16 byte blocks, 16 bytes per update, 1 updates): 2208 cycles/operation, 138 cycles/byte
test 1 ( 64 byte blocks, 16 bytes per update, 4 updates): 5008 cycles/operation, 78 cycles/byte
test 2 ( 64 byte blocks, 64 bytes per update, 1 updates): 3600 cycles/operation, 56 cycles/byte
test 3 ( 256 byte blocks, 16 bytes per update, 16 updates): 14080 cycles/operation, 55 cycles/byte
test 4 ( 256 byte blocks, 64 bytes per update, 4 updates): 8560 cycles/operation, 33 cycles/byte
test 5 ( 256 byte blocks, 256 bytes per update, 1 updates): 7040 cycles/operation, 27 cycles/byte
test 6 ( 1024 byte blocks, 16 bytes per update, 64 updates): 50592 cycles/operation, 49 cycles/byte
test 7 ( 1024 byte blocks, 256 bytes per update, 4 updates): 22736 cycles/operation, 22 cycles/byte
test 8 ( 1024 byte blocks, 1024 bytes per update, 1 updates): 24960 cycles/operation, 24 cycles/byte
test 9 ( 2048 byte blocks, 16 bytes per update, 128 updates): 99312 cycles/operation, 48 cycles/byte
test 10 ( 2048 byte blocks, 256 bytes per update, 8 updates): 43520 cycles/operation, 21 cycles/byte
test 11 ( 2048 byte blocks, 1024 bytes per update, 2 updates): 40704 cycles/operation, 19 cycles/byte
test 12 ( 2048 byte blocks, 2048 bytes per update, 1 updates): 39552 cycles/operation, 19 cycles/byte
test 13 ( 4096 byte blocks, 16 bytes per update, 256 updates): 196720 cycles/operation, 48 cycles/byte
test 14 ( 4096 byte blocks, 256 bytes per update, 16 updates): 85152 cycles/operation, 20 cycles/byte
test 15 ( 4096 byte blocks, 1024 bytes per update, 4 updates): 79408 cycles/operation, 19 cycles/byte
test 16 ( 4096 byte blocks, 4096 bytes per update, 1 updates): 76816 cycles/operation, 18 cycles/byte
test 17 ( 8192 byte blocks, 16 bytes per update, 512 updates): 391520 cycles/operation, 47 cycles/byte
test 18 ( 8192 byte blocks, 256 bytes per update, 32 updates): 168464 cycles/operation, 20 cycles/byte
test 19 ( 8192 byte blocks, 1024 bytes per update, 8 updates): 156912 cycles/operation, 19 cycles/byte
test 20 ( 8192 byte blocks, 4096 bytes per update, 2 updates): 154016 cycles/operation, 18 cycles/byte
test 21 ( 8192 byte blocks, 8192 bytes per update, 1 updates): 153856 cycles/operation, 18 cycles/byte
We can ditch the sync hash code at some point if we feel that makes
sense. For now I've left it there.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2010-05-19 06:11:21 +02:00
|
|
|
test_hash_sg_init(sg);
|
2006-05-30 14:04:19 +02:00
|
|
|
for (i = 0; speed[i].blen != 0; i++) {
|
2008-07-31 06:23:53 +02:00
|
|
|
if (speed[i].blen > TVMEMSIZE * PAGE_SIZE) {
|
2009-03-29 09:18:39 +02:00
|
|
|
printk(KERN_ERR
|
|
|
|
"template (%u) too big for tvmem (%lu)\n",
|
2008-07-31 06:23:53 +02:00
|
|
|
speed[i].blen, TVMEMSIZE * PAGE_SIZE);
|
2006-05-30 14:04:19 +02:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2010-03-10 11:30:32 +01:00
|
|
|
if (speed[i].klen)
|
|
|
|
crypto_hash_setkey(tfm, tvmem[0], speed[i].klen);
|
|
|
|
|
2009-03-29 09:18:39 +02:00
|
|
|
printk(KERN_INFO "test%3u "
|
|
|
|
"(%5u byte blocks,%5u bytes per update,%4u updates): ",
|
2006-05-30 14:04:19 +02:00
|
|
|
i, speed[i].blen, speed[i].plen, speed[i].blen / speed[i].plen);
|
|
|
|
|
|
|
|
if (sec)
|
2008-07-31 06:23:53 +02:00
|
|
|
ret = test_hash_jiffies(&desc, sg, speed[i].blen,
|
2006-08-19 13:38:49 +02:00
|
|
|
speed[i].plen, output, sec);
|
2006-05-30 14:04:19 +02:00
|
|
|
else
|
2008-07-31 06:23:53 +02:00
|
|
|
ret = test_hash_cycles(&desc, sg, speed[i].blen,
|
2006-08-19 13:38:49 +02:00
|
|
|
speed[i].plen, output);
|
|
|
|
|
|
|
|
if (ret) {
|
2009-03-29 09:18:39 +02:00
|
|
|
printk(KERN_ERR "hashing failed ret=%d\n", ret);
|
2006-08-19 13:38:49 +02:00
|
|
|
break;
|
|
|
|
}
|
2006-05-30 14:04:19 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2006-08-19 13:38:49 +02:00
|
|
|
crypto_free_hash(tfm);
|
2006-05-30 14:04:19 +02:00
|
|
|
}
|
|
|
|
|
crypto: tcrypt - Add speed tests for async hashing
These are invoked in the 'mode' range of 400 to 499.
The cost of async vs. sync for the software algorithm implementations
varies. It can be as low as 16 cycles but as much as a couple hundred.
Here two runs of md5 testing, async then sync:
testing speed of async md5
test 0 ( 16 byte blocks, 16 bytes per update, 1 updates): 2448 cycles/operation, 153 cycles/byte
test 1 ( 64 byte blocks, 16 bytes per update, 4 updates): 4992 cycles/operation, 78 cycles/byte
test 2 ( 64 byte blocks, 64 bytes per update, 1 updates): 3808 cycles/operation, 59 cycles/byte
test 3 ( 256 byte blocks, 16 bytes per update, 16 updates): 14000 cycles/operation, 54 cycles/byte
test 4 ( 256 byte blocks, 64 bytes per update, 4 updates): 8480 cycles/operation, 33 cycles/byte
test 5 ( 256 byte blocks, 256 bytes per update, 1 updates): 7280 cycles/operation, 28 cycles/byte
test 6 ( 1024 byte blocks, 16 bytes per update, 64 updates): 50016 cycles/operation, 48 cycles/byte
test 7 ( 1024 byte blocks, 256 bytes per update, 4 updates): 22496 cycles/operation, 21 cycles/byte
test 8 ( 1024 byte blocks, 1024 bytes per update, 1 updates): 21232 cycles/operation, 20 cycles/byte
test 9 ( 2048 byte blocks, 16 bytes per update, 128 updates): 117184 cycles/operation, 57 cycles/byte
test 10 ( 2048 byte blocks, 256 bytes per update, 8 updates): 43008 cycles/operation, 21 cycles/byte
test 11 ( 2048 byte blocks, 1024 bytes per update, 2 updates): 40176 cycles/operation, 19 cycles/byte
test 12 ( 2048 byte blocks, 2048 bytes per update, 1 updates): 39888 cycles/operation, 19 cycles/byte
test 13 ( 4096 byte blocks, 16 bytes per update, 256 updates): 194176 cycles/operation, 47 cycles/byte
test 14 ( 4096 byte blocks, 256 bytes per update, 16 updates): 84096 cycles/operation, 20 cycles/byte
test 15 ( 4096 byte blocks, 1024 bytes per update, 4 updates): 78336 cycles/operation, 19 cycles/byte
test 16 ( 4096 byte blocks, 4096 bytes per update, 1 updates): 77120 cycles/operation, 18 cycles/byte
test 17 ( 8192 byte blocks, 16 bytes per update, 512 updates): 403056 cycles/operation, 49 cycles/byte
test 18 ( 8192 byte blocks, 256 bytes per update, 32 updates): 166112 cycles/operation, 20 cycles/byte
test 19 ( 8192 byte blocks, 1024 bytes per update, 8 updates): 154768 cycles/operation, 18 cycles/byte
test 20 ( 8192 byte blocks, 4096 bytes per update, 2 updates): 151904 cycles/operation, 18 cycles/byte
test 21 ( 8192 byte blocks, 8192 bytes per update, 1 updates): 155456 cycles/operation, 18 cycles/byte
testing speed of md5
test 0 ( 16 byte blocks, 16 bytes per update, 1 updates): 2208 cycles/operation, 138 cycles/byte
test 1 ( 64 byte blocks, 16 bytes per update, 4 updates): 5008 cycles/operation, 78 cycles/byte
test 2 ( 64 byte blocks, 64 bytes per update, 1 updates): 3600 cycles/operation, 56 cycles/byte
test 3 ( 256 byte blocks, 16 bytes per update, 16 updates): 14080 cycles/operation, 55 cycles/byte
test 4 ( 256 byte blocks, 64 bytes per update, 4 updates): 8560 cycles/operation, 33 cycles/byte
test 5 ( 256 byte blocks, 256 bytes per update, 1 updates): 7040 cycles/operation, 27 cycles/byte
test 6 ( 1024 byte blocks, 16 bytes per update, 64 updates): 50592 cycles/operation, 49 cycles/byte
test 7 ( 1024 byte blocks, 256 bytes per update, 4 updates): 22736 cycles/operation, 22 cycles/byte
test 8 ( 1024 byte blocks, 1024 bytes per update, 1 updates): 24960 cycles/operation, 24 cycles/byte
test 9 ( 2048 byte blocks, 16 bytes per update, 128 updates): 99312 cycles/operation, 48 cycles/byte
test 10 ( 2048 byte blocks, 256 bytes per update, 8 updates): 43520 cycles/operation, 21 cycles/byte
test 11 ( 2048 byte blocks, 1024 bytes per update, 2 updates): 40704 cycles/operation, 19 cycles/byte
test 12 ( 2048 byte blocks, 2048 bytes per update, 1 updates): 39552 cycles/operation, 19 cycles/byte
test 13 ( 4096 byte blocks, 16 bytes per update, 256 updates): 196720 cycles/operation, 48 cycles/byte
test 14 ( 4096 byte blocks, 256 bytes per update, 16 updates): 85152 cycles/operation, 20 cycles/byte
test 15 ( 4096 byte blocks, 1024 bytes per update, 4 updates): 79408 cycles/operation, 19 cycles/byte
test 16 ( 4096 byte blocks, 4096 bytes per update, 1 updates): 76816 cycles/operation, 18 cycles/byte
test 17 ( 8192 byte blocks, 16 bytes per update, 512 updates): 391520 cycles/operation, 47 cycles/byte
test 18 ( 8192 byte blocks, 256 bytes per update, 32 updates): 168464 cycles/operation, 20 cycles/byte
test 19 ( 8192 byte blocks, 1024 bytes per update, 8 updates): 156912 cycles/operation, 19 cycles/byte
test 20 ( 8192 byte blocks, 4096 bytes per update, 2 updates): 154016 cycles/operation, 18 cycles/byte
test 21 ( 8192 byte blocks, 8192 bytes per update, 1 updates): 153856 cycles/operation, 18 cycles/byte
We can ditch the sync hash code at some point if we feel that makes
sense. For now I've left it there.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2010-05-19 06:11:21 +02:00
|
|
|
struct tcrypt_result {
|
|
|
|
struct completion completion;
|
|
|
|
int err;
|
|
|
|
};
|
|
|
|
|
|
|
|
static void tcrypt_complete(struct crypto_async_request *req, int err)
|
|
|
|
{
|
|
|
|
struct tcrypt_result *res = req->data;
|
|
|
|
|
|
|
|
if (err == -EINPROGRESS)
|
|
|
|
return;
|
|
|
|
|
|
|
|
res->err = err;
|
|
|
|
complete(&res->completion);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int do_one_ahash_op(struct ahash_request *req, int ret)
|
|
|
|
{
|
|
|
|
if (ret == -EINPROGRESS || ret == -EBUSY) {
|
|
|
|
struct tcrypt_result *tr = req->base.data;
|
|
|
|
|
|
|
|
ret = wait_for_completion_interruptible(&tr->completion);
|
|
|
|
if (!ret)
|
|
|
|
ret = tr->err;
|
|
|
|
INIT_COMPLETION(tr->completion);
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int test_ahash_jiffies_digest(struct ahash_request *req, int blen,
|
|
|
|
char *out, int sec)
|
|
|
|
{
|
|
|
|
unsigned long start, end;
|
|
|
|
int bcount;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
for (start = jiffies, end = start + sec * HZ, bcount = 0;
|
|
|
|
time_before(jiffies, end); bcount++) {
|
|
|
|
ret = do_one_ahash_op(req, crypto_ahash_digest(req));
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
printk("%6u opers/sec, %9lu bytes/sec\n",
|
|
|
|
bcount / sec, ((long)bcount * blen) / sec);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int test_ahash_jiffies(struct ahash_request *req, int blen,
|
|
|
|
int plen, char *out, int sec)
|
|
|
|
{
|
|
|
|
unsigned long start, end;
|
|
|
|
int bcount, pcount;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (plen == blen)
|
|
|
|
return test_ahash_jiffies_digest(req, blen, out, sec);
|
|
|
|
|
|
|
|
for (start = jiffies, end = start + sec * HZ, bcount = 0;
|
|
|
|
time_before(jiffies, end); bcount++) {
|
|
|
|
ret = crypto_ahash_init(req);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
for (pcount = 0; pcount < blen; pcount += plen) {
|
|
|
|
ret = do_one_ahash_op(req, crypto_ahash_update(req));
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
/* we assume there is enough space in 'out' for the result */
|
|
|
|
ret = do_one_ahash_op(req, crypto_ahash_final(req));
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
pr_cont("%6u opers/sec, %9lu bytes/sec\n",
|
|
|
|
bcount / sec, ((long)bcount * blen) / sec);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int test_ahash_cycles_digest(struct ahash_request *req, int blen,
|
|
|
|
char *out)
|
|
|
|
{
|
|
|
|
unsigned long cycles = 0;
|
|
|
|
int ret, i;
|
|
|
|
|
|
|
|
/* Warm-up run. */
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
ret = do_one_ahash_op(req, crypto_ahash_digest(req));
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The real thing. */
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
|
cycles_t start, end;
|
|
|
|
|
|
|
|
start = get_cycles();
|
|
|
|
|
|
|
|
ret = do_one_ahash_op(req, crypto_ahash_digest(req));
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
end = get_cycles();
|
|
|
|
|
|
|
|
cycles += end - start;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
pr_cont("%6lu cycles/operation, %4lu cycles/byte\n",
|
|
|
|
cycles / 8, cycles / (8 * blen));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int test_ahash_cycles(struct ahash_request *req, int blen,
|
|
|
|
int plen, char *out)
|
|
|
|
{
|
|
|
|
unsigned long cycles = 0;
|
|
|
|
int i, pcount, ret;
|
|
|
|
|
|
|
|
if (plen == blen)
|
|
|
|
return test_ahash_cycles_digest(req, blen, out);
|
|
|
|
|
|
|
|
/* Warm-up run. */
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
ret = crypto_ahash_init(req);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
for (pcount = 0; pcount < blen; pcount += plen) {
|
|
|
|
ret = do_one_ahash_op(req, crypto_ahash_update(req));
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ret = do_one_ahash_op(req, crypto_ahash_final(req));
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* The real thing. */
|
|
|
|
for (i = 0; i < 8; i++) {
|
|
|
|
cycles_t start, end;
|
|
|
|
|
|
|
|
start = get_cycles();
|
|
|
|
|
|
|
|
ret = crypto_ahash_init(req);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
for (pcount = 0; pcount < blen; pcount += plen) {
|
|
|
|
ret = do_one_ahash_op(req, crypto_ahash_update(req));
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
ret = do_one_ahash_op(req, crypto_ahash_final(req));
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
end = get_cycles();
|
|
|
|
|
|
|
|
cycles += end - start;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
pr_cont("%6lu cycles/operation, %4lu cycles/byte\n",
|
|
|
|
cycles / 8, cycles / (8 * blen));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void test_ahash_speed(const char *algo, unsigned int sec,
|
|
|
|
struct hash_speed *speed)
|
|
|
|
{
|
|
|
|
struct scatterlist sg[TVMEMSIZE];
|
|
|
|
struct tcrypt_result tresult;
|
|
|
|
struct ahash_request *req;
|
|
|
|
struct crypto_ahash *tfm;
|
|
|
|
static char output[1024];
|
|
|
|
int i, ret;
|
|
|
|
|
|
|
|
printk(KERN_INFO "\ntesting speed of async %s\n", algo);
|
|
|
|
|
|
|
|
tfm = crypto_alloc_ahash(algo, 0, 0);
|
|
|
|
if (IS_ERR(tfm)) {
|
|
|
|
pr_err("failed to load transform for %s: %ld\n",
|
|
|
|
algo, PTR_ERR(tfm));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (crypto_ahash_digestsize(tfm) > sizeof(output)) {
|
|
|
|
pr_err("digestsize(%u) > outputbuffer(%zu)\n",
|
|
|
|
crypto_ahash_digestsize(tfm), sizeof(output));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
test_hash_sg_init(sg);
|
|
|
|
req = ahash_request_alloc(tfm, GFP_KERNEL);
|
|
|
|
if (!req) {
|
|
|
|
pr_err("ahash request allocation failure\n");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
init_completion(&tresult.completion);
|
|
|
|
ahash_request_set_callback(req, CRYPTO_TFM_REQ_MAY_BACKLOG,
|
|
|
|
tcrypt_complete, &tresult);
|
|
|
|
|
|
|
|
for (i = 0; speed[i].blen != 0; i++) {
|
|
|
|
if (speed[i].blen > TVMEMSIZE * PAGE_SIZE) {
|
|
|
|
pr_err("template (%u) too big for tvmem (%lu)\n",
|
|
|
|
speed[i].blen, TVMEMSIZE * PAGE_SIZE);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
pr_info("test%3u "
|
|
|
|
"(%5u byte blocks,%5u bytes per update,%4u updates): ",
|
|
|
|
i, speed[i].blen, speed[i].plen, speed[i].blen / speed[i].plen);
|
|
|
|
|
|
|
|
ahash_request_set_crypt(req, sg, output, speed[i].plen);
|
|
|
|
|
|
|
|
if (sec)
|
|
|
|
ret = test_ahash_jiffies(req, speed[i].blen,
|
|
|
|
speed[i].plen, output, sec);
|
|
|
|
else
|
|
|
|
ret = test_ahash_cycles(req, speed[i].blen,
|
|
|
|
speed[i].plen, output);
|
|
|
|
|
|
|
|
if (ret) {
|
|
|
|
pr_err("hashing failed ret=%d\n", ret);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ahash_request_free(req);
|
|
|
|
|
|
|
|
out:
|
|
|
|
crypto_free_ahash(tfm);
|
|
|
|
}
|
|
|
|
|
2005-06-22 22:26:03 +02:00
|
|
|
static void test_available(void)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
|
|
|
char **name = check;
|
2005-06-22 22:26:03 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
while (*name) {
|
|
|
|
printk("alg %s ", *name);
|
2007-04-04 09:41:07 +02:00
|
|
|
printk(crypto_has_alg(*name, 0, 0) ?
|
2006-08-26 10:12:40 +02:00
|
|
|
"found\n" : "not found\n");
|
2005-04-17 00:20:36 +02:00
|
|
|
name++;
|
2005-06-22 22:26:03 +02:00
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2008-07-31 09:41:55 +02:00
|
|
|
static inline int tcrypt_test(const char *alg)
|
|
|
|
{
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = alg_test(alg, alg, 0, 0);
|
|
|
|
/* non-fips algs return -EINVAL in fips mode */
|
|
|
|
if (fips_enabled && ret == -EINVAL)
|
|
|
|
ret = 0;
|
|
|
|
return ret;
|
2008-07-31 09:41:55 +02:00
|
|
|
}
|
|
|
|
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
static int do_test(int m)
|
2008-07-31 09:41:55 +02:00
|
|
|
{
|
|
|
|
int i;
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
int ret = 0;
|
2008-07-31 09:41:55 +02:00
|
|
|
|
|
|
|
switch (m) {
|
2005-04-17 00:20:36 +02:00
|
|
|
case 0:
|
2008-07-31 09:41:55 +02:00
|
|
|
for (i = 1; i < 200; i++)
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += do_test(i);
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 1:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("md5");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 2:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("sha1");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 3:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(des)");
|
|
|
|
ret += tcrypt_test("cbc(des)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 4:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(des3_ede)");
|
|
|
|
ret += tcrypt_test("cbc(des3_ede)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 5:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("md4");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
2005-06-22 22:26:03 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
case 6:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("sha256");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
2005-06-22 22:26:03 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
case 7:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(blowfish)");
|
|
|
|
ret += tcrypt_test("cbc(blowfish)");
|
2011-10-10 22:03:03 +02:00
|
|
|
ret += tcrypt_test("ctr(blowfish)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 8:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(twofish)");
|
|
|
|
ret += tcrypt_test("cbc(twofish)");
|
2011-10-10 22:03:12 +02:00
|
|
|
ret += tcrypt_test("ctr(twofish)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
2005-06-22 22:26:03 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
case 9:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(serpent)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 10:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(aes)");
|
|
|
|
ret += tcrypt_test("cbc(aes)");
|
|
|
|
ret += tcrypt_test("lrw(aes)");
|
|
|
|
ret += tcrypt_test("xts(aes)");
|
|
|
|
ret += tcrypt_test("ctr(aes)");
|
|
|
|
ret += tcrypt_test("rfc3686(ctr(aes))");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 11:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("sha384");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
2005-06-22 22:26:03 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
case 12:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("sha512");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 13:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("deflate");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 14:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(cast5)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 15:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(cast6)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 16:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(arc4)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 17:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("michael_mic");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 18:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("crc32c");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 19:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(tea)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 20:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(xtea)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 21:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(khazad)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 22:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("wp512");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 23:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("wp384");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 24:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("wp256");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 25:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(tnepres)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 26:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(anubis)");
|
|
|
|
ret += tcrypt_test("cbc(anubis)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 27:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("tgr192");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 28:
|
|
|
|
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("tgr160");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 29:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("tgr128");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
2008-05-09 15:29:35 +02:00
|
|
|
|
2005-09-02 02:42:46 +02:00
|
|
|
case 30:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(xeta)");
|
2005-09-02 02:42:46 +02:00
|
|
|
break;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2006-12-16 02:13:14 +01:00
|
|
|
case 31:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("pcbc(fcrypt)");
|
2006-12-16 02:13:14 +01:00
|
|
|
break;
|
|
|
|
|
2007-01-24 11:48:19 +01:00
|
|
|
case 32:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(camellia)");
|
|
|
|
ret += tcrypt_test("cbc(camellia)");
|
2007-01-24 11:48:19 +01:00
|
|
|
break;
|
2007-11-10 13:08:25 +01:00
|
|
|
case 33:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("sha224");
|
2007-11-10 13:08:25 +01:00
|
|
|
break;
|
2007-01-24 11:48:19 +01:00
|
|
|
|
2007-11-23 12:45:00 +01:00
|
|
|
case 34:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("salsa20");
|
2007-11-23 12:45:00 +01:00
|
|
|
break;
|
|
|
|
|
2007-12-02 04:55:47 +01:00
|
|
|
case 35:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("gcm(aes)");
|
2007-12-02 04:55:47 +01:00
|
|
|
break;
|
|
|
|
|
2007-12-07 09:53:23 +01:00
|
|
|
case 36:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("lzo");
|
2007-12-07 09:53:23 +01:00
|
|
|
break;
|
|
|
|
|
2007-12-12 13:24:22 +01:00
|
|
|
case 37:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ccm(aes)");
|
2007-12-12 13:24:22 +01:00
|
|
|
break;
|
|
|
|
|
2008-03-24 14:26:16 +01:00
|
|
|
case 38:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("cts(cbc(aes))");
|
2008-03-24 14:26:16 +01:00
|
|
|
break;
|
|
|
|
|
2008-05-07 16:16:36 +02:00
|
|
|
case 39:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("rmd128");
|
2008-05-07 16:16:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 40:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("rmd160");
|
2008-05-07 16:16:36 +02:00
|
|
|
break;
|
|
|
|
|
2008-05-09 15:29:35 +02:00
|
|
|
case 41:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("rmd256");
|
2008-05-09 15:29:35 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 42:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("rmd320");
|
2008-07-31 09:41:55 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 43:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ecb(seed)");
|
2008-05-09 15:29:35 +02:00
|
|
|
break;
|
|
|
|
|
2009-03-04 08:42:15 +01:00
|
|
|
case 44:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("zlib");
|
2009-03-04 08:42:15 +01:00
|
|
|
break;
|
|
|
|
|
2009-05-04 13:23:40 +02:00
|
|
|
case 45:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("rfc4309(ccm(aes))");
|
2009-05-04 13:23:40 +02:00
|
|
|
break;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
case 100:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("hmac(md5)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
2005-06-22 22:26:03 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
case 101:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("hmac(sha1)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
2005-06-22 22:26:03 +02:00
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
case 102:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("hmac(sha256)");
|
2005-04-17 00:20:36 +02:00
|
|
|
break;
|
|
|
|
|
2006-12-10 02:10:20 +01:00
|
|
|
case 103:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("hmac(sha384)");
|
2006-12-10 02:10:20 +01:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 104:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("hmac(sha512)");
|
2006-12-10 02:10:20 +01:00
|
|
|
break;
|
2008-01-01 05:59:28 +01:00
|
|
|
|
2007-11-10 13:08:25 +01:00
|
|
|
case 105:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("hmac(sha224)");
|
2007-11-10 13:08:25 +01:00
|
|
|
break;
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-01-01 05:59:28 +01:00
|
|
|
case 106:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("xcbc(aes)");
|
2008-01-01 05:59:28 +01:00
|
|
|
break;
|
|
|
|
|
2008-05-07 16:16:36 +02:00
|
|
|
case 107:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("hmac(rmd128)");
|
2008-05-07 16:16:36 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 108:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("hmac(rmd160)");
|
2008-05-07 16:16:36 +02:00
|
|
|
break;
|
|
|
|
|
2009-09-02 12:05:22 +02:00
|
|
|
case 109:
|
|
|
|
ret += tcrypt_test("vmac(aes)");
|
|
|
|
break;
|
|
|
|
|
2009-05-04 13:46:29 +02:00
|
|
|
case 150:
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
ret += tcrypt_test("ansi_cprng");
|
2009-05-04 13:46:29 +02:00
|
|
|
break;
|
|
|
|
|
2010-11-04 20:02:04 +01:00
|
|
|
case 151:
|
|
|
|
ret += tcrypt_test("rfc4106(gcm(aes))");
|
|
|
|
break;
|
|
|
|
|
2005-06-22 22:27:23 +02:00
|
|
|
case 200:
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(aes)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(aes)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(aes)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(aes)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2006-11-29 09:01:41 +01:00
|
|
|
test_cipher_speed("lrw(aes)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_32_40_48);
|
2006-11-29 09:01:41 +01:00
|
|
|
test_cipher_speed("lrw(aes)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_32_40_48);
|
2007-09-19 14:23:13 +02:00
|
|
|
test_cipher_speed("xts(aes)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_32_48_64);
|
2007-09-19 14:23:13 +02:00
|
|
|
test_cipher_speed("xts(aes)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_32_48_64);
|
2011-04-26 08:34:01 +02:00
|
|
|
test_cipher_speed("ctr(aes)", ENCRYPT, sec, NULL, 0,
|
|
|
|
speed_template_16_24_32);
|
|
|
|
test_cipher_speed("ctr(aes)", DECRYPT, sec, NULL, 0,
|
|
|
|
speed_template_16_24_32);
|
2005-06-22 22:27:23 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 201:
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(des3_ede)", ENCRYPT, sec,
|
2008-07-31 11:08:25 +02:00
|
|
|
des3_speed_template, DES3_SPEED_VECTORS,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_24);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(des3_ede)", DECRYPT, sec,
|
2008-07-31 11:08:25 +02:00
|
|
|
des3_speed_template, DES3_SPEED_VECTORS,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_24);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(des3_ede)", ENCRYPT, sec,
|
2008-07-31 11:08:25 +02:00
|
|
|
des3_speed_template, DES3_SPEED_VECTORS,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_24);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(des3_ede)", DECRYPT, sec,
|
2008-07-31 11:08:25 +02:00
|
|
|
des3_speed_template, DES3_SPEED_VECTORS,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_24);
|
2005-06-22 22:27:23 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 202:
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(twofish)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(twofish)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(twofish)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(twofish)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2011-09-26 15:47:15 +02:00
|
|
|
test_cipher_speed("ctr(twofish)", ENCRYPT, sec, NULL, 0,
|
|
|
|
speed_template_16_24_32);
|
|
|
|
test_cipher_speed("ctr(twofish)", DECRYPT, sec, NULL, 0,
|
|
|
|
speed_template_16_24_32);
|
2005-06-22 22:27:23 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 203:
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(blowfish)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_8_32);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(blowfish)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_8_32);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(blowfish)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_8_32);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(blowfish)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_8_32);
|
2011-09-02 00:45:17 +02:00
|
|
|
test_cipher_speed("ctr(blowfish)", ENCRYPT, sec, NULL, 0,
|
|
|
|
speed_template_8_32);
|
|
|
|
test_cipher_speed("ctr(blowfish)", DECRYPT, sec, NULL, 0,
|
|
|
|
speed_template_8_32);
|
2005-06-22 22:27:23 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case 204:
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(des)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_8);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("ecb(des)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_8);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(des)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_8);
|
2006-08-13 00:26:09 +02:00
|
|
|
test_cipher_speed("cbc(des)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_8);
|
2005-06-22 22:27:23 +02:00
|
|
|
break;
|
|
|
|
|
2007-01-24 11:48:19 +01:00
|
|
|
case 205:
|
|
|
|
test_cipher_speed("ecb(camellia)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2007-01-24 11:48:19 +01:00
|
|
|
test_cipher_speed("ecb(camellia)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2007-01-24 11:48:19 +01:00
|
|
|
test_cipher_speed("cbc(camellia)", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2007-01-24 11:48:19 +01:00
|
|
|
test_cipher_speed("cbc(camellia)", DECRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_24_32);
|
2007-01-24 11:48:19 +01:00
|
|
|
break;
|
|
|
|
|
2007-12-07 10:17:43 +01:00
|
|
|
case 206:
|
|
|
|
test_cipher_speed("salsa20", ENCRYPT, sec, NULL, 0,
|
2008-03-11 14:24:26 +01:00
|
|
|
speed_template_16_32);
|
2007-12-07 10:17:43 +01:00
|
|
|
break;
|
|
|
|
|
2006-05-30 14:04:19 +02:00
|
|
|
case 300:
|
|
|
|
/* fall through */
|
|
|
|
|
|
|
|
case 301:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("md4", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 302:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("md5", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 303:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("sha1", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 304:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("sha256", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 305:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("sha384", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 306:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("sha512", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 307:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("wp256", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 308:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("wp384", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 309:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("wp512", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 310:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("tgr128", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 311:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("tgr160", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 312:
|
2006-08-19 13:38:49 +02:00
|
|
|
test_hash_speed("tgr192", sec, generic_hash_speed_template);
|
2006-05-30 14:04:19 +02:00
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
2007-11-10 13:08:25 +01:00
|
|
|
case 313:
|
|
|
|
test_hash_speed("sha224", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
2008-05-07 16:16:36 +02:00
|
|
|
case 314:
|
|
|
|
test_hash_speed("rmd128", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 315:
|
|
|
|
test_hash_speed("rmd160", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
2008-05-09 15:29:35 +02:00
|
|
|
case 316:
|
|
|
|
test_hash_speed("rmd256", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
|
|
|
case 317:
|
|
|
|
test_hash_speed("rmd320", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
2010-03-10 11:30:32 +01:00
|
|
|
case 318:
|
|
|
|
test_hash_speed("ghash-generic", sec, hash_speed_template_16);
|
|
|
|
if (mode > 300 && mode < 400) break;
|
|
|
|
|
2006-05-30 14:04:19 +02:00
|
|
|
case 399:
|
|
|
|
break;
|
|
|
|
|
crypto: tcrypt - Add speed tests for async hashing
These are invoked in the 'mode' range of 400 to 499.
The cost of async vs. sync for the software algorithm implementations
varies. It can be as low as 16 cycles but as much as a couple hundred.
Here two runs of md5 testing, async then sync:
testing speed of async md5
test 0 ( 16 byte blocks, 16 bytes per update, 1 updates): 2448 cycles/operation, 153 cycles/byte
test 1 ( 64 byte blocks, 16 bytes per update, 4 updates): 4992 cycles/operation, 78 cycles/byte
test 2 ( 64 byte blocks, 64 bytes per update, 1 updates): 3808 cycles/operation, 59 cycles/byte
test 3 ( 256 byte blocks, 16 bytes per update, 16 updates): 14000 cycles/operation, 54 cycles/byte
test 4 ( 256 byte blocks, 64 bytes per update, 4 updates): 8480 cycles/operation, 33 cycles/byte
test 5 ( 256 byte blocks, 256 bytes per update, 1 updates): 7280 cycles/operation, 28 cycles/byte
test 6 ( 1024 byte blocks, 16 bytes per update, 64 updates): 50016 cycles/operation, 48 cycles/byte
test 7 ( 1024 byte blocks, 256 bytes per update, 4 updates): 22496 cycles/operation, 21 cycles/byte
test 8 ( 1024 byte blocks, 1024 bytes per update, 1 updates): 21232 cycles/operation, 20 cycles/byte
test 9 ( 2048 byte blocks, 16 bytes per update, 128 updates): 117184 cycles/operation, 57 cycles/byte
test 10 ( 2048 byte blocks, 256 bytes per update, 8 updates): 43008 cycles/operation, 21 cycles/byte
test 11 ( 2048 byte blocks, 1024 bytes per update, 2 updates): 40176 cycles/operation, 19 cycles/byte
test 12 ( 2048 byte blocks, 2048 bytes per update, 1 updates): 39888 cycles/operation, 19 cycles/byte
test 13 ( 4096 byte blocks, 16 bytes per update, 256 updates): 194176 cycles/operation, 47 cycles/byte
test 14 ( 4096 byte blocks, 256 bytes per update, 16 updates): 84096 cycles/operation, 20 cycles/byte
test 15 ( 4096 byte blocks, 1024 bytes per update, 4 updates): 78336 cycles/operation, 19 cycles/byte
test 16 ( 4096 byte blocks, 4096 bytes per update, 1 updates): 77120 cycles/operation, 18 cycles/byte
test 17 ( 8192 byte blocks, 16 bytes per update, 512 updates): 403056 cycles/operation, 49 cycles/byte
test 18 ( 8192 byte blocks, 256 bytes per update, 32 updates): 166112 cycles/operation, 20 cycles/byte
test 19 ( 8192 byte blocks, 1024 bytes per update, 8 updates): 154768 cycles/operation, 18 cycles/byte
test 20 ( 8192 byte blocks, 4096 bytes per update, 2 updates): 151904 cycles/operation, 18 cycles/byte
test 21 ( 8192 byte blocks, 8192 bytes per update, 1 updates): 155456 cycles/operation, 18 cycles/byte
testing speed of md5
test 0 ( 16 byte blocks, 16 bytes per update, 1 updates): 2208 cycles/operation, 138 cycles/byte
test 1 ( 64 byte blocks, 16 bytes per update, 4 updates): 5008 cycles/operation, 78 cycles/byte
test 2 ( 64 byte blocks, 64 bytes per update, 1 updates): 3600 cycles/operation, 56 cycles/byte
test 3 ( 256 byte blocks, 16 bytes per update, 16 updates): 14080 cycles/operation, 55 cycles/byte
test 4 ( 256 byte blocks, 64 bytes per update, 4 updates): 8560 cycles/operation, 33 cycles/byte
test 5 ( 256 byte blocks, 256 bytes per update, 1 updates): 7040 cycles/operation, 27 cycles/byte
test 6 ( 1024 byte blocks, 16 bytes per update, 64 updates): 50592 cycles/operation, 49 cycles/byte
test 7 ( 1024 byte blocks, 256 bytes per update, 4 updates): 22736 cycles/operation, 22 cycles/byte
test 8 ( 1024 byte blocks, 1024 bytes per update, 1 updates): 24960 cycles/operation, 24 cycles/byte
test 9 ( 2048 byte blocks, 16 bytes per update, 128 updates): 99312 cycles/operation, 48 cycles/byte
test 10 ( 2048 byte blocks, 256 bytes per update, 8 updates): 43520 cycles/operation, 21 cycles/byte
test 11 ( 2048 byte blocks, 1024 bytes per update, 2 updates): 40704 cycles/operation, 19 cycles/byte
test 12 ( 2048 byte blocks, 2048 bytes per update, 1 updates): 39552 cycles/operation, 19 cycles/byte
test 13 ( 4096 byte blocks, 16 bytes per update, 256 updates): 196720 cycles/operation, 48 cycles/byte
test 14 ( 4096 byte blocks, 256 bytes per update, 16 updates): 85152 cycles/operation, 20 cycles/byte
test 15 ( 4096 byte blocks, 1024 bytes per update, 4 updates): 79408 cycles/operation, 19 cycles/byte
test 16 ( 4096 byte blocks, 4096 bytes per update, 1 updates): 76816 cycles/operation, 18 cycles/byte
test 17 ( 8192 byte blocks, 16 bytes per update, 512 updates): 391520 cycles/operation, 47 cycles/byte
test 18 ( 8192 byte blocks, 256 bytes per update, 32 updates): 168464 cycles/operation, 20 cycles/byte
test 19 ( 8192 byte blocks, 1024 bytes per update, 8 updates): 156912 cycles/operation, 19 cycles/byte
test 20 ( 8192 byte blocks, 4096 bytes per update, 2 updates): 154016 cycles/operation, 18 cycles/byte
test 21 ( 8192 byte blocks, 8192 bytes per update, 1 updates): 153856 cycles/operation, 18 cycles/byte
We can ditch the sync hash code at some point if we feel that makes
sense. For now I've left it there.
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2010-05-19 06:11:21 +02:00
|
|
|
case 400:
|
|
|
|
/* fall through */
|
|
|
|
|
|
|
|
case 401:
|
|
|
|
test_ahash_speed("md4", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 402:
|
|
|
|
test_ahash_speed("md5", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 403:
|
|
|
|
test_ahash_speed("sha1", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 404:
|
|
|
|
test_ahash_speed("sha256", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 405:
|
|
|
|
test_ahash_speed("sha384", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 406:
|
|
|
|
test_ahash_speed("sha512", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 407:
|
|
|
|
test_ahash_speed("wp256", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 408:
|
|
|
|
test_ahash_speed("wp384", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 409:
|
|
|
|
test_ahash_speed("wp512", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 410:
|
|
|
|
test_ahash_speed("tgr128", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 411:
|
|
|
|
test_ahash_speed("tgr160", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 412:
|
|
|
|
test_ahash_speed("tgr192", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 413:
|
|
|
|
test_ahash_speed("sha224", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 414:
|
|
|
|
test_ahash_speed("rmd128", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 415:
|
|
|
|
test_ahash_speed("rmd160", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 416:
|
|
|
|
test_ahash_speed("rmd256", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 417:
|
|
|
|
test_ahash_speed("rmd320", sec, generic_hash_speed_template);
|
|
|
|
if (mode > 400 && mode < 500) break;
|
|
|
|
|
|
|
|
case 499:
|
|
|
|
break;
|
|
|
|
|
2005-04-17 00:20:36 +02:00
|
|
|
case 1000:
|
|
|
|
test_available();
|
|
|
|
break;
|
|
|
|
}
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
|
|
|
|
return ret;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
2009-07-14 10:06:54 +02:00
|
|
|
static int do_alg_test(const char *alg, u32 type, u32 mask)
|
2009-06-19 13:46:53 +02:00
|
|
|
{
|
2009-07-14 10:06:54 +02:00
|
|
|
return crypto_has_alg(alg, type, mask ?: CRYPTO_ALG_TYPE_MASK) ?
|
|
|
|
0 : -ENOENT;
|
2009-06-19 13:46:53 +02:00
|
|
|
}
|
|
|
|
|
2008-04-05 15:00:57 +02:00
|
|
|
static int __init tcrypt_mod_init(void)
|
2005-04-17 00:20:36 +02:00
|
|
|
{
|
2007-11-26 15:12:07 +01:00
|
|
|
int err = -ENOMEM;
|
2008-07-31 06:23:53 +02:00
|
|
|
int i;
|
2007-11-26 15:12:07 +01:00
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
for (i = 0; i < TVMEMSIZE; i++) {
|
|
|
|
tvmem[i] = (void *)__get_free_page(GFP_KERNEL);
|
|
|
|
if (!tvmem[i])
|
|
|
|
goto err_free_tv;
|
|
|
|
}
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-06-19 13:46:53 +02:00
|
|
|
if (alg)
|
2009-07-14 10:06:54 +02:00
|
|
|
err = do_alg_test(alg, type, mask);
|
2009-06-19 13:46:53 +02:00
|
|
|
else
|
|
|
|
err = do_test(mode);
|
|
|
|
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
if (err) {
|
|
|
|
printk(KERN_ERR "tcrypt: one or more tests failed!\n");
|
|
|
|
goto err_free_tv;
|
|
|
|
}
|
2006-05-30 06:49:38 +02:00
|
|
|
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
/* We intentionaly return -EAGAIN to prevent keeping the module,
|
|
|
|
* unless we're running in fips mode. It does all its work from
|
|
|
|
* init() and doesn't offer any runtime functionality, but in
|
|
|
|
* the fips case, checking for a successful load is helpful.
|
2006-05-30 06:49:38 +02:00
|
|
|
* => we don't need it in the memory, do we?
|
|
|
|
* -- mludvig
|
|
|
|
*/
|
crypto: tcrypt - Do not exit on success in fips mode
At present, the tcrypt module always exits with an -EAGAIN upon
successfully completing all the tests its been asked to run. In fips
mode, integrity checking is done by running all self-tests from the
initrd, and its much simpler to check the ret from modprobe for
success than to scrape dmesg and/or /proc/crypto. Simply stay
loaded, giving modprobe a retval of 0, if self-tests all pass and
we're in fips mode.
A side-effect of tracking success/failure for fips mode is that in
non-fips mode, self-test failures will return the actual failure
return codes, rather than always returning -EAGAIN, which seems more
correct anyway.
The tcrypt_test() portion of the patch is dependent on my earlier
pair of patches that skip non-fips algs in fips mode, at least to
achieve the fully intended behavior.
Nb: testing this patch against the cryptodev tree revealed a test
failure for sha384, which I have yet to look into...
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
2009-05-27 07:10:21 +02:00
|
|
|
if (!fips_enabled)
|
|
|
|
err = -EAGAIN;
|
2007-11-26 15:12:07 +01:00
|
|
|
|
2008-07-31 06:23:53 +02:00
|
|
|
err_free_tv:
|
|
|
|
for (i = 0; i < TVMEMSIZE && tvmem[i]; i++)
|
|
|
|
free_page((unsigned long)tvmem[i]);
|
2007-11-26 15:12:07 +01:00
|
|
|
|
|
|
|
return err;
|
2005-04-17 00:20:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If an init function is provided, an exit function must also be provided
|
|
|
|
* to allow module unload.
|
|
|
|
*/
|
2008-04-05 15:00:57 +02:00
|
|
|
static void __exit tcrypt_mod_fini(void) { }
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2008-04-05 15:00:57 +02:00
|
|
|
module_init(tcrypt_mod_init);
|
|
|
|
module_exit(tcrypt_mod_fini);
|
2005-04-17 00:20:36 +02:00
|
|
|
|
2009-06-19 13:46:53 +02:00
|
|
|
module_param(alg, charp, 0);
|
|
|
|
module_param(type, uint, 0);
|
2009-07-14 10:06:54 +02:00
|
|
|
module_param(mask, uint, 0);
|
2005-04-17 00:20:36 +02:00
|
|
|
module_param(mode, int, 0);
|
2005-06-22 22:27:23 +02:00
|
|
|
module_param(sec, uint, 0);
|
2005-06-22 22:29:03 +02:00
|
|
|
MODULE_PARM_DESC(sec, "Length in seconds of speed tests "
|
|
|
|
"(defaults to zero which uses CPU cycles instead)");
|
2005-04-17 00:20:36 +02:00
|
|
|
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
MODULE_DESCRIPTION("Quick & dirty crypto testing module");
|
|
|
|
MODULE_AUTHOR("James Morris <jmorris@intercode.com.au>");
|