diff options
author | Miloslav Trmač <mitr@redhat.com> | 2010-08-20 03:09:19 +0200 |
---|---|---|
committer | Miloslav Trmač <mitr@redhat.com> | 2010-08-20 03:09:19 +0200 |
commit | 9e46efe2918aeb0acd0805e55090c3552037f2df (patch) | |
tree | 19be74d133f16c7396cb3734fb796554bf3ac47e /crypto/userspace | |
parent | a7c8e9859418d1da9c898925dc291d0dd07c5ac2 (diff) | |
parent | cc7a2bee6cd5688f44e7b0cf1d28722fabf4a80c (diff) | |
download | kernel-crypto-9e46efe2918aeb0acd0805e55090c3552037f2df.tar.gz kernel-crypto-9e46efe2918aeb0acd0805e55090c3552037f2df.tar.xz kernel-crypto-9e46efe2918aeb0acd0805e55090c3552037f2df.zip |
Merge branch 'standalone-rename' into userspace-crypto
Diffstat (limited to 'crypto/userspace')
-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 a56d845f897..01082693c5f 100644 --- a/crypto/userspace/cryptodev_main.c +++ b/crypto/userspace/cryptodev_main.c @@ -826,7 +826,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 fdc0200a931..8574b5ace57 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 dad8adc4cc0..4cf79b3a025 100644 --- a/crypto/userspace/ncr.c +++ b/crypto/userspace/ncr.c @@ -116,8 +116,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_; |