summaryrefslogtreecommitdiffstats
path: root/crypto/userspace
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-08-20 03:09:06 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-08-20 03:09:06 +0200
commitcc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c (patch)
tree9e24e045387dd09178bc8f1503d3288467a62a4c /crypto/userspace
parent31372e35a86d90971a654a15571c85522aca73c6 (diff)
parent3c86466e9230d6cee720a46a8e632f459069080c (diff)
downloadkernel-crypto-cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c.tar.gz
kernel-crypto-cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c.tar.xz
kernel-crypto-cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c.zip
Merge branch 'standalone-master' into standalone-rename
Diffstat (limited to 'crypto/userspace')
-rw-r--r--crypto/userspace/cryptodev_main.c2
-rw-r--r--crypto/userspace/libtommath/bn_mp_prime_next_prime.c2
-rw-r--r--crypto/userspace/ncr-int.h3
-rw-r--r--crypto/userspace/ncr.c3
4 files changed, 4 insertions, 6 deletions
diff --git a/crypto/userspace/cryptodev_main.c b/crypto/userspace/cryptodev_main.c
index a056b447731..da75672615a 100644
--- a/crypto/userspace/cryptodev_main.c
+++ b/crypto/userspace/cryptodev_main.c
@@ -828,7 +828,7 @@ cryptodev_ioctl(struct inode *inode, struct file *filp,
return 0;
default:
- return ncr_ioctl(pcr->ncr, filp, cmd, arg_);
+ return ncr_ioctl(pcr->ncr, cmd, arg_);
}
}
diff --git a/crypto/userspace/libtommath/bn_mp_prime_next_prime.c b/crypto/userspace/libtommath/bn_mp_prime_next_prime.c
index daf2ec7c647..bc31cc72086 100644
--- a/crypto/userspace/libtommath/bn_mp_prime_next_prime.c
+++ b/crypto/userspace/libtommath/bn_mp_prime_next_prime.c
@@ -143,7 +143,7 @@ int mp_prime_next_prime(mp_int *a, int t, int bbs_style)
/* is this prime? */
for (x = 0; x < t; x++) {
- mp_set(&b, ltm_prime_tab[t]);
+ mp_set(&b, ltm_prime_tab[x]);
if ((err = mp_prime_miller_rabin(a, &b, &res)) != MP_OKAY) {
goto LBL_ERR;
}
diff --git a/crypto/userspace/ncr-int.h b/crypto/userspace/ncr-int.h
index 84bca9e3f68..2689804e29d 100644
--- a/crypto/userspace/ncr-int.h
+++ b/crypto/userspace/ncr-int.h
@@ -104,8 +104,7 @@ struct ncr_lists {
void* ncr_init_lists(void);
void ncr_deinit_lists(struct ncr_lists *lst);
-int ncr_ioctl(struct ncr_lists*, struct file *filp,
- unsigned int cmd, unsigned long arg);
+int ncr_ioctl(struct ncr_lists *lst, unsigned int cmd, unsigned long arg);
/* key derivation */
int ncr_key_derive(struct ncr_lists *lst, void __user* arg);
diff --git a/crypto/userspace/ncr.c b/crypto/userspace/ncr.c
index 86c8c7ad8ad..81e3fa32cef 100644
--- a/crypto/userspace/ncr.c
+++ b/crypto/userspace/ncr.c
@@ -117,8 +117,7 @@ struct ncr_master_key_st st;
}
int
-ncr_ioctl(struct ncr_lists* lst, struct file *filp,
- unsigned int cmd, unsigned long arg_)
+ncr_ioctl(struct ncr_lists *lst, unsigned int cmd, unsigned long arg_)
{
void __user *arg = (void __user *)arg_;