git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert crypto: fips - Select CPRNG
[safe/jmp/linux-2.6]
/
crypto
/
tcrypt.c
diff --git
a/crypto/tcrypt.c
b/crypto/tcrypt.c
index
d59ba50
..
5a375e8
100644
(file)
--- a/
crypto/tcrypt.c
+++ b/
crypto/tcrypt.c
@@
-45,6
+45,9
@@
*/
static unsigned int sec;
*/
static unsigned int sec;
+static char *alg = NULL;
+static u32 type;
+static u32 mask;
static int mode;
static char *tvmem[TVMEMSIZE];
static int mode;
static char *tvmem[TVMEMSIZE];
@@
-885,6
+888,12
@@
static int do_test(int m)
return ret;
}
return ret;
}
+static int do_alg_test(const char *alg, u32 type, u32 mask)
+{
+ return crypto_has_alg(alg, type, mask ?: CRYPTO_ALG_TYPE_MASK) ?
+ 0 : -ENOENT;
+}
+
static int __init tcrypt_mod_init(void)
{
int err = -ENOMEM;
static int __init tcrypt_mod_init(void)
{
int err = -ENOMEM;
@@
-896,7
+905,11
@@
static int __init tcrypt_mod_init(void)
goto err_free_tv;
}
goto err_free_tv;
}
- err = do_test(mode);
+ if (alg)
+ err = do_alg_test(alg, type, mask);
+ else
+ err = do_test(mode);
+
if (err) {
printk(KERN_ERR "tcrypt: one or more tests failed!\n");
goto err_free_tv;
if (err) {
printk(KERN_ERR "tcrypt: one or more tests failed!\n");
goto err_free_tv;
@@
-928,6
+941,9
@@
static void __exit tcrypt_mod_fini(void) { }
module_init(tcrypt_mod_init);
module_exit(tcrypt_mod_fini);
module_init(tcrypt_mod_init);
module_exit(tcrypt_mod_fini);
+module_param(alg, charp, 0);
+module_param(type, uint, 0);
+module_param(mask, uint, 0);
module_param(mode, int, 0);
module_param(sec, uint, 0);
MODULE_PARM_DESC(sec, "Length in seconds of speed tests "
module_param(mode, int, 0);
module_param(sec, uint, 0);
MODULE_PARM_DESC(sec, "Length in seconds of speed tests "