diff options
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/userspace/cryptodev_main.c | 2 | ||||
-rw-r--r-- | crypto/userspace/libtommath/bn_mp_prime_next_prime.c | 2 | ||||
-rw-r--r-- | crypto/userspace/ncr-int.h | 3 | ||||
-rw-r--r-- | crypto/userspace/ncr.c | 3 |
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_; |